Merge pull request #196 from SCADA-LTS/develop

readable configuration in commandline; downgrade cxf to 3.5.3 for per…
SCADA-LTS · May 21, 2023 · a8d4485 · a8d4485
2 parents c28fcd4 + 66ce207
commit a8d4485
Show file tree

Hide file tree

Showing 30 changed files with 143 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.scadalts</groupId>
     <artifactId>scada-lts-e2e</artifactId>
     <name>Scada-LTS-E2E</name>
-    <version>23.0.5-SNAPSHOT</version>
+    <version>23.0.7-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -52,7 +52,7 @@
         <maven.version>3.6.1</maven.version>
         <commons-lang3.version>3.9</commons-lang3.version>
         <picocli.version>4.1.4</picocli.version>
-        <cxf.version>3.6.0</cxf.version>
+        <cxf.version>3.5.3</cxf.version>
         <spring-boot.version>2.7.11</spring-boot.version>
         <jackson-jaxrs-json-provider.version>2.13.3</jackson-jaxrs-json-provider.version>
         <cache-api.version>1.1.1</cache-api.version>

diff --git a/scada-lts-e2e-app/pom.xml b/scada-lts-e2e-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.scadalts</groupId>
         <artifactId>scada-lts-e2e</artifactId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/scada-lts-e2e-cli/pom.xml b/scada-lts-e2e-cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.scadalts</groupId>
         <artifactId>scada-lts-e2e</artifactId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/ConfigAppCommand.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/ConfigAppCommand.java
@@ -10,7 +10,6 @@
 import picocli.CommandLine;
 
 @Getter
