feat: KEYP-96 fix build issues (spotless, unit tests)

eclipse-keyple · Jul 6, 2020 · b80082f · b80082f
1 parent 358401c
commit b80082f
Show file tree

Hide file tree

Showing 8 changed files with 168 additions and 261 deletions.
diff --git a/...keyple-calypso/src/main/java/org/eclipse/keyple/calypso/transaction/SvDebitLogRecord.java b/...keyple-calypso/src/main/java/org/eclipse/keyple/calypso/transaction/SvDebitLogRecord.java
@@ -11,9 +11,8 @@
  ********************************************************************************/
 package org.eclipse.keyple.calypso.transaction;
 
-import org.eclipse.keyple.core.util.ByteArrayUtil;
 
-import java.util.Arrays;
+import org.eclipse.keyple.core.util.ByteArrayUtil;
 
 public class SvDebitLogRecord {
     final int offset;
@@ -87,14 +86,9 @@ public byte[] getSamTNumBytes() {
 
     @Override
     public String toString() {
-        return "SvDebitLogRecord{" +
-                "amount=" + getAmount() +
-                ", balance=" + getBalance() +
-                ", debitDate=" + getDebitDate() +
-                ", debitTime=" + getDebitDate() +
-                ", samId=" + ByteArrayUtil.toHex(getSamIdBytes()) +
-                ", svTransactionNumber=" + getSvTNum() +
-                ", svSamTransactionNumber=" + getSamTNum() +
-                '}';
+        return "SvDebitLogRecord{" + "amount=" + getAmount() + ", balance=" + getBalance()
+                + ", debitDate=" + getDebitDate() + ", debitTime=" + getDebitDate() + ", samId="
+                + ByteArrayUtil.toHex(getSamIdBytes()) + ", svTransactionNumber=" + getSvTNum()
+                + ", svSamTransactionNumber=" + getSamTNum() + '}';
     }
 }
diff --git a/.../keyple-calypso/src/main/java/org/eclipse/keyple/calypso/transaction/SvLoadLogRecord.java b/.../keyple-calypso/src/main/java/org/eclipse/keyple/calypso/transaction/SvLoadLogRecord.java
@@ -101,15 +101,10 @@ public byte[] getSamTNumBytes() {
 
     @Override
     public String toString() {
-        return "SvDebitLogRecord{" +
-                "amount=" + getAmount() +
-                ", balance=" + getBalance() +
-                ", debitDate=" + getLoadDate() +
-                ", debitTime=" + getLoadDate() +
-                ", freeBytes=" + ByteArrayUtil.toHex(getFreeByteBytes()) +
-                ", samId=" + ByteArrayUtil.toHex(getSamIdBytes()) +
-                ", svTransactionNumber=" + getSvTNum() +
-                ", svSamTransactionNumber=" + getSamTNum() +
-                '}';
+        return "SvDebitLogRecord{" + "amount=" + getAmount() + ", balance=" + getBalance()
+                + ", debitDate=" + getLoadDate() + ", debitTime=" + getLoadDate() + ", freeBytes="
+                + ByteArrayUtil.toHex(getFreeByteBytes()) + ", samId="
+                + ByteArrayUtil.toHex(getSamIdBytes()) + ", svTransactionNumber=" + getSvTNum()
+                + ", svSamTransactionNumber=" + getSamTNum() + '}';
     }
 }
diff --git a/...t/java/org/eclipse/keyple/calypso/command/po/builder/storedvalue/SvDebitCmdBuildTest.java b/...t/java/org/eclipse/keyple/calypso/command/po/builder/storedvalue/SvDebitCmdBuildTest.java
@@ -30,10 +30,8 @@ public void svDebitCmdBuild_mode_compat_base() {
                                  * KVC
                                  */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD5566771234561122334455"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD5566771234561122334455"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
         Assert.assertEquals("00BA55661477FFFF11223344AAAABBCCDD1234561122334455", apdu);
     }
@@ -54,10 +52,8 @@ public void svDebitCmdBuild_mode_compat_4081() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_1,
                 /* amount */ 4081, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD5566771234561122334455"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD5566771234561122334455"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
         Assert.assertEquals("00BA55661477F00F11223344AAAABBCCDD1234561122334455", apdu);
     }
@@ -68,10 +64,8 @@ public void svDebitCmdBuild_mode_compat_negative_amount() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_1,
                 /* amount */ -1, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD5566771234561122334455"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD5566771234561122334455"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
     }
 
