Add module-info, remove unnecessary dependencies

jpos · Oct 13, 2024 · 5392e8b · 5392e8b
1 parent a483f89
commit 5392e8b
Show file tree

Hide file tree

Showing 26 changed files with 88 additions and 509 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'org.jpos.jposapp' version '0.0.10'
     id 'idea'
+    id 'org.gradlex.extra-java-module-info' version '1.9'
 }
 
 

diff --git a/gradle/modules.properties b/gradle/modules.properties
@@ -0,0 +1,2 @@
+quartz=org.quartz-scheduler:quartz
+
diff --git a/modules/cmf/build.gradle b/modules/cmf/build.gradle
@@ -2,8 +2,6 @@ description = 'jPOS-EE :: CMF Utils'
 
 dependencies {
     api libs.jpos
-    api libs.commonsLang3
-
     testImplementation testlibs.junit
     testRuntimeOnly testlibs.junitRuntime
 }

diff --git a/modules/cmf/src/main/java/module-info.java b/modules/cmf/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module org.jpos.ee.cmf {
+    requires org.jpos.jpos;
+
+    exports org.jpos.cmf;
+    exports org.jpos.cmf.iso;
+}
diff --git a/modules/cmf/src/main/java/org/jpos/cmf/AdditionalAmount.java b/modules/cmf/src/main/java/org/jpos/cmf/AdditionalAmount.java
diff --git a/modules/cmf/src/main/java/org/jpos/cmf/AdditionalAmountsWrapper.java b/modules/cmf/src/main/java/org/jpos/cmf/AdditionalAmountsWrapper.java
diff --git a/modules/cmf/src/main/java/org/jpos/cmf/AmountType.java b/modules/cmf/src/main/java/org/jpos/cmf/AmountType.java
@@ -18,8 +18,8 @@
 
 package org.jpos.cmf;
 
-import org.jpos.iso.AdditionalAmountType;
-import org.jpos.iso.AdditionalAmountTypeConverter;
+import org.jpos.cmf.iso.AdditionalAmountType;
+import org.jpos.cmf.iso.AdditionalAmountTypeConverter;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/modules/cmf/src/main/java/org/jpos/cmf/CMFAdditionalAmount.java b/modules/cmf/src/main/java/org/jpos/cmf/CMFAdditionalAmount.java
@@ -18,8 +18,9 @@
 
 package org.jpos.cmf;
 
-import org.apache.commons.lang3.StringUtils;
-import org.jpos.iso.AdditionalAmount;
+// import org.apache.commons.lang3.StringUtils;
+import org.jpos.cmf.iso.AdditionalAmount;
+import org.jpos.iso.ISOUtil;
 
 import java.math.BigDecimal;
 import java.util.Objects;
@@ -54,7 +55,7 @@ public String serialize() {
                 getCurrencyCode() +
                 getCurrencyMinorUnit() +
                 (getAmount().compareTo(BigDecimal.ZERO) >= 0 ? "C" : "D") +
-                StringUtils.leftPad(Long.toString(absAmt), 12, '0');
+                ISOUtil.zeropad(absAmt, 12);
     }
 
     public static AdditionalAmount parse(String data) {
@@ -63,13 +64,13 @@ public static AdditionalAmount parse(String data) {
         if (data.length() != SERIALIZED_DATA_LENGTH)
             throw new IllegalArgumentException("Invalid data length");
 
-        String accountType = StringUtils.mid(data, 0, 2);
-        String amountType = StringUtils.mid(data, 2, 2);
-        String currencyCode = StringUtils.mid(data, 4, 3);
-        int minorUnit = Integer.parseInt(StringUtils.mid(data, 7, 1));
+        String accountType = data.substring(0, 2);
+        String amountType = data.substring(2, 4);
+        String currencyCode = data.substring(4, 7);
+        int minorUnit = Integer.parseInt(data.substring(7, 8));
 
-        String amountSign = StringUtils.mid(data, 8, 1);
-        BigDecimal amount = new BigDecimal(StringUtils.right(data, 12)).movePointLeft(minorUnit);
+        String amountSign = data.substring(8,9);
+        BigDecimal amount = new BigDecimal(data.substring(data.length() - 12)).movePointLeft(minorUnit);
 
         if (!"C.D".contains(amountSign))
             throw new IllegalArgumentException("Invalid amount sign");