feat : apply spring boot best practices

rajadilipkolli · Aug 31, 2024 · 60a83ce · 60a83ce
1 parent 0ffcb96
commit 60a83ce
Show file tree

Hide file tree

Showing 51 changed files with 138 additions and 78 deletions.
diff --git a/batch-boot-jpa-sample/Dockerfile b/batch-boot-jpa-sample/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/boot-api-archunit-sample/Dockerfile b/boot-api-archunit-sample/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/boot-choas-monkey/Dockerfile b/boot-choas-monkey/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/boot-grafana-lgtm/src/main/resources/application.properties b/boot-grafana-lgtm/src/main/resources/application.properties
@@ -1,4 +1,5 @@
-spring.application.name=boot-grafana-lgtm
+spring.application.name=boot-grafana-lgtm
+spring.threads.virtual.enabled=true
 
 management.endpoints.web.exposure.include=env,health,info,logfile,loggers,metrics,prometheus
 management.tracing.sampling.probability=1.0

diff --git a/boot-grafana-lgtm/src/test/java/com/learning/grafanalgtm/GrafanaLGTMApplicationTest.java b/boot-grafana-lgtm/src/test/java/com/learning/grafanalgtm/GrafanaLGTMApplicationTest.java
@@ -8,7 +8,7 @@
 import io.restassured.RestAssured;
 import io.restassured.authentication.PreemptiveBasicAuthScheme;
 import io.restassured.http.ContentType;
-import org.apache.http.HttpStatus;
+import org.apache.hc.core5.http.HttpStatus;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/boot-mongodb-elasticsearch/Dockerfile b/boot-mongodb-elasticsearch/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/boot-opensearch-sample/Dockerfile b/boot-opensearch-sample/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/boot-rest-docs-sample/Dockerfile b/boot-rest-docs-sample/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/boot-togglz-sample/Dockerfile b/boot-togglz-sample/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/...timate-redis/src/main/java/com/example/ultimateredis/config/RedisValueOperationsUtil.java b/...timate-redis/src/main/java/com/example/ultimateredis/config/RedisValueOperationsUtil.java
@@ -1,7 +1,6 @@
 package com.example.ultimateredis.config;
 
 import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
@@ -12,7 +11,6 @@ public class RedisValueOperationsUtil<T> {
     private final RedisTemplate<String, T> redisTemplate;
     private final ValueOperations<String, T> valueOperations;
 
-    @Autowired
     public RedisValueOperationsUtil(RedisTemplate<String, T> redisTemplate) {
         this.redisTemplate = redisTemplate;
         this.valueOperations = redisTemplate.opsForValue();

diff --git a/boot-ultimate-redis/src/main/java/com/example/ultimateredis/controller/RedisController.java b/boot-ultimate-redis/src/main/java/com/example/ultimateredis/controller/RedisController.java
@@ -31,8 +31,7 @@ public ResponseEntity<GenericResponse<Boolean>> addRedisKeyValue(
     }
 
     @GetMapping
-    public ResponseEntity<GenericResponse<String>> getFromCache(
-            @RequestParam(value = "key") String key) {
+    public ResponseEntity<GenericResponse<String>> getFromCache(@RequestParam String key) {
 
         String value = redisService.getValue(key);
         return ResponseEntity.ok(new GenericResponse<>(value));

diff --git a/graphql/boot-graphql-querydsl/Dockerfile b/graphql/boot-graphql-querydsl/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/graphql/boot-graphql-webflux/Dockerfile b/graphql/boot-graphql-webflux/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/graphql/boot-graphql-webmvc/Dockerfile b/graphql/boot-graphql-webmvc/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/httpClients/boot-http-proxy/Dockerfile b/httpClients/boot-http-proxy/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/httpClients/boot-rest-template/Dockerfile b/httpClients/boot-rest-template/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/httpClients/boot-web-client-mvc/Dockerfile b/httpClients/boot-web-client-mvc/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/httpClients/boot-web-client-webflux/Dockerfile b/httpClients/boot-web-client-webflux/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/jpa/boot-data-customsequence/Dockerfile b/jpa/boot-data-customsequence/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/jpa/boot-data-envers/Dockerfile b/jpa/boot-data-envers/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/...ot-data-envers/src/test/java/com/example/envers/web/controllers/CustomerControllerIT.java b/...ot-data-envers/src/test/java/com/example/envers/web/controllers/CustomerControllerIT.java
@@ -13,8 +13,8 @@
 import io.restassured.http.ContentType;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpStatus;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpStatus;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;

diff --git a/jpa/boot-data-keyset-pagination/Dockerfile b/jpa/boot-data-keyset-pagination/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/jpa/boot-hibernate2ndlevelcache-sample/Dockerfile b/jpa/boot-hibernate2ndlevelcache-sample/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/...e-sample/src/main/java/com/example/hibernatecache/web/controllers/CustomerController.java b/...e-sample/src/main/java/com/example/hibernatecache/web/controllers/CustomerController.java
@@ -34,14 +34,10 @@ class CustomerController {
 
     @GetMapping
     PagedResult<CustomerResponse> getAllCustomers(
-            @RequestParam(value = "pageNo", defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false)
-                    int pageNo,
-            @RequestParam(value = "pageSize", defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false)
-                    int pageSize,
-            @RequestParam(value = "sortBy", defaultValue = AppConstants.DEFAULT_SORT_BY, required = false)
-                    String sortBy,
-            @RequestParam(value = "sortDir", defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false)
-                    String sortDir) {
+            @RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false) int pageNo,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false) int pageSize,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_SORT_BY, required = false) String sortBy,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false) String sortDir) {
         FindCustomersQuery findCustomersQuery = new FindCustomersQuery(pageNo, pageSize, sortBy, sortDir);
         return customerService.findAllCustomers(findCustomersQuery);
     }

diff --git a/...ache-sample/src/main/java/com/example/hibernatecache/web/controllers/OrderController.java b/...ache-sample/src/main/java/com/example/hibernatecache/web/controllers/OrderController.java
@@ -34,14 +34,10 @@ class OrderController {
 
     @GetMapping
     PagedResult<OrderResponse> getAllOrders(
-            @RequestParam(value = "pageNo", defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false)
-                    int pageNo,
-            @RequestParam(value = "pageSize", defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false)
-                    int pageSize,
-            @RequestParam(value = "sortBy", defaultValue = AppConstants.DEFAULT_SORT_BY, required = false)
-                    String sortBy,
-            @RequestParam(value = "sortDir", defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false)
-                    String sortDir) {
+            @RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false) int pageNo,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false) int pageSize,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_SORT_BY, required = false) String sortBy,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false) String sortDir) {
         FindOrdersQuery findOrdersQuery = new FindOrdersQuery(pageNo, pageSize, sortBy, sortDir);
         return orderService.findAllOrders(findOrdersQuery);
     }

