Add Junit to v3.1.0

waarp · Jul 22, 2019 · bfd5ac9 · bfd5ac9
1 parent cbd7573
commit bfd5ac9
Show file tree

Hide file tree

Showing 47 changed files with 5,509 additions and 1,826 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,9 +32,31 @@ local.properties
 #################
 ## Java
 #################
+# Compiled class file
 *.class
 *.jardesc
 
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
 #################
 ## Visual Studio
 #################
@@ -132,3 +154,43 @@ Thumbs.db
 Desktop.ini
 
 runtime.properties
+
+###############
+## Intellij
+###############
+# User-specific stuff
+.idea/
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+*.iml
+*.ipr
+
+# CMake
+cmake-build-*/
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+*.log
+
diff --git a/pom.xml b/pom.xml
@@ -324,7 +324,7 @@
             <source>1.6</source>
             <target>1.6</target>
             <optimize>true</optimize>
-            <showDeprecations>true</showDeprecations>
+            <showDeprecation>true</showDeprecation>
           </configuration>
       </plugin>
       <plugin>

diff --git a/src/main/java/org/waarp/common/command/exception/CommandAbstractException.java b/src/main/java/org/waarp/common/command/exception/CommandAbstractException.java
@@ -38,7 +38,7 @@ public abstract class CommandAbstractException extends Exception {
     public String message = null;
 
     /**
-     * Unique constructor
+     * Simplest constructor
      * 
      * @param code
      * @param message
@@ -49,6 +49,19 @@ public CommandAbstractException(ReplyCode code, String message) {
         this.message = message;
     }
 
+    /**
+     * Constructor with Throwable
+     *
+     * @param code
+     * @param message
+     * @param e
+     */
+    public CommandAbstractException(ReplyCode code, String message, Throwable e) {
+        super(code.getMesg(), e);
+        this.code = code;
+        this.message = message;
+    }
+
     /**
 	 *
 	 */

diff --git a/src/main/java/org/waarp/common/command/exception/Reply550Exception.java b/src/main/java/org/waarp/common/command/exception/Reply550Exception.java
@@ -41,4 +41,14 @@ public Reply550Exception(String message) {
         super(ReplyCode.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, message);
     }
 
+    /**
+     * 550 Requested action not taken. File unavailable (e.g., file not found, no access).
+     *
+     * @param message
+     * @param e
+     */
+    public Reply550Exception(String message, Throwable e) {
+        super(ReplyCode.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, message, e);
+    }
+
 }
diff --git a/src/main/java/org/waarp/common/crypto/ssl/WaarpSslUtility.java b/src/main/java/org/waarp/common/crypto/ssl/WaarpSslUtility.java
@@ -124,7 +124,8 @@ public static boolean waitForHandshake(Channel channel) {
             }
             return true;
         } else {
-            logger.error("SSL Not found but connected: " + handler.getClass().getName());
+            logger.info("SSL Not found but connected: {} {}",
+                         handler.getClass().getName());
             return true;
         }
     }

diff --git a/src/main/java/org/waarp/common/database/data/AbstractDbData.java b/src/main/java/org/waarp/common/database/data/AbstractDbData.java
@@ -195,7 +195,6 @@ public void select() throws WaarpDatabaseException {
             preparedStatement.executeQuery();
             if (preparedStatement.getNext()) {
                 getValues(preparedStatement, allFields);
-                setFromArray();
                 isSaved = true;
             } else {
                 throw new WaarpDatabaseNoDataException("No row found");
@@ -565,6 +564,7 @@ protected void getValues(DbPreparedStatement preparedStatement,
         for (DbValue value : values) {
             getTrueValue(rs, value);
         }
+        setFromArray();
     }
 
     /**
@@ -576,7 +576,6 @@ protected void getValues(DbPreparedStatement preparedStatement,
     public boolean get(DbPreparedStatement preparedStatement) {
         try {
             getValues(preparedStatement, allFields);
-            setFromArray();
         } catch (WaarpDatabaseNoConnectionException e1) {
             return false;
         } catch (WaarpDatabaseSqlException e1) {