feat:upgrade the package to Java 17

Ensono · Jul 17, 2024 · 313a303 · 313a303
1 parent 5e7b524
commit 313a303
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ To customise the namespaces and create an application for your company please vi
 2. Build and run the application
    ---
 
-   Note that at a minimum [Java 11](https://adoptopenjdk.net/) should be installed.
+   Note that at a minimum [Java 17](https://adoptopenjdk.net/) should be installed.
 
    Move to the `<PROJECT-NAME>/java` folder, then
 

diff --git a/build/jenkins/azure/jenkins-pipelines-javaspring-k8s.Jenkinsfile b/build/jenkins/azure/jenkins-pipelines-javaspring-k8s.Jenkinsfile
@@ -117,7 +117,7 @@ pipeline {
               // e.g.:
               // args '-v /var/run/docker.sock:/var/run/docker.sock -u 1000:999'
               // Please check with your admin on any required steps you need to take to ensure a SUDOers access inside the containers
-              image "azul/zulu-openjdk-debian:11"
+              image "azul/zulu-openjdk-debian:17"
             }
           }
 
@@ -215,7 +215,7 @@ pipeline {
               agent {
                 docker {
                   // add additional args if you need to here
-                  image "azul/zulu-openjdk-debian:11"
+                  image "azul/zulu-openjdk-debian:17"
                 }
               }
 
@@ -364,7 +364,7 @@ pipeline {
               agent {
                 docker {
                   // add additional args if you need to here
-                  image "azul/zulu-openjdk-debian:11"
+                  image "azul/zulu-openjdk-debian:17"
                 }
               }
 
@@ -866,7 +866,7 @@ pipeline {
         stage("PostDeployDev") {
           agent {
             docker {
-              image "azul/zulu-openjdk-debian:11"
+              image "azul/zulu-openjdk-debian:17"
             }
           }
 

diff --git a/java/pom.xml b/java/pom.xml
@@ -237,6 +237,11 @@
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>
     </dependency>
+      <dependency>
+          <groupId>org.springframework.data</groupId>
+          <artifactId>spring-data-commons</artifactId>
+          <version>3.3.1</version>
+      </dependency>
 
   </dependencies>
 

diff --git a/java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java b/java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java
@@ -16,7 +16,7 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
 /** ApplicationConfig - Configuration class for Auth0 application security. */
-@Configuration("MySecurityConfig")
+@Configuration("mySecurityConfig")
 @EnableWebSecurity
 @Order(Ordered.HIGHEST_PRECEDENCE)
 public class ApplicationConfig {

diff --git a/java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java b/java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java
@@ -38,7 +38,7 @@ public WebSecurityCustomizer webSecurityCustomizer() {
    * @param http
    * @throws Exception
    */
-  @Bean(name = "test_SecurityFilterChain")
+  @Bean(name = "testSecurityFilterChain")
   public SecurityFilterChain configure(HttpSecurity http) throws Exception {
     http.authorizeHttpRequests(auth -> auth.requestMatchers("**/*").anonymous())
         .httpBasic(withDefaults());

diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java b/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java
@@ -1,18 +1,19 @@
 package com.amido.stacks.workloads.menu.domain;
 
-import jakarta.persistence.Id;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import org.springframework.data.annotation.Id;
 
 @Data
 @AllArgsConstructor
 @Builder
 public class Menu {
 
-  @Id private String id;
+  @Id
+  private String id;
 
   private String restaurantId;
 

diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java b/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java
@@ -63,7 +63,7 @@ public SearchMenuResult search(
     return new SearchMenuResult(
         pageSize,
         pageNumber,
-        menuList.stream().map(searchMenuResultItemMapper::toDto).collect(Collectors.toList()));
+        menuList.stream().map(searchMenuResultItemMapper::toDto).toList());
   }
 
   public MenuDTO get(UUID id, String correlationId) {

diff --git a/stackscli.yml b/stackscli.yml
@@ -4,7 +4,7 @@ framework:
   name: java
   commands:
     - name: java
-      version: ">= 11"
+      version: ">= 17"
 
 # Pipeline files
 pipeline:

diff --git a/stacksclipom.xml b/stacksclipom.xml
@@ -8,8 +8,8 @@
   <version>1.0.0</version>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <main.basedir>.</main.basedir>
     <source.basedir>${main.basedir}/stacks</source.basedir>
     <build.basedir>${main.basedir}/build</build.basedir>