diff --git a/...-sample/src/main/java/com/example/hibernatecache/web/controllers/OrderItemController.java b/...-sample/src/main/java/com/example/hibernatecache/web/controllers/OrderItemController.java
@@ -34,14 +34,10 @@ class OrderItemController {
 
     @GetMapping
     PagedResult<OrderItemResponse> getAllOrderItems(
-            @RequestParam(value = "pageNo", defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false)
-                    int pageNo,
-            @RequestParam(value = "pageSize", defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false)
-                    int pageSize,
-            @RequestParam(value = "sortBy", defaultValue = AppConstants.DEFAULT_SORT_BY, required = false)
-                    String sortBy,
-            @RequestParam(value = "sortDir", defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false)
-                    String sortDir) {
+            @RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false) int pageNo,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false) int pageSize,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_SORT_BY, required = false) String sortBy,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false) String sortDir) {
         FindOrderItemsQuery findOrderItemsQuery = new FindOrderItemsQuery(pageNo, pageSize, sortBy, sortDir);
         return orderItemService.findAllOrderItems(findOrderItemsQuery);
     }

diff --git a/jpa/boot-jndi-sample/Dockerfile b/jpa/boot-jndi-sample/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/jpa/boot-jndi-sample/src/main/java/com/example/jndi/web/controllers/DriverController.java b/jpa/boot-jndi-sample/src/main/java/com/example/jndi/web/controllers/DriverController.java
@@ -34,14 +34,10 @@ public class DriverController {
 
     @GetMapping
     public PagedResult<DriverResponse> getAllDrivers(
-            @RequestParam(value = "pageNo", defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false)
-                    int pageNo,
-            @RequestParam(value = "pageSize", defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false)
-                    int pageSize,
-            @RequestParam(value = "sortBy", defaultValue = AppConstants.DEFAULT_SORT_BY, required = false)
-                    String sortBy,
-            @RequestParam(value = "sortDir", defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false)
-                    String sortDir) {
+            @RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false) int pageNo,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false) int pageSize,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_SORT_BY, required = false) String sortBy,
+            @RequestParam(defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false) String sortDir) {
         FindDriversQuery findDriversQuery = new FindDriversQuery(pageNo, pageSize, sortBy, sortDir);
         return driverService.findAllDrivers(findDriversQuery);
     }

diff --git a/jpa/boot-jndi-sample/src/main/resources/application.properties b/jpa/boot-jndi-sample/src/main/resources/application.properties
@@ -4,6 +4,7 @@ server.shutdown=graceful
 spring.main.allow-bean-definition-overriding=true
 spring.jmx.enabled=false
 spring.mvc.problemdetails.enabled=true
