Moved pom to JAVA 11 #2242

cerberustesting · Dec 29, 2023 · 43dd697 · 43dd697
1 parent c8792d3
commit 43dd697
Show file tree

Hide file tree

Showing 24 changed files with 165 additions and 50 deletions.
diff --git a/source/pom.xml b/source/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <!-- Project properties -->
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
         <env>local</env>
@@ -111,22 +111,23 @@
         <mockito-all.version>1.9.5</mockito-all.version>
 
         <!-- Maven plugin version -->
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
-        <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
-        <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
-        <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
-        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-        <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
-        <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
-        <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
-        <maven-site-plugin.version>3.3</maven-site-plugin.version>
-        <maven-project-info-reports-plugin.version>2.7</maven-project-info-reports-plugin.version>
+        <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.2.3</maven-surefire-plugin.version>
+        <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
+        <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
+        <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
+        <maven-site-plugin.version>4.0.0-M13</maven-site-plugin.version>
+        <maven-project-info-reports-plugin.version>3.5.0</maven-project-info-reports-plugin.version>
+        <license-maven-plugin.version>2.0</license-maven-plugin.version>
+        <versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
         <javaee-endorsed-api.version>7.0</javaee-endorsed-api.version>
         <ant-jsch.version>1.10.1</ant-jsch.version>
         <asciidoctor-maven-plugin.version>1.6.0</asciidoctor-maven-plugin.version>
-        <license-maven-plugin.version>2.0</license-maven-plugin.version>
-
+
         <!-- PDF Generation itext version -->
         <com.itextpdf.version>8.0.1</com.itextpdf.version>
 
@@ -670,11 +671,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
+                    <release>${java.version}</release>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
-                    <compilerArguments>
-                        <endorseddirs>${endorsed.dir}</endorseddirs>
-                    </compilerArguments>
                     <compilerArgs>
                         <arg>-Xmaxerrs</arg>
                         <arg>1000</arg>
@@ -702,7 +701,14 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>${versions-maven-plugin.version}</version>
+                <configuration>
+                    <generateBackupPoms>false</generateBackupPoms>
+                </configuration>
+            </plugin>
             <!-- Fix jenkins build issue  -->
 
             <plugin>