@@ -81,10 +75,8 @@ public void svDebitCmdBuild_mode_compat_overlimit_amount() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_1,
                 /* amount */ 32768, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD5566771234561122334455"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD5566771234561122334455"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
     }
 
@@ -93,10 +85,8 @@ public void svDebitCmdBuild_mode_compat_bad_signature_length_1() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_1,
                 /* amount */ 1, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD55667712345611223344556677889900"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD55667712345611223344556677889900"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
     }
 
@@ -105,10 +95,8 @@ public void svDebitCmdBuild_mode_compat_bad_signature_length_2() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_1,
                 /* amount */ 1, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD556677123456112233"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD556677123456112233"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
     }
 
@@ -171,10 +159,8 @@ public void svDebitCmdBuild_mode_compat_response_parser() {
                                  */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
         byte[] svDebitData = svDebitCmdBuild.getSvDebitData();
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD5566771234561122334455"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD5566771234561122334455"));
         SvDebitRespPars svBuildCmdParser = svDebitCmdBuild
                 .createResponseParser(new ApduResponse(ByteArrayUtil.fromHex("1122339000"), null));
         Assert.assertArrayEquals(ByteArrayUtil.fromHex("112233"),
@@ -187,10 +173,8 @@ public void svDebitCmdBuild_mode_rev3_2_base() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_2,
                 /* amount */ 1, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD55667712345611223344556677889900"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD55667712345611223344556677889900"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
         Assert.assertEquals("00BA55661977FFFF11223344AAAABBCCDD12345611223344556677889900", apdu);
     }
@@ -212,10 +196,8 @@ public void svDebitCmdBuild_mode_rev3_2_4081() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_2,
                 /* amount */ 4081, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD55667712345611223344556677889900"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD55667712345611223344556677889900"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
         Assert.assertEquals("00BA55661977F00F11223344AAAABBCCDD12345611223344556677889900", apdu);
     }
@@ -226,10 +208,8 @@ public void svDebitCmdBuild_mode_rev3_2_negative_amount() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_2,
                 /* amount */ -1, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD5566771234561122334455"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD5566771234561122334455"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
     }
 
@@ -239,10 +219,8 @@ public void svDebitCmdBuild_mode_rev3_2_overlimit_amount() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_2,
                 /* amount */ 32768, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD5566771234561122334455"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD5566771234561122334455"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
     }
 
@@ -251,10 +229,8 @@ public void svDebitCmdBuild_mode_rev3_2_bad_signature_length_1() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_2,
                 /* amount */ 1, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD5566771234561122334455"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD5566771234561122334455"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
     }
 
@@ -263,10 +239,8 @@ public void svDebitCmdBuild_mode_rev3_2_bad_signature_length_2() {
         SvDebitCmdBuild svDebitCmdBuild = new SvDebitCmdBuild(PoClass.ISO, PoRevision.REV3_2,
                 /* amount */ 1, /* KVC */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD556677123456112233"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD556677123456112233"));
         String apdu = ByteArrayUtil.toHex(svDebitCmdBuild.getApduRequest().getBytes());
     }
 
@@ -329,10 +303,8 @@ public void svDebitCmdBuild_mode_rev3_2_response_parser() {
                                  */ (byte) 0xAA, /* date */ ByteArrayUtil.fromHex("1122"),
                 /* time */ ByteArrayUtil.fromHex("3344"));
         byte[] svDebitData = svDebitCmdBuild.getSvDebitData();