+spring.threads.virtual.enabled=true
 
 ################ Actuator #####################
 management.endpoints.web.exposure.include=configprops,env,health,info,logfile,loggers,metrics,prometheus

diff --git a/jpa/boot-jndi-sample/src/test/java/com/example/jndi/web/controllers/DriverControllerIT.java b/jpa/boot-jndi-sample/src/test/java/com/example/jndi/web/controllers/DriverControllerIT.java
@@ -58,7 +58,7 @@ void shouldFetchAllDrivers() throws Exception {
 
     @Test
     void shouldFindDriverById() throws Exception {
-        Driver driver = driverList.get(0);
+        Driver driver = driverList.getFirst();
         Long driverId = driver.getId();
 
         this.mockMvc
@@ -104,7 +104,7 @@ void shouldReturn400WhenCreateNewDriverWithoutText() throws Exception {
 
     @Test
     void shouldUpdateDriver() throws Exception {
-        Long driverId = driverList.get(0).getId();
+        Long driverId = driverList.getFirst().getId();
         DriverRequest driverRequest = new DriverRequest("Updated Driver");
 
         this.mockMvc
@@ -118,7 +118,7 @@ void shouldUpdateDriver() throws Exception {
 
     @Test
     void shouldDeleteDriver() throws Exception {
-        Driver driver = driverList.get(0);
+        Driver driver = driverList.getFirst();
 
         this.mockMvc
                 .perform(delete("/api/drivers/{id}", driver.getId()))

diff --git a/jpa/boot-jpa-locks/Dockerfile b/jpa/boot-jpa-locks/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/...stgresql/src/main/java/com/example/demo/readreplica/config/routing/RoutingDataSource.java b/...stgresql/src/main/java/com/example/demo/readreplica/config/routing/RoutingDataSource.java
@@ -23,4 +23,26 @@ public static void setReplicaRoute() {
     protected Object determineCurrentLookupKey() {
         return routeContext.get();
     }
+
+    public boolean isWrapperFor(Class<?> iface) throws java.sql.SQLException {
+        // TODO Auto-generated method stub
+        return iface != null && iface.isAssignableFrom(this.getClass());
+    }
+
+    public <T> T unwrap(Class<T> iface) throws java.sql.SQLException {
+        // TODO Auto-generated method stub
+        try {
+            if (iface != null && iface.isAssignableFrom(this.getClass())) {
+                return (T) this;
+            }
+            throw new java.sql.SQLException("Auto-generated unwrap failed; Revisit implementation");
+        } catch (Exception e) {
+            throw new java.sql.SQLException(e);
+        }
+    }
+
+    public java.util.logging.Logger getParentLogger() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
diff --git a/jpa/multitenancy/multidatasource-multitenancy/Dockerfile b/jpa/multitenancy/multidatasource-multitenancy/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/...cy/src/main/java/com/example/multitenancy/config/multitenant/TenantRoutingDatasource.java b/...cy/src/main/java/com/example/multitenancy/config/multitenant/TenantRoutingDatasource.java
@@ -37,4 +37,26 @@ public class TenantRoutingDatasource extends AbstractRoutingDataSource {
     protected String determineCurrentLookupKey() {
         return tenantIdentifierResolver.resolveCurrentTenantIdentifier();
     }
+
+    public boolean isWrapperFor(Class<?> iface) throws java.sql.SQLException {
+        // TODO Auto-generated method stub
+        return iface != null && iface.isAssignableFrom(this.getClass());
+    }
+
+    public <T> T unwrap(Class<T> iface) throws java.sql.SQLException {
+        // TODO Auto-generated method stub
+        try {
+            if (iface != null && iface.isAssignableFrom(this.getClass())) {
+                return (T) this;
+            }
+            throw new java.sql.SQLException("Auto-generated unwrap failed; Revisit implementation");
+        } catch (Exception e) {
+            throw new java.sql.SQLException(e);
+        }
+    }
+
+    public java.util.logging.Logger getParentLogger() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
diff --git a/jpa/multitenancy/multitenancy-db/Dockerfile b/jpa/multitenancy/multitenancy-db/Dockerfile
@@ -11,4 +11,4 @@ COPY --from=builder application/dependencies/ ./
 COPY --from=builder application/spring-boot-loader/ ./
 COPY --from=builder application/snapshot-dependencies/ ./
 COPY --from=builder application/application/ ./
-ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]
diff --git a/jpa/multitenancy/multitenancy-db/pom.xml b/jpa/multitenancy/multitenancy-db/pom.xml
@@ -92,6 +92,12 @@
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>