Skip to content

Commit 03d8a18

Browse files
committed
update meitrex-common
1 parent c1538c3 commit 03d8a18

File tree

7 files changed

+8
-177
lines changed

7 files changed

+8
-177
lines changed

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ graphqlCodegen {
5757
packageName = "de.unistuttgart.iste.meitrex.generated.dto"
5858
generatedAnnotation = "jakarta.annotation.Generated"
5959
modelValidationAnnotation = "jakarta.validation.constraints.NotNull"
60+
generateJacksonTypeIdResolver = true // allows graphql .toEntity() conversion with Jackson for interfaces and unions
6061
generateApis = false // set to false as the generator does not support spring boot graphQL
6162
customTypesMapping = [
6263
"DateTime" : "java.time.OffsetDateTime",
@@ -109,7 +110,7 @@ repositories {
109110

110111
dependencies {
111112
implementation("com.google.code.gson:gson:2.10.1")
112-
implementation 'de.unistuttgart.iste.meitrex:meitrex-common:1.3.3'
113+
implementation 'de.unistuttgart.iste.meitrex:meitrex-common:1.4.6'
113114
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
114115
implementation 'org.springframework.boot:spring-boot-starter-graphql'
115116
implementation 'org.springframework.boot:spring-boot-starter-validation'
@@ -126,7 +127,7 @@ dependencies {
126127
runtimeOnly 'org.postgresql:postgresql'
127128
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
128129
annotationProcessor 'org.projectlombok:lombok'
129-
testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.3.3'
130+
testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.4.6'
130131
testImplementation 'org.springframework.boot:spring-boot-starter-test'
131132
testImplementation 'org.springframework:spring-webflux'
132133
testImplementation 'org.springframework.graphql:spring-graphql-test'

src/main/java/de/unistuttgart/iste/meitrex/user_service/config/GraphQlScalarsAndValidationConfiguration.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/resources/application.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ keycloak.clientId=admin-cli
2424
keycloak.masterRealm=master
2525
keycloak.realm=GITS
2626

27+
spring.graphql.schema.locations=classpath*:graphql/common/**/,classpath:graphql/**
28+
2729
# URL to exchange the code for a token and refresh token
2830
thirdparty.providers.github.tokenRequestUrl=https://github.com/login/oauth/access_token
2931
# URL to get the user information from GitHub based on the token

src/main/resources/graphql/common/directives.graphqls

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/main/resources/graphql/common/scalars.graphqls

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/main/resources/graphql/common/sortFilterPagination.graphqls

Lines changed: 0 additions & 104 deletions
This file was deleted.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
spring.datasource.url=jdbc:tc:postgresql:///user-service
22
spring.datasource.username=root
33
spring.datasource.password=root
4-
spring.jpa.hibernate.ddl-auto=create
4+
spring.jpa.hibernate.ddl-auto=create
5+
6+
spring.graphql.schema.locations=classpath*:graphql/common/**/,classpath:graphql/**

0 commit comments

Comments
 (0)