Skip to content

update meitrex-common #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myluki2000 merged 1 commit into from
Sep 4, 2025
Merged

update meitrex-common #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ graphqlCodegen {
packageName = "de.unistuttgart.iste.meitrex.generated.dto"
generatedAnnotation = "jakarta.annotation.Generated"
modelValidationAnnotation = "jakarta.validation.constraints.NotNull"
generateJacksonTypeIdResolver = true // allows graphql .toEntity() conversion with Jackson for interfaces and unions
generateApis = false // set to false as the generator does not support spring boot graphQL
customTypesMapping = [
"DateTime" : "java.time.OffsetDateTime",
Expand Down Expand Up @@ -109,7 +110,7 @@ repositories {

dependencies {
implementation("com.google.code.gson:gson:2.10.1")
implementation 'de.unistuttgart.iste.meitrex:meitrex-common:1.3.3'
implementation 'de.unistuttgart.iste.meitrex:meitrex-common:1.4.6'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-graphql'
implementation 'org.springframework.boot:spring-boot-starter-validation'
Expand All @@ -126,7 +127,7 @@ dependencies {
runtimeOnly 'org.postgresql:postgresql'
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.3.3'
testImplementation 'de.unistuttgart.iste.meitrex:meitrex-common-test:1.4.6'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework:spring-webflux'
testImplementation 'org.springframework.graphql:spring-graphql-test'
Expand Down
35 changes: 0 additions & 35 deletions ...istuttgart/iste/meitrex/user_service/config/GraphQlScalarsAndValidationConfiguration.java
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ keycloak.clientId=admin-cli
keycloak.masterRealm=master
keycloak.realm=GITS

spring.graphql.schema.locations=classpath*:graphql/common/**/,classpath:graphql/**

# URL to exchange the code for a token and refresh token
thirdparty.providers.github.tokenRequestUrl=https://github.com/login/oauth/access_token
# URL to get the user information from GitHub based on the token
Expand Down
23 changes: 0 additions & 23 deletions src/main/resources/graphql/common/directives.graphqls
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/main/resources/graphql/common/scalars.graphqls
View file
Open in desktop

This file was deleted.

104 changes: 0 additions & 104 deletions src/main/resources/graphql/common/sortFilterPagination.graphqls
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion src/test/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
spring.datasource.url=jdbc:tc:postgresql:///user-service
spring.datasource.username=root
spring.datasource.password=root
spring.jpa.hibernate.ddl-auto=create
spring.jpa.hibernate.ddl-auto=create

spring.graphql.schema.locations=classpath*:graphql/common/**/,classpath:graphql/**
Loading