Merge pull request #37 from amitrp/aph-15360_java21_sb_3.4

aph-15360 java 21 and SB 3.4
amitrp · Dec 17, 2024 · 53a1272 · 53a1272
2 parents 637c1e6 + 3e21b31
commit 53a1272
Show file tree

Hide file tree

Showing 154 changed files with 964 additions and 925 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
           cache: 'maven'
       - name: Build with Maven

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.5</version>
+        <version>3.4.0</version>
     </parent>
 
     <groupId>com.amitph.spring</groupId>
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -116,6 +116,38 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
+                <configuration>
+                    <java>
+                        <includes>
+                            <include>src/main/java/**/*.java</include> <!-- Check application code -->
+                            <include>src/test/java/**/*.java</include> <!-- Check application tests code -->
+                        </includes>
+                        <googleJavaFormat>
+                            <version>1.17.0</version>
+                            <style>AOSP</style>
+                        </googleJavaFormat>
+                        <importOrder />
+                        <removeUnusedImports />
+                    </java>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
     <repositories>
         <repository>

diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/Application.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/Application.java
@@ -8,4 +8,4 @@ public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
-}
+}
diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/actuator/CustomRestActuator.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/actuator/CustomRestActuator.java
@@ -1,16 +1,15 @@
 package com.amitph.spring.songs.actuator;
 
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.HashMap;
+import java.util.Map;
 import org.springframework.boot.actuate.endpoint.web.annotation.RestControllerEndpoint;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.util.HashMap;
-import java.util.Map;
-
 @Component
 @RestControllerEndpoint(id = "custom-rest-endpoint")
 public class CustomRestActuator {
@@ -24,7 +23,7 @@ public Map<String, String> get() {
     }
 
     @PostMapping
-    public String post(@RequestBody  String request) {
+    public String post(@RequestBody String request) {
         return "We have received your request: " + request;
     }
-}
+}
diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/actuator/ServerTimeActuator.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/actuator/ServerTimeActuator.java
@@ -1,16 +1,15 @@
 package com.amitph.spring.songs.actuator;
 
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.HashMap;
+import java.util.Map;
 import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.util.HashMap;
-import java.util.Map;
-
 @Component
 @Endpoint(id = "custom-endpoint")
 public class ServerTimeActuator {
@@ -34,4 +33,4 @@ public String deleteOperation() {
         // Implementation skipped
         return "";
     }
-}
+}
diff --git a/...boot-actuator/src/main/java/com/amitph/spring/songs/actuator/ServiceAHealthIndicator.java b/...boot-actuator/src/main/java/com/amitph/spring/songs/actuator/ServiceAHealthIndicator.java
@@ -6,7 +6,8 @@
 
 @Component
 public class ServiceAHealthIndicator implements HealthIndicator {
-        private final String message_key = "Service A";
+    private final String message_key = "Service A";
+
     @Override
     public Health health() {
         if (!isRunningServiceA()) {
@@ -21,4 +22,4 @@ private Boolean isRunningServiceA() {
 
         return isRunning;
     }
-}
+}
diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/data/Song.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/data/Song.java
@@ -1,14 +1,12 @@
 package com.amitph.spring.songs.data;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class Song {
-    @Id
-    @GeneratedValue
-    private Long songId;
+    @Id @GeneratedValue private Long songId;
 
     private String title;
     private String album;
@@ -54,4 +52,4 @@ public Integer getYear() {
     public void setYear(Integer year) {
         this.year = year;
     }
-}
+}
diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/data/SongRepository.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/data/SongRepository.java
@@ -1,11 +1,10 @@
 package com.amitph.spring.songs.data;
 
+import java.util.List;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 @Repository
 public interface SongRepository extends CrudRepository<Song, Long> {
     List<Song> findAll();
-}
+}
diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/service/SongService.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/service/SongService.java
@@ -2,12 +2,10 @@
 
 import com.amitph.spring.songs.data.SongRepository;
 import com.amitph.spring.songs.web.SongDto;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import java.util.List;
 import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
@@ -16,10 +14,12 @@ public class SongService {
     private final SongTransformer transformer;
 
     public List<SongDto> getAllSongs() {
-        return repository.findAll().stream().map(transformer::transform).collect(Collectors.toList());
+        return repository.findAll().stream()
+                .map(transformer::transform)
+                .collect(Collectors.toList());
     }
 
     public SongDto addNewSong(SongDto dto) {
         return transformer.transform(repository.save(transformer.transform(dto)));
     }
-}
+}
diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/service/SongTransformer.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/service/SongTransformer.java
@@ -24,4 +24,4 @@ public Song transform(SongDto dto) {
         song.setYear(dto.getYear());
         return song;
     }
-}
+}
diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/web/SongController.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/web/SongController.java
@@ -1,16 +1,14 @@
 package com.amitph.spring.songs.web;
 
 import com.amitph.spring.songs.service.SongService;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/songs")
 @RequiredArgsConstructor
