Merge pull request #951 from exadel-inc/EFRS-1337_migrate_to_java_17

EFRS-1337: Migrated to Java 17

Author: VolodymyrBushko

custom-builds/Single-Docker-File/Dockerfile

@@ -60,7 +60,11 @@ ENV PYTHON_URL=http://localhost:3000
 ENV MAX_FILE_SIZE=5MB
 ENV MAX_REQUEST_SIZE=10MB
 
-RUN apt-get update && apt-get install -y openjdk-11-jre-headless \
+RUN apt-get update \
+    && apt-get install -y wget apt-transport-https gnupg \
+    && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
+    && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \
+    && apt-get install -y temurin-17-jdk \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=admin /home/app.jar /app/admin/app.jar

dev/Dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.6.3-jdk-11-slim as build
+FROM maven:3.8.2-eclipse-temurin-17 as build
 ARG ND4J_CLASSIFIER
 WORKDIR /workspace/compreface
 LABEL intermidiate_frs=true
@@ -12,14 +12,14 @@ COPY admin admin
 COPY common common
 RUN mvn package -Dmaven.test.skip=true -Dmaven.site.skip=true -Dmaven.javadoc.skip=true -Dnd4j.classifier=$ND4J_CLASSIFIER
 
-FROM openjdk:11.0.8-jre-slim as frs_core
+FROM eclipse-temurin:17-jre as frs_core
 ARG DIR=/workspace/compreface
 COPY --from=build ${DIR}/api/target/*.jar /home/app.jar
 ENTRYPOINT ["sh","-c","java $API_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]
 
-FROM openjdk:11.0.8-jre-slim as frs_crud
+FROM eclipse-temurin:17-jre as frs_crud
 ARG DIR=/workspace/compreface
 COPY --from=build ${DIR}/admin/target/*.jar /home/app.jar
 ARG APPERY_API_KEY
 ENV APPERY_API_KEY ${APPERY_API_KEY}
-ENTRYPOINT ["sh","-c","java $ADMIN_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]
+ENTRYPOINT ["sh","-c","java $ADMIN_JAVA_OPTS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar /home/app.jar"]

java/admin/src/test/resources/application.yml

@@ -31,11 +31,6 @@ spring:
       max-request-size: ${MAX_REQUEST_SIZE:10MB}
   flyway:
     enabled: false
-  datasource:
-    driver-class-name: org.postgresql.Driver
-    url: ${POSTGRES_URL:jdbc:postgresql://localhost:5432/frs_test}
-    username: ${POSTGRES_USER:postgres}
-    password: ${POSTGRES_PASSWORD:postgres}
   jpa:
     properties:
       hibernate:

java/api/src/main/java/com/exadel/frs/core/trainservice/config/repository/NotificationDbConfig.java

@@ -4,7 +4,9 @@
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
+@Profile("!test")
 @Configuration
 public class NotificationDbConfig {
 

java/api/src/test/java/com/exadel/frs/core/trainservice/EmbeddedPostgreSQLTest.java

@@ -1,6 +1,8 @@
 package com.exadel.frs.core.trainservice;
 
 import com.exadel.frs.core.trainservice.config.IntegrationTest;
+import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
+import com.exadel.frs.core.trainservice.service.NotificationSenderService;
 import io.zonky.test.db.AutoConfigureEmbeddedDatabase;
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
@@ -12,15 +14,24 @@
 import liquibase.integration.spring.SpringResourceAccessor;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+@ActiveProfiles("test")
 @IntegrationTest
 @ExtendWith(SpringExtension.class)
 @AutoConfigureEmbeddedDatabase(beanName = "dsPg")
 public class EmbeddedPostgreSQLTest {
 
+    @MockBean
+    NotificationSenderService notificationSenderService;
+
+    @MockBean
+    NotificationReceiverService notificationReceiverService;
+
     @Autowired
     DataSource dataSource;
 

java/api/src/test/java/com/exadel/frs/core/trainservice/cache/EmbeddingCacheProviderTest.java

@@ -25,6 +25,7 @@
 import static org.mockito.Mockito.when;
 import com.exadel.frs.commonservice.entity.EnhancedEmbeddingProjection;
 import com.exadel.frs.core.trainservice.service.EmbeddingService;
+import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import com.exadel.frs.core.trainservice.service.NotificationSenderService;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -45,6 +46,9 @@ class EmbeddingCacheProviderTest {
     @Mock
     private NotificationSenderService notificationSenderService;
 
+    @Mock
+    private NotificationReceiverService notificationReceiverService;
+
     @InjectMocks
     private EmbeddingCacheProvider embeddingCacheProvider;
 

java/api/src/test/java/com/exadel/frs/core/trainservice/controller/RecognizeControllerTest.java

@@ -21,6 +21,7 @@
 import com.exadel.frs.commonservice.sdk.faces.feign.dto.FindFacesResponse;
 import com.exadel.frs.commonservice.sdk.faces.feign.dto.FindFacesResult;
 import com.exadel.frs.commonservice.system.global.Constants;
+import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
 import com.exadel.frs.core.trainservice.component.FaceClassifierPredictor;
 import com.exadel.frs.core.trainservice.config.IntegrationTest;
 import com.exadel.frs.core.trainservice.dto.Base64File;
@@ -53,7 +54,7 @@
 
 @IntegrationTest
 @AutoConfigureMockMvc
-class RecognizeControllerTest {
+class RecognizeControllerTest extends EmbeddedPostgreSQLTest {
 
     @Autowired
     private MockMvc mockMvc;
@@ -64,11 +65,6 @@ class RecognizeControllerTest {
     @MockBean
     private ImageExtensionValidator validator;
 
-    @Mock
-    private NotificationSenderService notificationSenderService;
-    @MockBean
-    private NotificationReceiverService  notificationReceiverService;
-
     @MockBean
     private FacesApiClient client;
 

java/api/src/test/java/com/exadel/frs/core/trainservice/dao/SubjectDaoTest.java

@@ -10,13 +10,15 @@
 import com.exadel.frs.core.trainservice.DbHelper;
 import com.exadel.frs.core.trainservice.EmbeddedPostgreSQLTest;
 import com.exadel.frs.core.trainservice.dto.EmbeddingInfo;
+import com.exadel.frs.core.trainservice.service.NotificationReceiverService;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.Pageable;
 
 import java.util.Optional;

java/api/src/test/resources/application.yml

@@ -11,12 +11,6 @@ spring:
         access-token-validity: 2400
         refresh-token-validity: 1209600
         authorized-grant-types: password,refresh_token
-  datasource-pg:
-    driver-class-name: org.postgresql.Driver
-    url: ${POSTGRES_URL:jdbc:postgresql://localhost:5432/frs_test}
-    username: ${POSTGRES_USER:postgres}
-    password: ${POSTGRES_PASSWORD:postgres}
-    continue-on-error: true
   jpa:
     properties:
       hibernate:

java/pom.xml

@@ -24,10 +24,10 @@
     </modules>
 
     <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>
 
-        <java.version>11</java.version>
+        <java.version>17</java.version>
 
         <spring.boot.version>2.5.13</spring.boot.version>
         <spring.oauth2.jwt.version>1.1.1.RELEASE</spring.oauth2.jwt.version>