diff --git a/bookService/src/main/java/org/library/bookservice/config/OpenAPIConfig.java b/bookService/src/main/java/org/library/bookservice/config/OpenAPIConfig.java index b3a32e7..6c3a41b 100644 --- a/bookService/src/main/java/org/library/bookservice/config/OpenAPIConfig.java +++ b/bookService/src/main/java/org/library/bookservice/config/OpenAPIConfig.java @@ -18,7 +18,7 @@ public class OpenAPIConfig { @Value("${server.port}") private String port; - @Value("${spring.security.oauth2.resourceserver.jwt.token-uri}") + @Value("${openapi.api-docs.token-uri}") private String keycloakTokenUrl; private String passwordSecurityScheme = "passwordFlow"; diff --git a/bookService/src/main/java/org/library/bookservice/mapper/CategoryMapper.java b/bookService/src/main/java/org/library/bookservice/mapper/CategoryMapper.java index 389d1e0..0f34b17 100644 --- a/bookService/src/main/java/org/library/bookservice/mapper/CategoryMapper.java +++ b/bookService/src/main/java/org/library/bookservice/mapper/CategoryMapper.java @@ -18,6 +18,7 @@ public Category requestToEntity(CategoryRequest request, Optional id) { entity.setId(id.orElse(null)); entity.setName(request.getName()); + entity.setDescription(request.getDescription()); return entity; } @@ -28,6 +29,7 @@ public CategoryResponse entityToResponse(Category entity) { return CategoryResponse.builder() .id(entity.getId()) .name(entity.getName()) + .description(entity.getDescription()) .build(); } diff --git a/bookService/src/main/resources/application.properties b/bookService/src/main/resources/application.properties index 261a9fb..3f7fa16 100644 --- a/bookService/src/main/resources/application.properties +++ b/bookService/src/main/resources/application.properties @@ -4,6 +4,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.hibernate.ddl-auto=none springdoc.api-docs.path=/api-docs +openapi.api-docs.token-uri=http://localhost:8181/realms/e-library/protocol/openid-connect/token spring.kafka.template.default-topic=book-deleted spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer diff --git a/reviewService/pom.xml b/reviewService/pom.xml index 44e2c3f..2eef1e5 100644 --- a/reviewService/pom.xml +++ b/reviewService/pom.xml @@ -174,7 +174,15 @@ - + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + diff --git a/reviewService/src/main/java/org/library/reviewService/config/OpenAPIConfig.java b/reviewService/src/main/java/org/library/reviewService/config/OpenAPIConfig.java index 758257b..9d33419 100644 --- a/reviewService/src/main/java/org/library/reviewService/config/OpenAPIConfig.java +++ b/reviewService/src/main/java/org/library/reviewService/config/OpenAPIConfig.java @@ -22,7 +22,7 @@ public class OpenAPIConfig { @Value("${server.port}") private String port; - @Value("${spring.security.oauth2.resourceserver.jwt.token-uri}") + @Value("${openapi.api-docs.token-uri}") private String keycloakTokenUrl; private String passwordSecurityScheme = "passwordFlow"; diff --git a/reviewService/src/main/resources/application.properties b/reviewService/src/main/resources/application.properties index 97f8db8..ea47240 100644 --- a/reviewService/src/main/resources/application.properties +++ b/reviewService/src/main/resources/application.properties @@ -7,6 +7,7 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=DEBUG logging.level.org.springframework.security=DEBUG springdoc.api-docs.path=/api-docs +openapi.api-docs.token-uri=http://localhost:8181/realms/e-library/protocol/openid-connect/token spring.kafka.consumer.group-id=review-service spring.kafka.consumer.key-deserializer=org.apache.kafka.common.serialization.StringDeserializer