Fixing deprecated Fields

prowide · Sep 13, 2024 · 2c86397 · 2c86397
1 parent 02b340f
commit 2c86397
Show file tree

Hide file tree

Showing 44 changed files with 208 additions and 327 deletions.
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field11T.java b/src/main/java/com/prowidesoftware/swift/model/field/Field11T.java
@@ -243,13 +243,11 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 3) {
-            // time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent3AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent3AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
@@ -766,7 +764,7 @@ public static List<Field11T> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field11T(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field12H.java b/src/main/java/com/prowidesoftware/swift/model/field/Field12H.java
@@ -212,11 +212,8 @@ public String getValueDisplay(int component, Locale locale) {
             // default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            // default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(2);
     }
 
     /**
@@ -269,10 +266,7 @@ public String validatorPattern() {
      */
     @Override
     public boolean isOptional(int component) {
-        if (component == 2) {
-            return true;
-        }
-        return false;
+        return component == 2;
     }
 
     /**
@@ -475,7 +469,7 @@ public static List<Field12H> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field12H(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field12K.java b/src/main/java/com/prowidesoftware/swift/model/field/Field12K.java
@@ -206,14 +206,11 @@ public String getValue() {
      */
     @Override
     public String getValueDisplay(int component, Locale locale) {
-        if (component < 1 || component > 1) {
+        if (component != 1) {
             throw new IllegalArgumentException("invalid component number " + component + " for field 12K");
         }
-        if (component == 1) {
-            // default format (as is)
-            return getComponent(1);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(1);
     }
 
     /**
@@ -632,7 +629,7 @@ public static List<Field12K> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field12K(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field12L.java b/src/main/java/com/prowidesoftware/swift/model/field/Field12L.java
@@ -195,14 +195,11 @@ public String getValue() {
      */
     @Override
     public String getValueDisplay(int component, Locale locale) {
-        if (component < 1 || component > 1) {
+        if (component != 1) {
             throw new IllegalArgumentException("invalid component number " + component + " for field 12L");
         }
-        if (component == 1) {
-            // default format (as is)
-            return getComponent(1);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(1);
     }
 
     /**
@@ -418,7 +415,7 @@ public static List<Field12L> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field12L(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field12R.java b/src/main/java/com/prowidesoftware/swift/model/field/Field12R.java
@@ -212,11 +212,8 @@ public String getValueDisplay(int component, Locale locale) {
             // default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            // default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(2);
     }
 
     /**
@@ -269,10 +266,7 @@ public String validatorPattern() {
      */
     @Override
     public boolean isOptional(int component) {
-        if (component == 2) {
-            return true;
-        }
-        return false;
+        return component == 2;
     }
 
     /**
@@ -475,7 +469,7 @@ public static List<Field12R> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field12R(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field12S.java b/src/main/java/com/prowidesoftware/swift/model/field/Field12S.java
@@ -195,14 +195,11 @@ public String getValue() {
      */
     @Override
     public String getValueDisplay(int component, Locale locale) {
-        if (component < 1 || component > 1) {
+        if (component != 1) {
             throw new IllegalArgumentException("invalid component number " + component + " for field 12S");
         }
-        if (component == 1) {
-            // default format (as is)
-            return getComponent(1);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(1);
     }
 
     /**
@@ -418,7 +415,7 @@ public static List<Field12S> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field12S(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field13E.java b/src/main/java/com/prowidesoftware/swift/model/field/Field13E.java
@@ -222,13 +222,11 @@ public String getValueDisplay(int component, Locale locale) {
                 return f.format(cal.getTime());
             }
         }
-        if (component == 2) {
-            // time: HH[mm]
-            java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
-            java.util.Calendar cal = getComponent2AsCalendar();
-            if (cal != null) {
-                return f.format(cal.getTime());
-            }
+        // time: HH[mm]
+        java.text.DateFormat f = new java.text.SimpleDateFormat("HH:mm", notNull(locale));
+        java.util.Calendar cal = getComponent2AsCalendar();
+        if (cal != null) {
+            return f.format(cal.getTime());
         }
         return null;
     }
@@ -584,7 +582,7 @@ public static List<Field13E> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field13E(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field20E.java b/src/main/java/com/prowidesoftware/swift/model/field/Field20E.java
@@ -211,11 +211,8 @@ public String getValueDisplay(int component, Locale locale) {
             // default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            // default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(2);
     }
 
     /**
@@ -471,7 +468,7 @@ public static List<Field20E> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field20E(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field21S.java b/src/main/java/com/prowidesoftware/swift/model/field/Field21S.java
@@ -195,14 +195,11 @@ public String getValue() {
      */
     @Override
     public String getValueDisplay(int component, Locale locale) {
-        if (component < 1 || component > 1) {
+        if (component != 1) {
             throw new IllegalArgumentException("invalid component number " + component + " for field 21S");
         }
-        if (component == 1) {
-            // default format (as is)
-            return getComponent(1);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(1);
     }
 
     /**
@@ -418,7 +415,7 @@ public static List<Field21S> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field21S(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field21T.java b/src/main/java/com/prowidesoftware/swift/model/field/Field21T.java
@@ -195,14 +195,11 @@ public String getValue() {
      */
     @Override
     public String getValueDisplay(int component, Locale locale) {
-        if (component < 1 || component > 1) {
+        if (component != 1) {
             throw new IllegalArgumentException("invalid component number " + component + " for field 21T");
         }
-        if (component == 1) {
-            // default format (as is)
-            return getComponent(1);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(1);
     }
 
     /**
@@ -418,7 +415,7 @@ public static List<Field21T> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field21T(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field25F.java b/src/main/java/com/prowidesoftware/swift/model/field/Field25F.java
@@ -195,14 +195,11 @@ public String getValue() {
      */
     @Override
     public String getValueDisplay(int component, Locale locale) {
-        if (component < 1 || component > 1) {
+        if (component != 1) {
             throw new IllegalArgumentException("invalid component number " + component + " for field 25F");
         }
-        if (component == 1) {
-            // default format (as is)
-            return getComponent(1);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(1);
     }
 
     /**
@@ -418,7 +415,7 @@ public static List<Field25F> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field25F(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field25G.java b/src/main/java/com/prowidesoftware/swift/model/field/Field25G.java
@@ -195,14 +195,11 @@ public String getValue() {
      */
     @Override
     public String getValueDisplay(int component, Locale locale) {
-        if (component < 1 || component > 1) {
+        if (component != 1) {
             throw new IllegalArgumentException("invalid component number " + component + " for field 25G");
         }
-        if (component == 1) {
-            // default format (as is)
-            return getComponent(1);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(1);
     }
 
     /**
@@ -418,7 +415,7 @@ public static List<Field25G> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field25G(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field27A.java b/src/main/java/com/prowidesoftware/swift/model/field/Field27A.java
@@ -214,11 +214,8 @@ public String getValueDisplay(int component, Locale locale) {
             // default format (as is)
             return getComponent(1);
         }
-        if (component == 2) {
-            // default format (as is)
-            return getComponent(2);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(2);
     }
 
     /**
@@ -716,7 +713,7 @@ public static List<Field27A> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field27A(f));
             }

diff --git a/src/main/java/com/prowidesoftware/swift/model/field/Field29D.java b/src/main/java/com/prowidesoftware/swift/model/field/Field29D.java
@@ -214,11 +214,8 @@ public String getValueDisplay(int component, Locale locale) {
             // default format (as is)
             return getComponent(3);
         }
-        if (component == 4) {
-            // default format (as is)
-            return getComponent(4);
-        }
-        return null;
+        // default format (as is)
+        return getComponent(4);
     }
 
     /**
@@ -277,10 +274,7 @@ public boolean isOptional(int component) {
         if (component == 3) {
             return true;
         }
-        if (component == 4) {
-            return true;
-        }
-        return false;
+        return component == 4;
     }
 
     /**
@@ -603,7 +597,7 @@ public static List<Field29D> getAll(final SwiftTagListBlock block) {
             return result;
         }
         final Tag[] arr = block.getTagsByName(NAME);
-        if (arr != null && arr.length > 0) {
+        if (arr != null) {
             for (final Tag f : arr) {
                 result.add(new Field29D(f));
             }