From 43dd69774708f03e08b6b7c056bb6af6e9f5ed2d Mon Sep 17 00:00:00 2001 From: Benoit DUMONT Date: Fri, 29 Dec 2023 13:36:49 +0100 Subject: [PATCH] Moved pom to JAVA 11 #2242 --- source/pom.xml | 42 +++++++++++-------- .../api/controllers/TestcaseController.java | 2 +- .../CountryEnvironmentParametersDTOV001.java | 6 +-- ...ountryEnvironmentParametersMapperV001.java | 7 +++- .../AppServiceContentMapperV001.java | 1 + .../api/dto/appservice/AppServiceDTOV001.java | 2 +- .../dto/appservice/AppServiceMapperV001.java | 29 ++++++++++++- .../dto/invariant/InvariantMapperV001.java | 2 + .../ManualUrlParametersMappersV001.java | 3 +- .../api/dto/testcase/LabelMapperV001.java | 2 +- .../TestcaseCountryPropertiesMapperV001.java | 7 ++++ .../api/dto/testcase/TestcaseDepDTOV001.java | 19 +++++++++ .../dto/testcase/TestcaseDepMapperV001.java | 3 ++ .../TestcaseStepActionMapperV001.java | 1 + .../TestcaseStepActionControlMapperV001.java | 1 + .../dto/testcasestep/TestcaseStepDTOV001.java | 3 ++ .../testcasestep/TestcaseStepMapperV001.java | 15 ++++--- .../core/api/dto/user/UserMapperV001.java | 17 ++++++++ .../core/crud/dao/impl/ApplicationDAO.java | 8 ++-- .../core/crud/entity/Application.java | 8 ++-- .../core/engine/gwt/impl/ActionService.java | 20 ++++++--- .../core/engine/gwt/impl/ControlService.java | 10 +++++ .../countryenvironment/CreateApplication.java | 2 +- source/src/main/resources/database.sql | 5 +++ 24 files changed, 165 insertions(+), 50 deletions(-) diff --git a/source/pom.xml b/source/pom.xml index 0277d2a397..f34b104866 100644 --- a/source/pom.xml +++ b/source/pom.xml @@ -32,7 +32,7 @@ - 1.8 + 11 UTF-8 ${project.build.directory}/endorsed local @@ -111,22 +111,23 @@ 1.9.5 - 3.7.0 - 2.20.1 - 2.10.4 - 3.2.0 - 3.0.2 - 2.5.3 - 2.8.2 - 1.8 - 3.1.0 - 3.3 - 2.7 + 3.12.1 + 3.2.3 + 3.6.3 + 3.4.0 + 3.6.1 + 3.0.1 + 3.1.1 + 3.1.0 + 3.6.0 + 4.0.0-M13 + 3.5.0 + 2.0 + 2.16.2 7.0 1.10.1 1.6.0 - 2.0 - + 8.0.1 @@ -670,11 +671,9 @@ maven-compiler-plugin ${maven-compiler-plugin.version} + ${java.version} ${java.version} ${java.version} - - ${endorsed.dir} - -Xmaxerrs 1000 @@ -702,7 +701,14 @@ - + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} + + false + + 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 index 2dcb100b40..dbe7a408aa 100644 --- 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/source/src/main/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersDTOV001.java b/source/src/main/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersDTOV001.java index 1817e60538..4399d923be 100644 --- a/source/src/main/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersDTOV001.java +++ b/source/src/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/source/src/main/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersMapperV001.java index ba26c20197..e7227e7dab 100644 --- a/source/src/main/java/org/cerberus/core/api/dto/application/CountryEnvironmentParametersMapperV001.java +++ b/source/src/main/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 index b8bc3a7767..a3d058d49f 100644 --- 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 index 49489c35ac..f17c46e859 100644 --- 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 index 5f801597af..b70da3ca82 100644 --- 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 . */ - 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 index fa01d8bdd2..e845769883 100644 --- 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/source/src/main/java/org/cerberus/core/api/dto/queueexecution/ManualUrlParametersMappersV001.java b/source/src/main/java/org/cerberus/core/api/dto/queueexecution/ManualUrlParametersMappersV001.java index 73f5e01d12..ea6458d74f 100644 --- a/source/src/main/java/org/cerberus/core/api/dto/queueexecution/ManualUrlParametersMappersV001.java +++ b/source/src/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 index 7e1522ba5c..8dacd32cc4 100644 --- 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 . */ - 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/source/src/main/java/org/cerberus/core/api/dto/testcase/TestcaseCountryPropertiesMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/testcase/TestcaseCountryPropertiesMapperV001.java index ae090d23b6..f3f93bfd67 100644 --- a/source/src/main/java/org/cerberus/core/api/dto/testcase/TestcaseCountryPropertiesMapperV001.java +++ b/source/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 index 0974457408..50d57d5a40 100644 --- 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 index 3a8ac0800f..54aa4edd3a 100644 --- 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/source/src/main/java/org/cerberus/core/api/dto/testcaseaction/TestcaseStepActionMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/testcaseaction/TestcaseStepActionMapperV001.java index 8b156a5f15..7716153c29 100644 --- a/source/src/main/java/org/cerberus/core/api/dto/testcaseaction/TestcaseStepActionMapperV001.java +++ b/source/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/source/src/main/java/org/cerberus/core/api/dto/testcasecontrol/TestcaseStepActionControlMapperV001.java b/source/src/main/java/org/cerberus/core/api/dto/testcasecontrol/TestcaseStepActionControlMapperV001.java index fcc1e32f0b..a443487283 100644 --- a/source/src/main/java/org/cerberus/core/api/dto/testcasecontrol/TestcaseStepActionControlMapperV001.java +++ b/source/src/main/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 index d8e5c6449d..d6b24242ba 100644 --- 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 index cf2d2f4926..ab300d0cc8 100644 --- 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 index 42ebfb89e2..30338e73a6 100644 --- 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 index 3c9f7d3ed4..68981f35b9 100644 --- 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(); } } diff --git a/source/src/main/java/org/cerberus/core/crud/entity/Application.java b/source/src/main/java/org/cerberus/core/crud/entity/Application.java index 4e7ae0ef36..5978d16857 100644 --- a/source/src/main/java/org/cerberus/core/crud/entity/Application.java +++ b/source/src/main/java/org/cerberus/core/crud/entity/Application.java @@ -55,10 +55,10 @@ public class Application { private String deploytype; private String mavengroupid; private String description; - private String UsrCreated; - private Timestamp DateCreated; - private String UsrModif; - private Timestamp DateModif; + private String usrCreated; + private Timestamp dateCreated; + private String usrModif; + private Timestamp dateModif; /** * From here are data outside database model. diff --git a/source/src/main/java/org/cerberus/core/engine/gwt/impl/ActionService.java b/source/src/main/java/org/cerberus/core/engine/gwt/impl/ActionService.java index 46b9203bda..4b42f9b98c 100644 --- a/source/src/main/java/org/cerberus/core/engine/gwt/impl/ActionService.java +++ b/source/src/main/java/org/cerberus/core/engine/gwt/impl/ActionService.java @@ -147,10 +147,10 @@ public TestCaseStepActionExecution doAction(TestCaseStepActionExecution actionEx AnswerItem answerDecode = new AnswerItem<>(); /** - * Decode the step action description + * Decode the step action description, value1, value2 and value3 */ try { - // When starting a new action, we reset the property list that was already calculated. + execution.setRecursiveAlreadyCalculatedPropertiesList(new ArrayList<>()); answerDecode = variableService.decodeStringCompletly(actionExecution.getDescription(), @@ -178,7 +178,6 @@ public TestCaseStepActionExecution doAction(TestCaseStepActionExecution actionEx */ try { - // When starting a new action, we reset the property list that was already calculated. execution.setRecursiveAlreadyCalculatedPropertiesList(new ArrayList<>()); answerDecode = variableService.decodeStringCompletly(actionExecution.getValue1(), execution, actionExecution, false); @@ -202,7 +201,6 @@ public TestCaseStepActionExecution doAction(TestCaseStepActionExecution actionEx try { - // When starting a new action, we reset the property list that was already calculated. execution.setRecursiveAlreadyCalculatedPropertiesList(new ArrayList<>()); answerDecode = variableService.decodeStringCompletly(actionExecution.getValue2(), execution, actionExecution, false); @@ -226,7 +224,6 @@ public TestCaseStepActionExecution doAction(TestCaseStepActionExecution actionEx try { - // When starting a new action, we reset the property list that was already calculated. execution.setRecursiveAlreadyCalculatedPropertiesList(new ArrayList<>()); answerDecode = variableService.decodeStringCompletly(actionExecution.getValue3(), execution, actionExecution, false); @@ -304,6 +301,14 @@ public TestCaseStepActionExecution doAction(TestCaseStepActionExecution actionEx actionExecution.addFileList(recorderService.recordPicture(actionExecution, -1, identifier.getLocator(), "2")); } + /** + * TODO add a wait in ms before the action. + */ +// Thead.sleep(); + + /** + * Route the actions to the correct method. + */ try { switch (actionExecution.getAction()) { case TestCaseStepAction.ACTION_CLICK: @@ -510,6 +515,11 @@ public TestCaseStepActionExecution doAction(TestCaseStepActionExecution actionEx */ actionExecution.setStopExecution(res.isStopTest()); + /** + * TODO add a wait in ms after the action. + */ +// Thead.sleep(); + /** * Timestamp stops here. */ diff --git a/source/src/main/java/org/cerberus/core/engine/gwt/impl/ControlService.java b/source/src/main/java/org/cerberus/core/engine/gwt/impl/ControlService.java index 7e1bb10d87..8fe10ec1ab 100644 --- a/source/src/main/java/org/cerberus/core/engine/gwt/impl/ControlService.java +++ b/source/src/main/java/org/cerberus/core/engine/gwt/impl/ControlService.java @@ -266,6 +266,11 @@ public TestCaseStepActionControlExecution doControl(TestCaseStepActionControlExe controlExecution.addFileList(recorderService.recordPicture(controlExecution.getTestCaseStepActionExecution(), controlExecution.getControlId(), identifier.getLocator(), "2")); } + /** + * TODO add a wait in ms before the control. + */ +// Thead.sleep(); + try { switch (controlExecution.getControl()) { @@ -433,6 +438,11 @@ public TestCaseStepActionControlExecution doControl(TestCaseStepActionControlExe if (res.isStopTest() && controlExecution.getFatal().equals("Y")) { controlExecution.setStopExecution(true); } + + /** + * TODO add a wait in ms after the control. + */ +// Thead.sleep(); controlExecution.setEnd(new Date().getTime()); return controlExecution; diff --git a/source/src/main/java/org/cerberus/core/servlet/crud/countryenvironment/CreateApplication.java b/source/src/main/java/org/cerberus/core/servlet/crud/countryenvironment/CreateApplication.java index 6aa9fa57d7..5a2d6a7bb2 100644 --- a/source/src/main/java/org/cerberus/core/servlet/crud/countryenvironment/CreateApplication.java +++ b/source/src/main/java/org/cerberus/core/servlet/crud/countryenvironment/CreateApplication.java @@ -148,7 +148,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re .deploytype(deployType) .mavengroupid(mavenGpID) .description(description) - .UsrCreated(request.getRemoteUser()) + .usrCreated(request.getRemoteUser()) .build(); ans = applicationService.create(app); diff --git a/source/src/main/resources/database.sql b/source/src/main/resources/database.sql index fcdec3e7ae..0e048acedb 100644 --- a/source/src/main/resources/database.sql +++ b/source/src/main/resources/database.sql @@ -6249,4 +6249,9 @@ ALTER TABLE `countryenvironmentparameters` ADD COLUMN `UsrModif` varchar(45) NOT NULL DEFAULT '', ADD COLUMN `DateModif` TIMESTAMP NOT NULL DEFAULT '1970-01-01 01:01:01'; +-- 1759 +DROP TABLE `dashboardEntry`, `dashboardGroupEntries`, `dashboardGroupEntriesApplication`, `dashboardGroupEntriesCampaign`, `dashboardReportItem`, `dashboardTypeReportItem` ; +-- 1760 +CREATE TABLE `datafile` ( `ID` int(11) NOT NULL AUTO_INCREMENT, `Fileid` varchar(150) NOT NULL, `FileName` varchar(250) DEFAULT NULL, `UsrCreated` varchar(45) DEFAULT NULL, `DateCreated` timestamp NULL DEFAULT NULL, `UsrModif` varchar(45) DEFAULT NULL, `DateModif` timestamp NULL DEFAULT NULL, PRIMARY KEY (`FileId`), UNIQUE KEY `ID_UNIQUE` (`ID`) ) + ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;