diff --git a/source/src/main/java/org/cerberus/core/api/controllers/TestcaseController.java b/source/src/main/java/org/cerberus/core/api/controllers/TestcaseController.java
@@ -176,7 +176,7 @@ public String createSimplifiedTestcase(
                             .svnurl("")
                             .bugTrackerNewUrl("")
                             .bugTrackerNewUrl("")
-                            .UsrCreated(principal.getName())
+                            .usrCreated(principal.getName())
                             .build());
 
             this.countryEnvironmentParametersService.create(

diff --git a/.../main/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersDTOV001.java b/.../main/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersDTOV001.java
@@ -59,13 +59,11 @@ public class CountryEnvironmentParametersDTOV001 {
 
     @JsonView(value = {View.Public.GET.class, View.Public.PATCH.class, View.Public.PUT.class, View.Public.POST.class})
     @ApiModelProperty(position = 4)
-    @JsonProperty("host")
-    private String ip;
+    private String host;
 
     @JsonView(value = {View.Public.GET.class, View.Public.PATCH.class, View.Public.PUT.class, View.Public.POST.class})
     @ApiModelProperty(position = 5)
-    @JsonProperty("contextRoot")
-    private String url;
+    private String contextRoot;
 
     @JsonView(value = {View.Public.GET.class, View.Public.PATCH.class, View.Public.PUT.class, View.Public.POST.class})
     @ApiModelProperty(position = 6)

diff --git a/...in/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersMapperV001.java b/...in/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersMapperV001.java
@@ -23,13 +23,16 @@
 import org.cerberus.core.api.mappers.TimestampMapper;
 import org.cerberus.core.crud.entity.CountryEnvironmentParameters;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 @Mapper(componentModel = "spring", uses = {TimestampMapper.class})
 public interface CountryEnvironmentParametersMapperV001 {
 
-//    @Mapping(source = "url", target = "contextRoot")
-//    @Mapping(source = "ip", target = "host")
+    @Mapping(source = "ip", target = "host")
+    @Mapping(source = "url", target = "contextRoot")
     CountryEnvironmentParametersDTOV001 toDTO(CountryEnvironmentParameters countryEnvironmentParameters);
 
+    @Mapping(source = "host", target = "ip")
+    @Mapping(source = "contextRoot", target = "url")
     CountryEnvironmentParameters toEntity(CountryEnvironmentParametersDTOV001 countryEnvironmentParametersDTO);
 }
diff --git a/source/src/main/java/org/cerberus/core/api/dto/appservice/AppServiceContentMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/appservice/AppServiceContentMapperV001.java
@@ -31,5 +31,6 @@ public interface AppServiceContentMapperV001 {
     @Mapping(source = "active", target = "isActive")
     AppServiceContentDTOV001 toDTO(AppServiceContent appServiceContent);
 
+    @Mapping(target = "inherited", ignore = true)
     AppServiceContent toEntity(AppServiceContentDTOV001 appServiceContentDTO);
 }
diff --git a/source/src/main/java/org/cerberus/core/api/dto/appservice/AppServiceDTOV001.java b/source/src/main/java/org/cerberus/core/api/dto/appservice/AppServiceDTOV001.java
@@ -79,7 +79,7 @@ public class AppServiceDTOV001 {
 
     @ApiModelProperty(position = 8)
     @JsonView(value = {View.Public.GET.class, View.Public.PUT.class, View.Public.POST.class})
-    private String attachmentURL;
+    private String attachementURL;
 
     @ApiModelProperty(position = 9)
     @JsonView(value = {View.Public.GET.class, View.Public.PUT.class, View.Public.POST.class})

diff --git a/source/src/main/java/org/cerberus/core/api/dto/appservice/AppServiceMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/appservice/AppServiceMapperV001.java
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with Cerberus.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.cerberus.core.api.dto.appservice;
 
 import org.cerberus.core.api.mappers.TimestampMapper;
@@ -34,8 +33,34 @@ public interface AppServiceMapperV001 {
     @Mapping(source = "headerList", target = "headers")
     AppServiceDTOV001 toDTO(AppService appService);
 
-
     @InheritInverseConfiguration
     @Mapping(source = "followingRedirection", target = "followRedir")
+    @Mapping(target = "kafkaFilterHeaderPath", ignore = true)
+    @Mapping(target = "kafkaFilterHeaderValue", ignore = true)
+    @Mapping(target = "avroEnable", ignore = true)
+    @Mapping(target = "schemaRegistryURL", ignore = true)
+    @Mapping(target = "avroEnableKey", ignore = true)
+    @Mapping(target = "avroSchemaKey", ignore = true)
+    @Mapping(target = "avroSchemaValue", ignore = true)
+    @Mapping(target = "avroEnableValue", ignore = true)
+    @Mapping(target = "parentContentService", ignore = true)
+    @Mapping(target = "proxyHost", ignore = true)
+    @Mapping(target = "proxyPort", ignore = true)
+    @Mapping(target = "proxy", ignore = true)
+    @Mapping(target = "proxyWithCredential", ignore = true)
+    @Mapping(target = "proxyUser", ignore = true)
+    @Mapping(target = "responseHTTPVersion", ignore = true)
+    @Mapping(target = "responseHTTPCode", ignore = true)
+    @Mapping(target = "responseHTTPBody", ignore = true)
+    @Mapping(target = "responseHTTPBodyContentType", ignore = true)
+    @Mapping(target = "responseHeaderList", ignore = true)
+    @Mapping(target = "timeoutms", ignore = true)
+    @Mapping(target = "file", ignore = true)
+    @Mapping(target = "kafkaResponseOffset", ignore = true)
+    @Mapping(target = "kafkaResponsePartition", ignore = true)
+    @Mapping(target = "kafkaWaitNbEvent", ignore = true)
+    @Mapping(target = "kafkaWaitSecond", ignore = true)
+    @Mapping(target = "recordTraceFile", ignore = true)
+    @Mapping(target = "responseNb", ignore = true)
     AppService toEntity(AppServiceDTOV001 appServiceDTO);
 }
diff --git a/source/src/main/java/org/cerberus/core/api/dto/invariant/InvariantMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/invariant/InvariantMapperV001.java
@@ -39,8 +39,10 @@ public interface InvariantMapperV001 {
     @Mapping(source = "invariant.gp7", target = "attribute7")
     @Mapping(source = "invariant.gp8", target = "attribute8")
     @Mapping(source = "invariant.gp9", target = "attribute9")
+    @Mapping(target = "shortDescription", ignore = true)
     InvariantDTOV001 toDTO(Invariant invariant);
 
     @InheritInverseConfiguration
+    @Mapping(target = "veryShortDesc", ignore = true)
     Invariant toEntity(InvariantDTOV001 invariantDTO);
 }
diff --git a/...rc/main/java/org/cerberus/core/api/dto/queueexecution/ManualUrlParametersMappersV001.java b/...rc/main/java/org/cerberus/core/api/dto/queueexecution/ManualUrlParametersMappersV001.java
@@ -21,7 +21,6 @@
 package org.cerberus.core.api.dto.queueexecution;
 
 import org.cerberus.core.api.entity.ManualUrlParameters;
-import org.cerberus.core.api.entity.QueuedExecution;
 import org.mapstruct.Mapper;
 
 /**
@@ -33,5 +32,5 @@ public interface ManualUrlParametersMappersV001 {
 
     ManualUrlParametersDTOV001 toDto(ManualUrlParameters manualUrlParameters);
 
-    QueuedExecution toEntity(ManualUrlParametersDTOV001 manualUrlParametersDTO);
+    ManualUrlParameters toEntity(ManualUrlParametersDTOV001 manualUrlParametersDTO);
 }
diff --git a/source/src/main/java/org/cerberus/core/api/dto/testcase/LabelMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/testcase/LabelMapperV001.java
@@ -17,7 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with Cerberus.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package org.cerberus.core.api.dto.testcase;
 
 import org.cerberus.core.api.mappers.TimestampMapper;
@@ -37,5 +36,6 @@ public interface LabelMapperV001 {
     LabelDTOV001 toDTO(Label label);
 
     @InheritInverseConfiguration
+    @Mapping(target = "counter1", ignore = true)
     Label toEntity(LabelDTOV001 labelDTO);
 }
diff --git a/...src/main/java/org/cerberus/core/api/dto/testcase/TestcaseCountryPropertiesMapperV001.java b/...src/main/java/org/cerberus/core/api/dto/testcase/TestcaseCountryPropertiesMapperV001.java
@@ -39,5 +39,12 @@ public interface TestcaseCountryPropertiesMapperV001 {
     @Mapping(source = "testFolderId", target = "test")
     @Mapping(source = "testcaseId", target = "testcase")
     @Mapping(source = "countries", target = "invariantCountries")
+    @Mapping(target = "country", ignore = true)
+    @Mapping(target = "cacheExpire", ignore = true)
+    @Mapping(target = "retryNb", ignore = true)
+    @Mapping(target = "retryPeriod", ignore = true)
+    @Mapping(target = "result", ignore = true)
+    @Mapping(target = "testcaseCountry", ignore = true)
+    @Mapping(target = "testcaseCountries", ignore = true)
     TestCaseCountryProperties toEntity(TestcaseCountryPropertiesDTOV001 testcaseCountryPropertiesDTO);
 }
diff --git a/source/src/main/java/org/cerberus/core/api/dto/testcase/TestcaseDepDTOV001.java b/source/src/main/java/org/cerberus/core/api/dto/testcase/TestcaseDepDTOV001.java
@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.annotation.JsonView;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.sql.Timestamp;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import lombok.Builder;
@@ -66,9 +67,27 @@ public class TestcaseDepDTOV001 {
     @JsonView(value = {View.Public.GET.class, View.Public.PUT.class, View.Public.POST.class})
     @ApiModelProperty(position = 5)
     @JsonProperty("isActive")
+    @Builder.Default
     private boolean isActive = true;
 
     @JsonView(value = {View.Public.GET.class, View.Public.PUT.class, View.Public.POST.class})
     @ApiModelProperty(position = 6)
     private String description;
+
+    @ApiModelProperty(position = 7)
+    @JsonView(value = {View.Public.GET.class})
+    private String usrCreated;
+
+    @ApiModelProperty(position = 8)
+    @JsonView(value = {View.Public.GET.class})
+    private Timestamp dateCreated;
+
+    @ApiModelProperty(position = 9)
+    @JsonView(value = {View.Public.GET.class})
+    private String usrModif;
+
+    @ApiModelProperty(position = 10)
+    @JsonView(value = {View.Public.GET.class})
+    private Timestamp dateModif;
+
 }
diff --git a/source/src/main/java/org/cerberus/core/api/dto/testcase/TestcaseDepMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/testcase/TestcaseDepMapperV001.java
@@ -36,5 +36,8 @@ public interface TestcaseDepMapperV001 {
 
     @Mapping(source = "dependencyTestFolderId", target = "dependencyTest")
     @Mapping(source = "dependencyTestcaseId", target = "dependencyTestcase")
+    @Mapping(target = "test", ignore = true)
+    @Mapping(target = "testcase", ignore = true)
+    @Mapping(target = "testcaseDescription", ignore = true)
     TestCaseDep toEntity(TestcaseDepDTOV001 testcaseDepDTO);
 }
diff --git a/.../src/main/java/org/cerberus/core/api/dto/testcaseaction/TestcaseStepActionMapperV001.java b/.../src/main/java/org/cerberus/core/api/dto/testcaseaction/TestcaseStepActionMapperV001.java
@@ -40,6 +40,7 @@ public interface TestcaseStepActionMapperV001 {
 
     @Mapping(source = "testFolderId", target = "test")
     @Mapping(source = "testcaseId", target = "testcase")
+    @Mapping(source = "fatal", target = "isFatal")
     TestCaseStepAction toEntity(TestcaseStepActionDTOV001 actionDTO);
 
 }
diff --git a/...n/java/org/cerberus/core/api/dto/testcasecontrol/TestcaseStepActionControlMapperV001.java b/...n/java/org/cerberus/core/api/dto/testcasecontrol/TestcaseStepActionControlMapperV001.java
@@ -38,5 +38,6 @@ public interface TestcaseStepActionControlMapperV001 {
 
     @Mapping(source = "testFolderId", target = "test")
     @Mapping(source = "testcaseId", target = "testcase")
+    @Mapping(source = "fatal", target = "isFatal")
     TestCaseStepActionControl toEntity(TestcaseStepActionControlDTOV001 controlDTO);
 }
diff --git a/source/src/main/java/org/cerberus/core/api/dto/testcasestep/TestcaseStepDTOV001.java b/source/src/main/java/org/cerberus/core/api/dto/testcasestep/TestcaseStepDTOV001.java
@@ -93,6 +93,7 @@ public class TestcaseStepDTOV001 {
     @JsonView(value = {View.Public.GET.class, View.Public.PUT.class, View.Public.POST.class})
     @ApiModelProperty(position = 11)
     @JsonProperty("isUsingLibraryStep")
+    @Builder.Default
     private boolean isUsingLibraryStep = false;
 
     @JsonView(value = {View.Public.GET.class, View.Public.PUT.class, View.Public.POST.class})
@@ -119,11 +120,13 @@ public class TestcaseStepDTOV001 {
     @JsonView(value = {View.Public.GET.class, View.Public.PUT.class, View.Public.POST.class})
     @ApiModelProperty(name = "isLibraryStep", position = 17)
     @JsonProperty("isLibraryStep")
+    @Builder.Default
     private boolean isLibraryStep = false;
 
     @JsonView(value = {View.Public.GET.class, View.Public.PUT.class, View.Public.POST.class})
     @ApiModelProperty(position = 18)
     @JsonProperty("isExecutionForced")
+    @Builder.Default
     private boolean isExecutionForced = false;
 
     @Valid

diff --git a/source/src/main/java/org/cerberus/core/api/dto/testcasestep/TestcaseStepMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/testcasestep/TestcaseStepMapperV001.java
@@ -34,11 +34,11 @@
 @Mapper(
         componentModel = "spring",
         uses = {
-                TestcaseStepActionMapperV001.class,
-                TestcaseStepActionControlMapperV001.class,
-                TestcaseCountryPropertiesMapperV001.class,
-                JSONArrayMapper.class,
-                TimestampMapper.class
+            TestcaseStepActionMapperV001.class,
+            TestcaseStepActionControlMapperV001.class,
+            TestcaseCountryPropertiesMapperV001.class,
+            JSONArrayMapper.class,
+            TimestampMapper.class
         }
 )
 public interface TestcaseStepMapperV001 {
@@ -57,6 +57,11 @@ public interface TestcaseStepMapperV001 {
     @Mapping(source = "testcaseId", target = "testcase")
     @Mapping(source = "libraryStepTestFolderId", target = "libraryStepTest")
     @Mapping(source = "libraryStepTestcaseId", target = "libraryStepTestcase")
+    @Mapping(source = "stepInUseByOtherTestcase", target = "isStepInUseByOtherTestcase")
+    @Mapping(source = "executionForced", target = "isExecutionForced")
+    @Mapping(source = "libraryStep", target = "isLibraryStep")
+    @Mapping(source = "usingLibraryStep", target = "isUsingLibraryStep")
+    @Mapping(target = "testcaseObj", ignore = true)
     TestCaseStep toEntity(TestcaseStepDTOV001 stepDTO);
 
 }
diff --git a/source/src/main/java/org/cerberus/core/api/dto/user/UserMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/user/UserMapperV001.java
@@ -23,6 +23,7 @@
 import org.cerberus.core.crud.entity.User;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 /**
  * @author vertigo17
@@ -33,5 +34,21 @@ public interface UserMapperV001 {
     UserDTOV001 toDTO(User user);
 
     @InheritInverseConfiguration
+    @Mapping(target = "password", ignore = true)
+    @Mapping(target = "resetPasswordToken", ignore = true)
+    @Mapping(target = "userID", ignore = true)
+    @Mapping(target = "request", ignore = true)
+    @Mapping(target = "apiKey", ignore = true)
+    @Mapping(target = "reportingFavorite", ignore = true)
+    @Mapping(target = "robotHost", ignore = true)
+    @Mapping(target = "robotPort", ignore = true)
+    @Mapping(target = "robotPlatform", ignore = true)
+    @Mapping(target = "robotVersion", ignore = true)
+    @Mapping(target = "robotBrowser", ignore = true)
+    @Mapping(target = "robot", ignore = true)
+    @Mapping(target = "defaultSystem", ignore = true)
+    @Mapping(target = "userPreferences", ignore = true)
+    @Mapping(target = "userSystems", ignore = true)
+    @Mapping(target = "userRoles", ignore = true)
     User toEntity(UserDTOV001 userDTO);
 }
diff --git a/source/src/main/java/org/cerberus/core/crud/dao/impl/ApplicationDAO.java b/source/src/main/java/org/cerberus/core/crud/dao/impl/ApplicationDAO.java
@@ -571,10 +571,10 @@ public Application loadFromResultSet(ResultSet rs) throws SQLException {
                 .deploytype(deployType)
                 .mavengroupid(mavenGroupId)
                 .description(description)
-                .UsrCreated(usrCreated)
-                .DateCreated(dateCreated)
-                .UsrModif(usrModif)
-                .DateModif(dateModif)
+                .usrCreated(usrCreated)
+                .dateCreated(dateCreated)
+                .usrModif(usrModif)
+                .dateModif(dateModif)
                 .build();
     }
 }