diff --git a/spring-boot-modules/spring-boot-libraries-2/pom.xml b/spring-boot-modules/spring-boot-libraries-2/pom.xml index ffd535983cbe..945f86eba7cc 100644 --- a/spring-boot-modules/spring-boot-libraries-2/pom.xml +++ b/spring-boot-modules/spring-boot-libraries-2/pom.xml @@ -11,18 +11,6 @@ 1.0.0-SNAPSHOT - - - - org.springframework.modulith - spring-modulith-bom - ${spring-modulith-bom.version} - import - pom - - - - org.springframework.boot @@ -36,10 +24,6 @@ org.springframework.boot spring-boot-starter-actuator - - ch.qos.logback - logback-classic - org.springframework.data spring-data-jpa @@ -54,22 +38,6 @@ jobrunr-spring-boot-starter ${jobrunr-spring-boot-starter.version} - - - org.openapitools - openapi-generator - ${openapi-generator.version} - - - org.openapitools - jackson-databind-nullable - ${jackson-databind-nullable.version} - - - org.springdoc - springdoc-openapi-ui - ${springdoc.version} - org.springframework.boot spring-boot-starter-test @@ -91,62 +59,49 @@ jandex ${jandex.version} + - io.github.resilience4j - resilience4j-spring-boot2 - ${resilience4j-spring-boot2.version} + org.zalando + problem-spring-web + ${problem-spring-web.version} - - com.github.tomakehurst - wiremock-jre8 - ${wiremock-jre8.version} - test + org.zalando + jackson-datatype-problem + ${jackson-datatype-problem.version} - org.springframework.modulith - spring-modulith-api + org.springframework.boot + spring-boot-starter-security + - org.springframework.modulith - spring-modulith-starter-test - test + org.togglz + togglz-spring-boot-starter + ${togglz.version} + + + org.togglz + togglz-spring-security + ${togglz.version} + + + jakarta.persistence + jakarta.persistence-api + ${jakarta.persistence-api.version} + + + com.h2database + h2 + + + org.springframework.boot + spring-boot-starter-data-jpa - - org.openapitools - openapi-generator-maven-plugin - ${openapi-generator.version} - - - - generate - - - - ${project.basedir}/src/main/resources/petstore.yml - - spring - com.baeldung.openapi.api - com.baeldung.openapi.model - true - true - true - - ApiUtil.java - - - false - true - - - - - - org.jboss.jandex jandex-maven-plugin @@ -172,20 +127,16 @@ - 1.2.2 5.1.7 4.0.3 - 7.8.0 - 2.4.5 - 0.2.1 0.10.2 2.4.3.Final - 2.0.2 - 2.34.0 1.2.3 - 1.7.0 - com.baeldung.openapi.OpenApiApplication - 3.2.2 + com.baeldung.kong.StockApp + 0.29.1 + 0.27.1 + 4.4.0 + 3.1.0 \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/SpringProblemApplication.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/SpringProblemApplication.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/SpringProblemApplication.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/SpringProblemApplication.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/advice/ExceptionHandler.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/advice/ExceptionHandler.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/advice/ExceptionHandler.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/advice/ExceptionHandler.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/advice/SecurityExceptionHandler.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/advice/SecurityExceptionHandler.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/advice/SecurityExceptionHandler.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/advice/SecurityExceptionHandler.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/configuration/ProblemDemoConfiguration.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/configuration/ProblemDemoConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/configuration/ProblemDemoConfiguration.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/configuration/ProblemDemoConfiguration.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/configuration/SecurityConfiguration.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/configuration/SecurityConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/configuration/SecurityConfiguration.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/configuration/SecurityConfiguration.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/controller/ProblemDemoController.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/controller/ProblemDemoController.java similarity index 96% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/controller/ProblemDemoController.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/controller/ProblemDemoController.java index 50f1ad5137c1..d04cd237d363 100644 --- a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/controller/ProblemDemoController.java +++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/controller/ProblemDemoController.java @@ -6,6 +6,7 @@ import java.util.Map; import org.springframework.http.MediaType; +//import org.springframework.security.access.AccessDeniedException; import org.springframework.security.access.AccessDeniedException; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/dto/Task.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/dto/Task.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/dto/Task.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/dto/Task.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/problems/TaskNotFoundProblem.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/problems/TaskNotFoundProblem.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/boot/problem/problems/TaskNotFoundProblem.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/boot/problem/problems/TaskNotFoundProblem.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/Employee.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/Employee.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/Employee.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/Employee.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/EmployeeRepository.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/EmployeeRepository.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/EmployeeRepository.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/EmployeeRepository.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/FeatureAssociation.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/FeatureAssociation.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/FeatureAssociation.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/FeatureAssociation.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/FeaturesAspect.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/FeaturesAspect.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/FeaturesAspect.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/FeaturesAspect.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/MyFeatures.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/MyFeatures.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/MyFeatures.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/MyFeatures.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/SalaryController.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/SalaryController.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/SalaryController.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/SalaryController.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/SalaryService.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/SalaryService.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/SalaryService.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/SalaryService.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/ToggleApplication.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/ToggleApplication.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/ToggleApplication.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/ToggleApplication.java index 9a237261af1e..223425bfbc2e 100644 --- a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/ToggleApplication.java +++ b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/ToggleApplication.java @@ -1,10 +1,10 @@ package com.baeldung.toggle; -import jakarta.annotation.security.RolesAllowed; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import jakarta.annotation.security.RolesAllowed; + @SpringBootApplication public class ToggleApplication { @RolesAllowed("*") diff --git a/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/ToggleConfiguration.java b/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/ToggleConfiguration.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/toggle/ToggleConfiguration.java rename to spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/toggle/ToggleConfiguration.java diff --git a/spring-boot-modules/spring-boot-libraries/src/main/resources/application-problem.properties b/spring-boot-modules/spring-boot-libraries-2/src/main/resources/application-problem.properties similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/main/resources/application-problem.properties rename to spring-boot-modules/spring-boot-libraries-2/src/main/resources/application-problem.properties diff --git a/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/boot/problem/controller/ProblemDemoControllerIntegrationTest.java b/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/boot/problem/controller/ProblemDemoControllerIntegrationTest.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/boot/problem/controller/ProblemDemoControllerIntegrationTest.java rename to spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/boot/problem/controller/ProblemDemoControllerIntegrationTest.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/toggle/TestTogglzConfig.java b/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/toggle/TestTogglzConfig.java new file mode 100644 index 000000000000..d6aca0281e0c --- /dev/null +++ b/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/toggle/TestTogglzConfig.java @@ -0,0 +1,24 @@ +package com.baeldung.toggle; + +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.togglz.core.manager.FeatureManager; +import org.togglz.core.manager.FeatureManagerBuilder; +import org.togglz.core.repository.mem.InMemoryStateRepository; +import org.togglz.core.user.NoOpUserProvider; +import org.togglz.core.context.StaticFeatureManagerProvider; + + +@TestConfiguration +public class TestTogglzConfig { + @Bean + public FeatureManager featureManager() { + FeatureManager manager = new FeatureManagerBuilder() + .featureEnum(MyFeatures.class) + .stateRepository(new InMemoryStateRepository()) + .userProvider(new NoOpUserProvider()) + .build(); + StaticFeatureManagerProvider.setFeatureManager(manager); + return manager; + } +} \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/toggle/ToggleIntegrationTest.java b/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/toggle/ToggleIntegrationTest.java similarity index 97% rename from spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/toggle/ToggleIntegrationTest.java rename to spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/toggle/ToggleIntegrationTest.java index 3213a10df961..decf980a9ac0 100644 --- a/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/toggle/ToggleIntegrationTest.java +++ b/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/toggle/ToggleIntegrationTest.java @@ -16,7 +16,7 @@ import org.springframework.web.context.WebApplicationContext; @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = ToggleApplication.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = {ToggleApplication.class, TestTogglzConfig.class}) @AutoConfigureMockMvc public class ToggleIntegrationTest { diff --git a/spring-boot-modules/spring-boot-libraries/pom.xml b/spring-boot-modules/spring-boot-libraries/pom.xml index 5f4e997051ab..cc856f47c2aa 100644 --- a/spring-boot-modules/spring-boot-libraries/pom.xml +++ b/spring-boot-modules/spring-boot-libraries/pom.xml @@ -13,7 +13,29 @@ 1.0.0-SNAPSHOT + + + + org.springframework.modulith + spring-modulith-bom + ${spring-modulith-bom.version} + import + pom + + + + + + + org.springframework.modulith + spring-modulith-api + + + org.springframework.modulith + spring-modulith-starter-test + test + org.springframework.boot spring-boot-starter-web @@ -39,28 +61,6 @@ spring-boot-starter-test test - - - org.togglz - togglz-spring-boot-starter - ${togglz.version} - - - org.togglz - togglz-spring-security - ${togglz.version} - - - - org.zalando - problem-spring-web - ${problem-spring-web.version} - - - org.zalando - jackson-datatype-problem - ${jackson-datatype-problem.version} - net.javacrumbs.shedlock @@ -142,6 +142,44 @@ qrcodegen ${qrcodegen.version} + + io.github.resilience4j + resilience4j-spring-boot2 + ${resilience4j-spring-boot2.version} + + + + com.github.tomakehurst + wiremock-jre8 + ${wiremock-jre8.version} + test + + + + org.openapitools + openapi-generator + ${openapi-generator.version} + + + org.slf4j + slf4j-simple + + + + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable.version} + + + org.springdoc + springdoc-openapi-ui + ${springdoc.version} + + + ch.qos.logback + logback-classic + @@ -189,6 +227,37 @@ ${project.build.outputDirectory}/git.properties + + org.openapitools + openapi-generator-maven-plugin + ${openapi-generator.version} + + + + generate + + + + ${project.basedir}/src/main/resources/petstore.yml + + spring + com.baeldung.openapi.api + com.baeldung.openapi.model + true + true + true + + ApiUtil.java + + + false + true + true + + + + + @@ -231,15 +300,12 @@ - - com.baeldung.graphql.DemoApplication - 4.4.0 + com.baeldung.openapi.OpenApiApplication + 1.2.2 1.9.0 5.2.4 2.2.4 3.2.0 - 0.29.1 - 0.27.1 6.3.1 1.5-beta1 2.1 @@ -250,6 +316,11 @@ 3.1.8 0.4.6 1.8.0 + 2.0.2 + 2.34.0 + 7.8.0 + 1.7.0 + 0.2.1 diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/Application.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/Application.java similarity index 99% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/Application.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/Application.java index c2d26ab955df..32b8bf7316be 100644 --- a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/Application.java +++ b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/Application.java @@ -1,12 +1,13 @@ package com.baeldung.modulith; -import com.baeldung.modulith.product.ProductDto; -import com.baeldung.modulith.product.ProductService; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableAsync; +import com.baeldung.modulith.product.ProductDto; +import com.baeldung.modulith.product.ProductService; + @EnableAsync @SpringBootApplication @EnableAutoConfiguration diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationDTO.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/NotificationDTO.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationDTO.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/NotificationDTO.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationService.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/NotificationService.java similarity index 99% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationService.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/NotificationService.java index f356b9eaa6ab..0d60f9a203b3 100644 --- a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/NotificationService.java +++ b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/NotificationService.java @@ -1,12 +1,13 @@ package com.baeldung.modulith.notification; -import com.baeldung.modulith.notification.internal.Notification; -import com.baeldung.modulith.notification.internal.NotificationType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.modulith.ApplicationModuleListener; import org.springframework.stereotype.Service; +import com.baeldung.modulith.notification.internal.Notification; +import com.baeldung.modulith.notification.internal.NotificationType; + @Service public class NotificationService { diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/Notification.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/internal/Notification.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/Notification.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/internal/Notification.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/NotificationType.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/internal/NotificationType.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/notification/internal/NotificationType.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/notification/internal/NotificationType.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/ProductDto.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/product/ProductDto.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/ProductDto.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/product/ProductDto.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/ProductService.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/product/ProductService.java similarity index 99% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/ProductService.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/product/ProductService.java index 39bb09de6473..9c9a0797cd8e 100644 --- a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/ProductService.java +++ b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/product/ProductService.java @@ -1,12 +1,13 @@ package com.baeldung.modulith.product; -import com.baeldung.modulith.notification.NotificationDTO; -import com.baeldung.modulith.notification.NotificationService; -import com.baeldung.modulith.product.internal.Product; +import java.util.Date; + import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; -import java.util.Date; +import com.baeldung.modulith.notification.NotificationDTO; +import com.baeldung.modulith.notification.NotificationService; +import com.baeldung.modulith.product.internal.Product; @Service public class ProductService { diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/internal/Product.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/product/internal/Product.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/modulith/product/internal/Product.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/modulith/product/internal/Product.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/OpenApiApplication.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/openapi/OpenApiApplication.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/openapi/OpenApiApplication.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/openapi/OpenApiApplication.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ApiExceptionHandler.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ApiExceptionHandler.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ApiExceptionHandler.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ApiExceptionHandler.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ExternalAPICaller.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ExternalAPICaller.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ExternalAPICaller.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ExternalAPICaller.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ExternalApiCallerConfig.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ExternalApiCallerConfig.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ExternalApiCallerConfig.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ExternalApiCallerConfig.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ResilientApp.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ResilientApp.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ResilientApp.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ResilientApp.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ResilientAppController.java b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ResilientAppController.java similarity index 99% rename from spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ResilientAppController.java rename to spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ResilientAppController.java index 0b99f7cec0c1..bb80b4f298ad 100644 --- a/spring-boot-modules/spring-boot-libraries-2/src/main/java/com/baeldung/resilientapp/ResilientAppController.java +++ b/spring-boot-modules/spring-boot-libraries/src/main/java/com/baeldung/resilientapp/ResilientAppController.java @@ -3,7 +3,6 @@ import java.util.concurrent.CompletableFuture; import org.springframework.beans.factory.annotation.Autowired; - import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/spring-boot-modules/spring-boot-libraries-2/src/main/resources/petstore.yml b/spring-boot-modules/spring-boot-libraries/src/main/resources/petstore.yml similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/main/resources/petstore.yml rename to spring-boot-modules/spring-boot-libraries/src/main/resources/petstore.yml diff --git a/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/modulith/ApplicationModularityUnitTest.java b/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/modulith/ApplicationModularityUnitTest.java similarity index 100% rename from spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/modulith/ApplicationModularityUnitTest.java rename to spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/modulith/ApplicationModularityUnitTest.java diff --git a/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/openapi/OpenApiPetsIntegrationTest.java b/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/openapi/OpenApiPetsIntegrationTest.java similarity index 70% rename from spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/openapi/OpenApiPetsIntegrationTest.java rename to spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/openapi/OpenApiPetsIntegrationTest.java index 2ef034bada5d..2e5a30e548e3 100644 --- a/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/openapi/OpenApiPetsIntegrationTest.java +++ b/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/openapi/OpenApiPetsIntegrationTest.java @@ -8,10 +8,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; + @RunWith(SpringRunner.class) @SpringBootTest(classes = OpenApiApplication.class) @ComponentScan("com.baeldung.openapi") @@ -23,6 +28,15 @@ public class OpenApiPetsIntegrationTest { @Autowired private MockMvc mockMvc; + @TestConfiguration + static class NoSecurityConfig { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.csrf().disable().authorizeHttpRequests().anyRequest().permitAll(); + return http.build(); + } + } + @Test public void whenReadAll_thenStatusIsNotImplemented() throws Exception { this.mockMvc.perform(get(PETS_PATH)) diff --git a/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/resilientapp/ResilientAppControllerManualTest.java b/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/resilientapp/ResilientAppControllerManualTest.java similarity index 97% rename from spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/resilientapp/ResilientAppControllerManualTest.java rename to spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/resilientapp/ResilientAppControllerManualTest.java index 26c50ee39dc8..fc9761b9cb40 100644 --- a/spring-boot-modules/spring-boot-libraries-2/src/test/java/com/baeldung/resilientapp/ResilientAppControllerManualTest.java +++ b/spring-boot-modules/spring-boot-libraries/src/test/java/com/baeldung/resilientapp/ResilientAppControllerManualTest.java @@ -3,25 +3,21 @@ import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.ok; import static com.github.tomakehurst.wiremock.client.WireMock.serverError; - import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.junit.jupiter.api.Assertions.*; - +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.springframework.http.HttpStatus.BANDWIDTH_LIMIT_EXCEEDED; import static org.springframework.http.HttpStatus.OK; import static org.springframework.http.HttpStatus.TOO_MANY_REQUESTS; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import java.util.stream.IntStream; import org.junit.Assert; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate;