Polish (#1269)

* polish code * polish code * format code * fix : build issue * Update README.md
rajadilipkolli · Jun 14, 2024 · d351ec5 · d351ec5
1 parent c77726f
commit d351ec5
Show file tree

Hide file tree

Showing 55 changed files with 135 additions and 257 deletions.
diff --git a/...api-archunit-sample/src/test/java/com/example/archunit/architecture/CustomConditions.java b/...api-archunit-sample/src/test/java/com/example/archunit/architecture/CustomConditions.java
@@ -43,8 +43,7 @@ public static ArchCondition<JavaField> haveGetterAndSetter(Map<String, String> e
 
     private static ArchCondition<JavaField> buildFieldHaveGetterAndSetterCondition(
             boolean forceSetters, Map<String, String> exclusions) {
-        return new ArchCondition<JavaField>(
-                forceSetters ? HAVE_GETTER_AND_SETTER_DESCRIPTION : HAVE_GETTER_DESCRIPTION) {
+        return new ArchCondition<>(forceSetters ? HAVE_GETTER_AND_SETTER_DESCRIPTION : HAVE_GETTER_DESCRIPTION) {
 
             @Override
             public void check(JavaField field, ConditionEvents events) {
@@ -84,7 +83,7 @@ public void check(JavaField field, ConditionEvents events) {
     }
 
     private static ArchCondition<JavaClass> buildClassHaveEqualsAndHashCodeCondition() {
-        return new ArchCondition<JavaClass>(EQUALS_AND_HASH_CODE_DESCRIPTION) {
+        return new ArchCondition<>(EQUALS_AND_HASH_CODE_DESCRIPTION) {
 
             @Override
             public void check(JavaClass javaClass, ConditionEvents events) {
@@ -109,7 +108,7 @@ public void check(JavaClass javaClass, ConditionEvents events) {
     }
 
     private static ArchCondition<JavaClass> buildStaticMethodsAreNotAllowedCondition() {
-        return new ArchCondition<JavaClass>(EQUALS_AND_HASH_CODE_DESCRIPTION) {
+        return new ArchCondition<>(EQUALS_AND_HASH_CODE_DESCRIPTION) {
 
             @Override
             public void check(JavaClass javaClass, ConditionEvents events) {

diff --git a/...choas-monkey/src/test/java/com/example/choasmonkey/gatling/CustomerRequestSimulation.java b/...choas-monkey/src/test/java/com/example/choasmonkey/gatling/CustomerRequestSimulation.java
@@ -21,20 +21,20 @@
 
 public class CustomerRequestSimulation extends Simulation {
 
-    HttpProtocolBuilder httpProtocol =
+    final HttpProtocolBuilder httpProtocol =
             http.baseUrl("http://localhost:8080")
                     .acceptHeader("application/json")
                     .userAgentHeader("Gatling/Performance Test");
 
-    Iterator<Map<String, Object>> feeder =
+    final Iterator<Map<String, Object>> feeder =
             Stream.generate(
                             (Supplier<Map<String, Object>>)
                                     () ->
                                             Collections.singletonMap(
                                                     "text", UUID.randomUUID().toString()))
                     .iterator();
 
-    ScenarioBuilder scn =
+    final ScenarioBuilder scn =
             CoreDsl.scenario("Load Test Creating Customers")
                     .feed(feeder)
                     .exec(

diff --git a/boot-mongodb-elasticsearch/config/grafana/provisioning/datasources/datasource.yml b/boot-mongodb-elasticsearch/config/grafana/provisioning/datasources/datasource.yml
@@ -6,8 +6,7 @@ deleteDatasources:
   - name: Prometheus
     orgId: 1
 
-# list of datasources to insert/update depending
-# whats available in the database
+# list of datasources to insert/update depending on what's available in the database
 datasources:
   # <string, required> name of the datasource. Required
 - name: Prometheus

diff --git a/boot-mongodb-elasticsearch/src/main/java/com/example/mongoes/web/service/SearchService.java b/boot-mongodb-elasticsearch/src/main/java/com/example/mongoes/web/service/SearchService.java
@@ -133,7 +133,7 @@ public Mono<AggregationSearchResponse> aggregateSearch(
                         });
     }
 
-    Function<Map<String, ElasticsearchAggregation>, Map<String, Map<String, Long>>>
+    final Function<Map<String, ElasticsearchAggregation>, Map<String, Map<String, Long>>>
             aggregationFunction =
                     aggregationMap -> {
                         Map<String, Map<String, Long>> resultMap = new HashMap<>();

diff --git a/...a/com/example/mongoes/elasticsearch/repository/RestaurantESRepositoryIntegrationTest.java b/...a/com/example/mongoes/elasticsearch/repository/RestaurantESRepositoryIntegrationTest.java
@@ -160,7 +160,8 @@ void findByBoroughOrCuisineOrName() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(2);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -208,7 +209,8 @@ void termQueryForBorough() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(2);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -235,7 +237,8 @@ void termsQueryForBorough() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(2);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -264,7 +267,8 @@ void queryBoolWithShould() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(2);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -304,7 +308,8 @@ void wildcardSearch() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(1);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(40363920L);
                             assertThat(restaurant1.getName()).isEqualTo("Yono gardens");
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -331,7 +336,8 @@ void regExpSearch() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(2);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -358,7 +364,8 @@ void searchSimpleQueryForBoroughAndCuisine() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(2);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -383,7 +390,8 @@ void searchRestaurantIdRange() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(1);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -411,7 +419,8 @@ void searchDateRange() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(2);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -437,7 +446,8 @@ void findAll() {
                             assertThat(searchPage.isEmpty()).isFalse();
                             assertThat(searchPage.hasContent()).isTrue();
                             assertThat(searchPage.stream().count()).isEqualTo(2);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);
@@ -471,7 +481,8 @@ void aggregation() {
                                     .isNotNull()
                                     .isExactlyInstanceOf(ElasticsearchAggregations.class);
                             assertThat(searchPage.stream().count()).isEqualTo(1);
-                            Restaurant restaurant1 = searchPage.getContent().get(0).getContent();
+                            Restaurant restaurant1 =
+                                    searchPage.getContent().getFirst().getContent();
                             assertThat(restaurant1.getRestaurantId()).isEqualTo(2L);
                             assertThat(restaurant1.getName()).isEqualTo(RESTAURANT_NAME);
                             assertThat(restaurant1.getBorough()).isEqualTo(BOROUGH_NAME);

diff --git a/boot-opensearch-sample/src/main/java/com/example/opensearch/config/Initializer.java b/boot-opensearch-sample/src/main/java/com/example/opensearch/config/Initializer.java
@@ -18,6 +18,6 @@ public Initializer(ApplicationProperties properties) {
 
     @Override
     public void run(String... args) {
-        log.info("Running Initializer.....");
+        log.info("Running Initializer..... {}", properties.getCors());
     }
 }
diff --git a/...nsearch-sample/src/main/java/com/example/opensearch/services/RestaurantSearchService.java b/...nsearch-sample/src/main/java/com/example/opensearch/services/RestaurantSearchService.java
@@ -126,7 +126,7 @@ public PagedResult<Restaurant> aggregateSearch(
         return new PagedResult<>(searchPage, map);
     }
 
-    Function<Map<String, Aggregation>, Map<String, Map<String, Long>>> aggregationFunction =
+    final Function<Map<String, Aggregation>, Map<String, Map<String, Long>>> aggregationFunction =
             aggregationMap -> {
                 Map<String, Map<String, Long>> resultMap = new HashMap<>();
                 aggregationMap.forEach(

diff --git a/boot-opensearch-sample/src/test/java/com/example/opensearch/common/ContainersConfig.java b/boot-opensearch-sample/src/test/java/com/example/opensearch/common/ContainersConfig.java
@@ -9,7 +9,7 @@
 public class ContainersConfig {
 
     @Container
-    public static OpensearchContainer<?> openSearchContainer =
+    public static final OpensearchContainer<?> openSearchContainer =
             new OpensearchContainer<>(DockerImageName.parse("opensearchproject/opensearch:2.14.0"))
                     .withEnv("OPENSEARCH_INITIAL_ADMIN_PASSWORD", "admin");
 
@@ -19,7 +19,6 @@ public class ContainersConfig {
 
     @DynamicPropertySource
     static void setApplicationProperties(DynamicPropertyRegistry dynamicPropertyRegistry) {
-        dynamicPropertyRegistry.add(
-                "opensearch.uris", () -> openSearchContainer.getHttpHostAddress());
+        dynamicPropertyRegistry.add("opensearch.uris", openSearchContainer::getHttpHostAddress);
     }
 }
diff --git a/...st-docs-sample/src/test/java/com/example/restdocs/web/controllers/UserControllerTest.java b/...st-docs-sample/src/test/java/com/example/restdocs/web/controllers/UserControllerTest.java
@@ -128,7 +128,6 @@ void shouldFindUserById() throws Exception {
                                         parameterWithName("id")
                                                 .description("The id of the user to retrieve")),
                                 responseFields(getUserFieldDescriptor())));
-        ;
     }
 
     @Test
@@ -165,7 +164,6 @@ void shouldCreateNewUser() throws Exception {
                                 preprocessResponse(prettyPrint()),
                                 requestFields(getUserRequestFieldDescriptor()),
                                 responseFields(getUserFieldDescriptor())));
-        ;
     }
 
     @Test

diff --git a/boot-strategy-plugin/docker-compose-app.yml b/boot-strategy-plugin/docker-compose-app.yml
@@ -5,7 +5,7 @@ services:
         image: ghcr.io/rajadilipkolli/my-spring-boot-experiments/boot-strategy-plugin:latest
         container_name: strategy-plugin-service
         ports:
-            - 8080:8080
+            - "8080:8080"
         depends_on: 
             grafana:
                 condition: service_healthy

diff --git a/boot-togglz-sample/config/grafana/provisioning/datasources/datasource.yml b/boot-togglz-sample/config/grafana/provisioning/datasources/datasource.yml
@@ -6,8 +6,7 @@ deleteDatasources:
   - name: Prometheus
     orgId: 1
 
-# list of datasources to insert/update depending
-# whats available in the database
+# list of datasources to insert/update depending on what's available in the database
 datasources:
   # <string, required> name of the datasource. Required
 - name: Prometheus

diff --git a/boot-ultimate-redis/src/main/java/com/example/ultimateredis/config/CacheConfig.java b/boot-ultimate-redis/src/main/java/com/example/ultimateredis/config/CacheConfig.java
@@ -39,9 +39,8 @@ RedisCacheConfiguration defaultCacheConfig() {
     @Bean
     LettuceConnectionFactory redisConnectionFactory(CacheConfigurationProperties properties) {
         log.info(
-                "Redis (/Lettuce) configuration enabled. With cache timeout "
-                        + properties.getTimeoutSeconds()
-                        + " seconds.");
+                "Redis (/Lettuce) configuration enabled. With cache timeout {} seconds.",
+                properties.getTimeoutSeconds());
 
         RedisStandaloneConfiguration redisStandaloneConfiguration =
                 new RedisStandaloneConfiguration();

diff --git a/graphql/boot-graphql-querydsl/src/main/java/com/example/graphql/querydsl/entities/Post.java b/graphql/boot-graphql-querydsl/src/main/java/com/example/graphql/querydsl/entities/Post.java
@@ -31,7 +31,7 @@ public class Post {
     private List<PostComment> comments = new ArrayList<>();
 
     @JoinColumn(name = "details_Id")
-    @OneToOne(cascade = CascadeType.ALL, mappedBy = "post", orphanRemoval = true, fetch = FetchType.LAZY)
+    @OneToOne(cascade = CascadeType.ALL, mappedBy = "post", orphanRemoval = true)
     private PostDetails details;
 
     @OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)

diff --git a/...l-webflux/src/main/java/com/example/graphql/exception/GlobalErrorWebExceptionHandler.java b/...l-webflux/src/main/java/com/example/graphql/exception/GlobalErrorWebExceptionHandler.java
@@ -1,18 +1,14 @@
 package com.example.graphql.exception;
 
-import java.util.Map;
 import org.springframework.boot.autoconfigure.web.ErrorProperties;
 import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.boot.autoconfigure.web.reactive.error.DefaultErrorWebExceptionHandler;
 import org.springframework.boot.web.reactive.error.ErrorAttributes;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.annotation.Order;
-import org.springframework.http.MediaType;
 import org.springframework.http.codec.ServerCodecConfigurer;
 import org.springframework.stereotype.Component;
-import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.server.*;
-import reactor.core.publisher.Mono;
 
 @Component
 @Order(-2)
@@ -32,13 +28,4 @@ public GlobalErrorWebExceptionHandler(
     protected RouterFunction<ServerResponse> getRoutingFunction(ErrorAttributes errorAttributes) {
         return RouterFunctions.route(RequestPredicates.all(), this::renderErrorResponse);
     }
-
-    @Override
-    protected Mono<ServerResponse> renderErrorResponse(ServerRequest request) {
-        Map<String, Object> error =
-                this.getErrorAttributes(request, this.getErrorAttributeOptions(request, MediaType.ALL));
-        return ServerResponse.status(this.getHttpStatus(error))
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(BodyInserters.fromValue(error));
-    }
 }
diff --git a/graphql/boot-graphql-webmvc/config/grafana/provisioning/datasources/datasource.yml b/graphql/boot-graphql-webmvc/config/grafana/provisioning/datasources/datasource.yml
@@ -5,8 +5,7 @@ deleteDatasources:
   - name: Prometheus
     orgId: 1
 
-# list of datasources to insert/update depending
-# whats available in the database
+# list of datasources to insert/update depending on what's available in the database
 datasources:
   - name: Prometheus
     type: prometheus

diff --git a/...-graphql-webmvc/src/main/java/com/example/graphql/config/graphql/LocalDateTimeScalar.java b/...-graphql-webmvc/src/main/java/com/example/graphql/config/graphql/LocalDateTimeScalar.java
@@ -55,17 +55,16 @@ public LocalDateTime parseValue(
                         // Will be String if the value is specified via external variables object,
                         // and a StringValue
                         // if provided direct in the query.
-                        if (input instanceof StringValue stringValue) {
-                            return parseString(stringValue.getValue());
-                        }
-                        if (input instanceof String inputString) {
-                            return parseString(inputString);
-                        }
-                        if (input instanceof LocalDateTime localDateTime) {
-                            return localDateTime;
-                        }
-                        throw new CoercingParseValueException(
-                                "Expected a 'String' but was '" + typeName(input) + "'.");
+                        return switch (input) {
+                            case StringValue stringValue -> parseString(stringValue.getValue());
+                            case String inputString -> parseString(inputString);
+                            case LocalDateTime localDateTime -> localDateTime;
+                            default ->
+                                    throw new CoercingParseValueException(
+                                            "Expected a 'String' but was '"
+                                                    + typeName(input)
+                                                    + "'.");
+                        };
                     }
 
                     private LocalDateTime parseString(String input) {

diff --git a/graphql/boot-graphql-webmvc/src/main/java/com/example/graphql/services/AuthorService.java b/graphql/boot-graphql-webmvc/src/main/java/com/example/graphql/services/AuthorService.java
@@ -7,6 +7,7 @@
 import com.example.graphql.model.response.AuthorResponse;
 import com.example.graphql.repositories.AuthorRepository;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.convert.ConversionService;
@@ -45,7 +46,7 @@ public AuthorResponse saveAuthor(AuthorRequest authorRequest) {
         AuthorEntity authorEntity =
                 this.appConversionService.convert(authorRequest, AuthorEntity.class);
         return this.appConversionService.convert(
-                authorRepository.save(authorEntity), AuthorResponse.class);
+                authorRepository.save(Objects.requireNonNull(authorEntity)), AuthorResponse.class);
     }
 
     public Optional<AuthorResponse> updateAuthor(AuthorRequest authorRequest, Long id) {