-        svDebitCmdBuild.finalizeBuilder(
-                /* SAM ID + prepare SV Debit data */ ByteArrayUtil
-                        .fromHex("AABBCCDD55667712345611223344556677889900"),
-                new Exception().getStackTrace()[0].getMethodName());
+        svDebitCmdBuild.finalizeBuilder(/* SAM ID + prepare SV Debit data */ ByteArrayUtil
+                .fromHex("AABBCCDD55667712345611223344556677889900"));
         SvDebitRespPars svBuildCmdParser = svDebitCmdBuild.createResponseParser(
                 new ApduResponse(ByteArrayUtil.fromHex("1122334455669000"), null));
         Assert.assertArrayEquals(ByteArrayUtil.fromHex("112233445566"),

diff --git a/...est/java/org/eclipse/keyple/calypso/command/po/builder/storedvalue/SvGetCmdBuildTest.java b/...est/java/org/eclipse/keyple/calypso/command/po/builder/storedvalue/SvGetCmdBuildTest.java
@@ -21,8 +21,8 @@
 public class SvGetCmdBuildTest {
     @Test
     public void svGetCmdBuild_mode_compat_reload() {
-        SvGetCmdBuild svGetCmdBuild = new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_1,
-                SvSettings.Operation.RELOAD, new Exception().getStackTrace()[0].getMethodName());
+        SvGetCmdBuild svGetCmdBuild =
+                new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_1, SvSettings.Operation.RELOAD);
 
         String cmdBytes = ByteArrayUtil.toHex(svGetCmdBuild.getApduRequest().getBytes());
 
@@ -31,8 +31,8 @@ public void svGetCmdBuild_mode_compat_reload() {
 
     @Test
     public void svGetCmdBuild_mode_compat_debit() {
-        SvGetCmdBuild svGetCmdBuild = new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_1,
-                SvSettings.Operation.DEBIT, new Exception().getStackTrace()[0].getMethodName());
+        SvGetCmdBuild svGetCmdBuild =
+                new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_1, SvSettings.Operation.DEBIT);
 
         String cmdBytes = ByteArrayUtil.toHex(svGetCmdBuild.getApduRequest().getBytes());
 
@@ -41,18 +41,18 @@ public void svGetCmdBuild_mode_compat_debit() {
 
     @Test
     public void svGetCmdBuild_mode_compat_get_sv_operation() {
-        SvGetCmdBuild svGetCmdBuild = new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_1,
-                SvSettings.Operation.RELOAD, new Exception().getStackTrace()[0].getMethodName());
+        SvGetCmdBuild svGetCmdBuild =
+                new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_1, SvSettings.Operation.RELOAD);
         Assert.assertEquals(SvSettings.Operation.RELOAD, svGetCmdBuild.getSvOperation());
-        svGetCmdBuild = new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_1,
-                SvSettings.Operation.DEBIT, new Exception().getStackTrace()[0].getMethodName());
+        svGetCmdBuild =
+                new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_1, SvSettings.Operation.DEBIT);
         Assert.assertEquals(SvSettings.Operation.DEBIT, svGetCmdBuild.getSvOperation());
     }
 
     @Test
     public void svGetCmdBuild_mode_rev32_reload() {
-        SvGetCmdBuild svGetCmdBuild = new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_2,
-                SvSettings.Operation.RELOAD, new Exception().getStackTrace()[0].getMethodName());
+        SvGetCmdBuild svGetCmdBuild =
+                new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_2, SvSettings.Operation.RELOAD);
 
         String cmdBytes = ByteArrayUtil.toHex(svGetCmdBuild.getApduRequest().getBytes());
 
@@ -61,8 +61,8 @@ public void svGetCmdBuild_mode_rev32_reload() {
 
     @Test
     public void svGetCmdBuild_mode_rev32_debit() {
-        SvGetCmdBuild svGetCmdBuild = new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_2,
-                SvSettings.Operation.DEBIT, new Exception().getStackTrace()[0].getMethodName());
+        SvGetCmdBuild svGetCmdBuild =
+                new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_2, SvSettings.Operation.DEBIT);
 
         String cmdBytes = ByteArrayUtil.toHex(svGetCmdBuild.getApduRequest().getBytes());
 
@@ -71,11 +71,11 @@ public void svGetCmdBuild_mode_rev32_debit() {
 
     @Test
     public void svGetCmdBuild_mode_rev32_get_sv_operation() {
-        SvGetCmdBuild svGetCmdBuild = new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_2,
-                SvSettings.Operation.RELOAD, new Exception().getStackTrace()[0].getMethodName());
+        SvGetCmdBuild svGetCmdBuild =
+                new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_2, SvSettings.Operation.RELOAD);
         Assert.assertEquals(SvSettings.Operation.RELOAD, svGetCmdBuild.getSvOperation());
-        svGetCmdBuild = new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_2,
-                SvSettings.Operation.DEBIT, new Exception().getStackTrace()[0].getMethodName());
+        svGetCmdBuild =
+                new SvGetCmdBuild(PoClass.ISO, PoRevision.REV3_2, SvSettings.Operation.DEBIT);
         Assert.assertEquals(SvSettings.Operation.DEBIT, svGetCmdBuild.getSvOperation());
     }
 }