CU-86b3verm1_Code-cleanupimprovement

Author: ptorres-prowide

src/main/java/com/prowidesoftware/deprecation/package-info.java

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 /**
- * Classes to support Prowide deprecation policy: <a href="http://www.prowidesoftware.com/resources/deprecation-policy">Deprecation Policy</a>
+ * Classes to support Prowide deprecation policy:
+ * <a href="http://www.prowidesoftware.com/resources/deprecation-policy">Deprecation Policy</a>
  */
 package com.prowidesoftware.deprecation;

src/main/java/com/prowidesoftware/swift/model/SwiftValueBlock.java

@@ -19,7 +19,8 @@
 import java.util.logging.Level;
 
 /**
- * Base class for SWIFT blocks that contain its fields concatenated as a single <b>fixed length</b> value; blocks 1 and 2.<br>
+ * Base class for SWIFT blocks that contain its fields concatenated as a single <b>fixed length</b>
+ * value; blocks 1 and 2.<br>
  * This is an <b>abstract</b> class so specific block classes for each block should be instantiated.
  *
  * @author sebastian
@@ -29,7 +30,7 @@ public abstract class SwiftValueBlock extends SwiftBlock implements Serializable
     private static final long serialVersionUID = -3680693640473937755L;
 
     @SuppressWarnings("unused")
-    private static final transient java.util.logging.Logger log =
+    private static final java.util.logging.Logger LOGGER =
             java.util.logging.Logger.getLogger(SwiftValueBlock.class.getName());
 
     /**
@@ -135,7 +136,7 @@ protected String getValuePart(final String value, final int start, int size) {
             try {
                 s = value.substring(start, start + boundedSize);
             } catch (final IndexOutOfBoundsException e) {
-                log.log(Level.SEVERE, "Exception parsing value part", e);
+                LOGGER.log(Level.SEVERE, "Exception parsing value part", e);
             }
         }
         return s;

src/main/java/com/prowidesoftware/swift/model/Tag.java

@@ -42,7 +42,7 @@ public class Tag implements Serializable {
     /**
      * List of unparsed texts. For performance reasons, this will be null until really needed.
      */
-    protected UnparsedTextList unparsedTexts = null;
+    protected UnparsedTextList unparsedTexts;
 
     /**
      * Default constructor.
@@ -66,7 +66,8 @@ public Tag(Tag tag) {
      * <p>
      * If inner contains one ':' character, the string before is set as the tag name and the rest as the value.
      * If inner contains more than one ':' characters, then the first value is used as previously described.
-     * If no ':' character is found the whole string is set as the tag value and the tag name is kept null (useful for bloc data)
+     * If no ':' character is found the whole string is set as the tag value and the tag name is kept
+     * null (useful for bloc data)
      *
      * <p>
      * Maps:
@@ -96,7 +97,9 @@ public Tag(String inner) {
                 this.value = inner.substring(i + 1);
             }
         } else {
-            if (inner.length() > 0) this.value = inner;
+            if (!inner.isEmpty()) {
+                this.value = inner;
+            }
         }
     }
 
@@ -216,7 +219,9 @@ public String toString() {
      * verifies that the unparsed text list exists
      */
     protected void unparsedTextVerify() {
-        if (this.unparsedTexts == null) this.unparsedTexts = new UnparsedTextList();
+        if (this.unparsedTexts == null) {
+            this.unparsedTexts = new UnparsedTextList();
+        }
     }
 
     /**
@@ -249,7 +254,9 @@ public void setUnparsedTexts(UnparsedTextList texts) {
     public Integer getUnparsedTextsSize() {
 
         // no list => size is zero...
-        if (this.unparsedTexts == null) return 0;
+        if (this.unparsedTexts == null) {
+            return 0;
+        }
         return this.unparsedTexts.size();
     }
 
@@ -326,8 +333,12 @@ public void unparsedTextAddText(SwiftMessage message) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         Tag tag = (Tag) o;
         return Objects.equals(name, tag.name)
                 && Objects.equals(value, tag.value)
@@ -348,17 +359,31 @@ public int hashCode() {
      * @since 7.9.3
      */
     public boolean equalsIgnoreCR(Tag other) {
-        if (other == null) return false;
-        if (this == other) return true;
+        if (other == null) {
+            return false;
+        }
+        if (this == other) {
+            return true;
+        }
         if (name == null) {
-            if (other.name != null) return false;
-        } else if (!name.equals(other.name)) return false;
+            if (other.name != null) {
+                return false;
+            }
+        } else if (!name.equals(other.name)) {
+            return false;
+        }
         if (unparsedTexts == null) {
-            if (other.unparsedTexts != null) return false;
-        } else if (!unparsedTexts.equals(other.unparsedTexts)) return false;
+            if (other.unparsedTexts != null) {
+                return false;
+            }
+        } else if (!unparsedTexts.equals(other.unparsedTexts)) {
+            return false;
+        }
         if (value == null) {
             return other.value == null;
-        } else return StringUtils.replace(value, "\r", "").equals(StringUtils.replace(other.value, "\r", ""));
+        } else {
+            return StringUtils.replace(value, "\r", "").equals(StringUtils.replace(other.value, "\r", ""));
+        }
     }
 
     /**

src/main/java/com/prowidesoftware/swift/model/TagVisitor.java

@@ -21,7 +21,8 @@ public interface TagVisitor {
      * Visit the current tag
      *
      * @param tag the current tag
-     * @return <code>true</code> if the visitor should continue with further tags if any or <code>false</code> to abort the visiting process
+     * @return <code>true</code> if the visitor should continue
+     * with further tags if any or <code>false</code> to abort the visiting process
      */
     boolean onTag(Tag tag);
 }

src/main/java/com/prowidesoftware/swift/model/UETRUtils.java

@@ -23,8 +23,11 @@
  *
  * @since 9.1.4
  */
-public class UETRUtils {
+public final class UETRUtils {
 
+    private UETRUtils() {
+        // utility class
+    }
     /**
      * Creates a new random UETR compatible with MT block 3 field 121
      */

src/main/java/com/prowidesoftware/swift/model/UnparsedTextList.java

@@ -17,7 +17,10 @@
 
 import com.prowidesoftware.swift.io.ConversionService;
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -277,8 +280,12 @@ public void removeText(final String text) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         UnparsedTextList that = (UnparsedTextList) o;
         return Objects.equals(texts, that.texts);
     }

src/main/java/com/prowidesoftware/swift/model/field/package-info.java

@@ -18,7 +18,10 @@
  *
  * <p>This package provides classes to parse and model every possible field and letter option of a SWIFT MT message.
  *
- * <p>The constructor of each field class accepts the field's literal value and parses its content into a list of components with a simple and generic API of getComponent1() ... getComponentN().<br>
- * Components are modeled as string, but if the component represents a date or number, additional API is provided to get the component parsed into a Calendar and Number with methods like getComponent1AsCalendar() and getComponent3AsNumber().
+ * <p>The constructor of each field class accepts the field's literal value and parses its content into a
+ * list of components with a simple and generic API of getComponent1() ... getComponentN().<br>
+ * Components are modeled as string, but if the component represents a date or number, additional API is
+ * provided to get the component parsed into a Calendar and Number with methods
+ * like getComponent1AsCalendar() and getComponent3AsNumber().
  */
 package com.prowidesoftware.swift.model.field;