@@ -26,4 +24,4 @@ public List<SongDto> getAll() {
     public SongDto addSong(@RequestBody SongDto dto) {
         return songService.addNewSong(dto);
     }
-}
+}
diff --git a/spring-boot-actuator/src/main/java/com/amitph/spring/songs/web/SongDto.java b/spring-boot-actuator/src/main/java/com/amitph/spring/songs/web/SongDto.java
@@ -46,4 +46,4 @@ public Integer getYear() {
     public void setYear(Integer year) {
         this.year = year;
     }
-}
+}
diff --git a/spring-boot-admin-server/src/main/java/com/amitph/spring/adminserver/Application.java b/spring-boot-admin-server/src/main/java/com/amitph/spring/adminserver/Application.java
@@ -10,4 +10,4 @@ public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
-}
+}
diff --git a/...-boot-admin-server/src/main/java/com/amitph/spring/adminserver/SecurityConfiguration.java b/...-boot-admin-server/src/main/java/com/amitph/spring/adminserver/SecurityConfiguration.java
@@ -1,34 +1,51 @@
 package com.amitph.spring.adminserver;
 
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 
 @Configuration
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration {
     private final String adminContextPath;
 
     public SecurityConfiguration(AdminServerProperties adminServerProperties) {
         this.adminContextPath = adminServerProperties.getContextPath();
     }
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
+    @Bean
+    protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        SavedRequestAwareAuthenticationSuccessHandler successHandler =
+                new SavedRequestAwareAuthenticationSuccessHandler();
         successHandler.setTargetUrlParameter("redirectTo");
         successHandler.setDefaultTargetUrl(adminContextPath + "/");
 
-        http
-                .authorizeRequests().antMatchers(adminContextPath + "/assets/**").permitAll()
-                .antMatchers(adminContextPath + "/login").permitAll()
-                .anyRequest().authenticated()
-                .and().formLogin().loginPage(adminContextPath + "/login").successHandler(successHandler)
-                .and().logout().logoutUrl(adminContextPath + "/logout")
-                .and().httpBasic()
-                .and().csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-                .ignoringAntMatchers(adminContextPath + "/instances", adminContextPath + "/actuator/**");
+        http.authorizeHttpRequests(
+                        req ->
+                                req.requestMatchers(adminContextPath + "/assets/**")
+                                        .permitAll()
+                                        .requestMatchers(adminContextPath + "/login")
+                                        .permitAll()
+                                        .anyRequest()
+                                        .authenticated())
+                .formLogin(
+                        formLogin ->
+                                formLogin
+                                        .loginPage(adminContextPath + "/login")
+                                        .successHandler(successHandler))
+                .logout(logout -> logout.logoutUrl(adminContextPath + "/logout"))
+                .httpBasic(Customizer.withDefaults())
+                .csrf(
+                        csrf ->
+                                csrf.csrfTokenRepository(
+                                                CookieCsrfTokenRepository.withHttpOnlyFalse())
+                                        .ignoringRequestMatchers(
+                                                adminContextPath + "/instances",
+                                                adminContextPath + "/actuator/**"));
+        return http.build();
     }
-}
+}
diff --git a/spring-boot-command-line/src/main/java/com/amitph/spring/nonweb/Application.java b/spring-boot-command-line/src/main/java/com/amitph/spring/nonweb/Application.java
@@ -15,9 +15,8 @@ public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
 
-
     @Override
     public void run(String... args) throws Exception {
         service.printMessage(args);
     }
-}
+}
diff --git a/spring-boot-command-line/src/main/java/com/amitph/spring/nonweb/service/NonWebService.java b/spring-boot-command-line/src/main/java/com/amitph/spring/nonweb/service/NonWebService.java
@@ -1,13 +1,12 @@
 package com.amitph.spring.nonweb.service;
 
-import org.springframework.stereotype.Service;
-
 import java.util.Arrays;
+import org.springframework.stereotype.Service;
 
 @Service
 public class NonWebService {
     public void printMessage(String[] arguments) {
         System.out.println("Inside NonWebService Class. Received below arguments");
         Arrays.stream(arguments).forEach(System.out::println);
     }
-}
+}
diff --git a/spring-boot-data-jpa/pom.xml b/spring-boot-data-jpa/pom.xml
@@ -19,7 +19,7 @@
     </modules>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
     </properties>
 
     <dependencyManagement>

diff --git a/...ot-data-jpa/spring-boot-data-jpa-h2/src/main/java/com/amitph/spring/data/Application.java b/...ot-data-jpa/spring-boot-data-jpa-h2/src/main/java/com/amitph/spring/data/Application.java
@@ -8,4 +8,4 @@ public class Application {
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ public class Application { @@
         public static void main(String[] args) {
             SpringApplication.run(Application.class, args);
         }
-    }
+    }