-@ToString
 @CommandLine.Command(name = "config-app",
         resourceBundle = "lang.e2e")
 public class ConfigAppCommand extends DefaultOptions implements Runnable {

diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/ConfigSystemCommand.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/ConfigSystemCommand.java
@@ -1,14 +1,12 @@
 package org.scadalts.e2e.cli.commands;
 
 import lombok.Getter;
-import lombok.ToString;
 import org.scadalts.e2e.common.core.ansi.ConsoleColors;
 import org.scadalts.e2e.cli.options.DefaultOptions;
 import org.scadalts.e2e.common.core.utils.PropsPrintUtil;
 import picocli.CommandLine;
 
 @Getter
-@ToString
 @CommandLine.Command(name = "config-system",
         resourceBundle = "lang.e2e")
 public class ConfigSystemCommand extends DefaultOptions implements Runnable {

diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/E2eCommand.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/E2eCommand.java
@@ -5,14 +5,12 @@
 import lombok.ToString;
 import org.scadalts.e2e.cli.options.ScadaOptions;
 import org.scadalts.e2e.cli.providers.VersionProvider;
-import org.scadalts.e2e.common.api.E2eCommonApi;
 import org.scadalts.e2e.common.impl.logo.AsciiHeadersImpl;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Spec;
 
 @Getter
-@ToString(callSuper = true)
 @Command(name= "e2e",
         versionProvider = VersionProvider.class,
 		resourceBundle = "lang.e2e", header = AsciiHeadersImpl.MAIN_HEADER,

diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/RunAppCommand.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/RunAppCommand.java
@@ -14,7 +14,6 @@
 
 @Log4j2
 @Getter
-@ToString(callSuper = true)
 @Command(name= "run-app",
         versionProvider = VersionProvider.class,
 		resourceBundle = "lang.e2e")

diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/RunTestCommand.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/commands/RunTestCommand.java
@@ -15,7 +15,6 @@
 
 @Log4j2
 @Getter
-@ToString
 @Command(name = "run-test",
         versionProvider = VersionProvider.class,
         resourceBundle = "lang.e2e")

diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/config/E2eConfigCli.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/config/E2eConfigCli.java
@@ -17,9 +17,9 @@
 import java.io.File;
 import java.net.URL;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Set;
 
-@ToString
 @Builder
 @EqualsAndHashCode
 public class E2eConfigCli implements E2eConfig {
@@ -279,4 +279,63 @@ public String getUnblockSendSuccessEmailCron() {
     public String getUnblockSendFailEmailCron() {
         return fromRunApp.getUnblockSendFailEmailCron();
     }
+
+    @Override
+    public String toString() {
+        return "\nportApp=" + getPortApp() +
+                "\ncronPattern='" + getCronPattern() + '\'' +
+                "\ncontinuousMode=" + isContinuousMode() +
+                "\nuserSmtp='" + getUserSmtp() + '\'' +
+                "\npasswordSmtp='" + "******" + '\'' +
+                "\nhostSmtp='" + getHostSmtp() + '\'' +
+                "\nportSmtp=" + getPortSmtp() +
+                "\nsendTo=" + getSendTo() +
+                "\nsendFrom='" + getSendFrom() + '\'' +
+                "\ndebugEmailMode=" + isDebugEmailMode() +
+                "\nnotificationEmailMode=" + isNotificationEmailMode() +
+                "\ndeleteEmailFromSentEmailsAfterMs=" + getDeleteEmailFromSentEmailsAfterMs() +
+                "\nbrowserRef=" + getBrowserRef() +
+                "\ntimeoutMs=" + getTimeoutMs() +
+                "\ndriverFile=" + getDriverFile() +
+                "\nheadlessMode=" + isHeadlessMode() +
+                "\ndriverManagerMode=" + isDriverManagerMode() +
+                "\nscreenshotMode=" + isScreenshotMode() +
+                "\nfastSetValueMode=" + isFastSetValueMode() +
+                "\nproxyMode=" + isProxyMode() +
+                "\npageLoadStrategy=" + getPageLoadStrategy() +
+                "\nreportsUrl=" + getReportsUrl() +
+                "\nreportsFolder=" + getReportsFolder() +
+                "\npollingIntervalMs=" + getPollingIntervalMs() +
+                "\nportProxy=" + getPortProxy() +
+                "\nhostProxy='" + getHostProxy() + '\'' +
+                "\nclassesTestRefs=" + Arrays.toString(getClassesTestRefs()) +
+                "\npointValuesToTests=" + Arrays.toString(getPointValuesToTests()) +
+                "\nbrowserOptionsArgs=" + Arrays.toString(getBrowserOptionsArgs()) +
+                "\nbrowserOptionsPrefs=" + Arrays.toString(getBrowserOptionsPrefs()) +
+                "\nalarmListChangedAfterMs=" + getAlarmListChangedAfterMs() +
+                "\nalarmListNoChangedAfterMs=" + getAlarmListNoChangedAfterMs() +
+                "\nwaitingAfterSetPointValueMs=" + getWaitingAfterSetPointValueMs() +
+                "\ngraphicalViewName='" + getGraphicalViewName() + '\'' +
+                "\ntestPlans=" + Arrays.toString(getTestPlans()) +
+                "\ndataPointToChangeXid='" + getDataPointToChangeXid() + '\'' +
+                "\ndataPointToReadXid='" + getDataPointToReadXid() + '\'' +
+                "\nlogLevel=" + getLogLevel() +
+                "\nurlAppBeingTested=" + getUrlAppBeingTested() +
+                "\nuserName='" + getUserName() + '\'' +
+                "\npassword='" + "******" + '\'' +
+                "\nauthType=" + getAuthType() +
+                "\ntitleEmail='" + getTitleEmail() + '\'' +
+                "\ntitleEmailSuccess='" + getTitleEmailSuccess() + '\'' +
+                "\ndataSourceName='" + getDataSourceName() + '\'' +
+                "\ndataPointName='" + getDataPointName() + '\'' +
+                "\ndataPointTargetXid='" + getDataPointTargetXid() + '\'' +
+                "\ndataPointSourceXid='" + getDataPointSourceXid() + '\'' +
+                "\nmailSmtpAuthMode=" + isMailSmtpAuthMode() +
+                "\nmailSmtpStarttlsMode=" + isMailSmtpStarttlsMode() +
+                "\ncheckAuthentication=" + isCheckAuthentication() +
+                "\nrefreshSessionCron='" + getRefreshSessionCron() + '\'' +
+                "\nunblockSendEmailByCron=" + isUnblockSendEmailByCron() +
+                "\nunblockSendSuccessEmailCron='" + getUnblockSendSuccessEmailCron() + '\'' +
+                "\nunblockSendFailEmailCron='" + getUnblockSendFailEmailCron() + '\'';
+    }
 }
diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/options/AppOptions.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/options/AppOptions.java
@@ -10,7 +10,6 @@
 import java.util.Set;
 
 @Getter
-@ToString
 @EqualsAndHashCode(callSuper = true)
 public class AppOptions extends DefaultOptions {
 
@@ -73,4 +72,5 @@ public class AppOptions extends DefaultOptions {
 
     @CommandLine.Option(names = {"-usfc", "--unblock-send-fail-email-cron"})
     private String unblockSendFailEmailCron;
+
 }
diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/options/MainOptions.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/options/MainOptions.java
@@ -2,7 +2,6 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.ToString;
 import org.apache.logging.log4j.Level;
 import org.scadalts.e2e.cli.parsers.AuthTypeParser;
 import org.scadalts.e2e.cli.parsers.LogLevelParser;
@@ -12,7 +11,6 @@
 import java.net.URL;
 
 @Getter
-@ToString
 @EqualsAndHashCode(callSuper = true)
 public class MainOptions extends DefaultOptions {
 
@@ -30,4 +28,5 @@ public class MainOptions extends DefaultOptions {
 
     @CommandLine.Option(names = {"-a", "--auth-type"}, converter = AuthTypeParser.class)
     private AuthType authType;
+
 }
diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/options/ScadaOptions.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/options/ScadaOptions.java
@@ -2,11 +2,9 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.ToString;
 import picocli.CommandLine;
 
 @Getter
-@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class ScadaOptions extends TestOptions {
 

diff --git a/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/options/TestOptions.java b/scada-lts-e2e-cli/src/main/java/org/scadalts/e2e/cli/options/TestOptions.java
@@ -2,7 +2,6 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.ToString;
 import org.scadalts.e2e.cli.parsers.BrowserRefParser;
 import org.scadalts.e2e.cli.parsers.PageLoadStrategyParser;
 import org.scadalts.e2e.cli.parsers.TestPlansParser;
@@ -16,7 +15,6 @@
 import java.nio.file.Path;
 
 @Getter
-@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class TestOptions extends MainOptions {
 
@@ -76,4 +74,5 @@ public class TestOptions extends MainOptions {
 
     @CommandLine.Option(names = {"-ca", "--check-authentication"}, negatable = true)
     private boolean checkAuthentication;
+
 }
diff --git a/scada-lts-e2e-common/pom.xml b/scada-lts-e2e-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>scada-lts-e2e</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>scada-lts-e2e-common</artifactId>

diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-api/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-common</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-core/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-common</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/...s-e2e-common-core/src/main/java/org/scadalts/e2e/common/core/config/E2eConfigDefault.java b/...s-e2e-common-core/src/main/java/org/scadalts/e2e/common/core/config/E2eConfigDefault.java
@@ -13,11 +13,11 @@
 import java.io.File;
 import java.net.URL;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Set;
 
 @Getter
 @Setter
-@ToString
 @EqualsAndHashCode
 class E2eConfigDefault implements E2eConfig {
 
@@ -84,4 +84,63 @@ class E2eConfigDefault implements E2eConfig {
     private boolean unblockSendEmailByCron;
     private String unblockSendSuccessEmailCron;
     private String unblockSendFailEmailCron;
+
+    @Override
+    public String toString() {
+        return "\nportApp=" + portApp +
+                "\ncronPattern='" + cronPattern + '\'' +
+                "\ncontinuousMode=" + continuousMode +
+                "\nuserSmtp='" + userSmtp + '\'' +
+                "\npasswordSmtp='" + passwordSmtp + '\'' +
+                "\nhostSmtp='" + hostSmtp + '\'' +
+                "\nportSmtp=" + portSmtp +
+                "\nsendTo=" + sendTo +
+                "\nsendFrom='" + sendFrom + '\'' +
+                "\ndebugEmailMode=" + debugEmailMode +
+                "\nnotificationEmailMode=" + notificationEmailMode +
+                "\ndeleteEmailFromSentEmailsAfterMs=" + deleteEmailFromSentEmailsAfterMs +
+                "\nbrowserRef=" + browserRef +
+                "\ntimeoutMs=" + timeoutMs +
+                "\ndriverFile=" + driverFile +
+                "\nheadlessMode=" + headlessMode +
+                "\ndriverManagerMode=" + driverManagerMode +
+                "\nscreenshotMode=" + screenshotMode +
+                "\nfastSetValueMode=" + fastSetValueMode +
+                "\nproxyMode=" + proxyMode +
+                "\npageLoadStrategy=" + pageLoadStrategy +
+                "\nreportsUrl=" + reportsUrl +
+                "\nreportsFolder=" + reportsFolder +
+                "\npollingIntervalMs=" + pollingIntervalMs +
+                "\nportProxy=" + portProxy +
+                "\nhostProxy='" + hostProxy + '\'' +
+                "\nclassesTestRefs=" + Arrays.toString(classesTestRefs) +
+                "\npointValuesToTests=" + Arrays.toString(pointValuesToTests) +
+                "\nbrowserOptionsArgs=" + Arrays.toString(browserOptionsArgs) +
+                "\nbrowserOptionsPrefs=" + Arrays.toString(browserOptionsPrefs) +
+                "\nalarmListChangedAfterMs=" + alarmListChangedAfterMs +
+                "\nalarmListNoChangedAfterMs=" + alarmListNoChangedAfterMs +
+                "\nwaitingAfterSetPointValueMs=" + waitingAfterSetPointValueMs +
+                "\ngraphicalViewName='" + graphicalViewName + '\'' +
+                "\ntestPlans=" + Arrays.toString(testPlans) +
+                "\ndataPointToChangeXid='" + dataPointToChangeXid + '\'' +
+                "\ndataPointToReadXid='" + dataPointToReadXid + '\'' +
+                "\nlogLevel=" + logLevel +
+                "\nurlAppBeingTested=" + urlAppBeingTested +
+                "\nuserName='" + userName + '\'' +
+                "\npassword='" + password + '\'' +
+                "\nauthType=" + authType +
+                "\ntitleEmail='" + titleEmail + '\'' +
+                "\ntitleEmailSuccess='" + titleEmailSuccess + '\'' +
+                "\ndataSourceName='" + dataSourceName + '\'' +
+                "\ndataPointName='" + dataPointName + '\'' +
+                "\ndataPointTargetXid='" + dataPointTargetXid + '\'' +
+                "\ndataPointSourceXid='" + dataPointSourceXid + '\'' +
+                "\nmailSmtpAuthMode=" + mailSmtpAuthMode +
+                "\nmailSmtpStarttlsMode=" + mailSmtpStarttlsMode +
+                "\ncheckAuthentication=" + checkAuthentication +
+                "\nrefreshSessionCron='" + refreshSessionCron + '\'' +
+                "\nunblockSendEmailByCron=" + unblockSendEmailByCron +
+                "\nunblockSendSuccessEmailCron='" + unblockSendSuccessEmailCron + '\'' +
+                "\nunblockSendFailEmailCron='" + unblockSendFailEmailCron + '\'';
+    }
 }
diff --git a/scada-lts-e2e-common/scada-lts-e2e-common-impl/pom.xml b/scada-lts-e2e-common/scada-lts-e2e-common-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-common</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/scada-lts-e2e-page/pom.xml b/scada-lts-e2e-page/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>scada-lts-e2e</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-api/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-page</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>scada-lts-e2e-page-api</artifactId>

diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-core/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-page</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/scada-lts-e2e-page/scada-lts-e2e-page-impl/pom.xml b/scada-lts-e2e-page/scada-lts-e2e-page-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e-page</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>scada-lts-e2e-page-impl</artifactId>

diff --git a/scada-lts-e2e-service/pom.xml b/scada-lts-e2e-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>scada-lts-e2e</artifactId>
         <groupId>org.scadalts</groupId>
-        <version>23.0.5-SNAPSHOT</version>
+        <version>23.0.7-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>