From 9ee8f8878b6ab00031251941e7880f46cb38f45b Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sun, 10 Jul 2022 16:49:54 -0400 Subject: [PATCH] Remove dependency on apache commons-lang3 --- libs/lpad-sm-dp-plus-connector/build.gradle | 1 - .../com/truphone/es9plus/HttpRSPClient.java | 4 +--- .../java/com/truphone/lpa/apdu/ApduUtils.java | 6 +++--- .../lpa/impl/LocalProfileAssistantImpl.java | 2 -- .../impl/download/InstallationPhaseWorker.java | 13 +++++++------ .../lpad/worker/AllocateProfileWorker.java | 4 +--- .../lpad/worker/DeleteProfileWorker.java | 5 +++-- .../truphone/lpad/worker/GetEidLpadWorker.java | 7 ++++--- .../main/java/com/truphone/util/TextUtil.kt | 18 ++++++++++++++++++ 9 files changed, 37 insertions(+), 23 deletions(-) diff --git a/libs/lpad-sm-dp-plus-connector/build.gradle b/libs/lpad-sm-dp-plus-connector/build.gradle index e09b499..e9a92a6 100644 --- a/libs/lpad-sm-dp-plus-connector/build.gradle +++ b/libs/lpad-sm-dp-plus-connector/build.gradle @@ -9,7 +9,6 @@ dependencies { tool 'javax.xml.bind:jaxb-api:2.3.0' tool 'com.beanit:asn1bean-compiler:1.13.0' implementation 'com.beanit:asn1bean:1.13.0' - implementation 'org.apache.commons:commons-lang3:3.7' implementation 'commons-codec:commons-codec:1.11' implementation 'com.google.code.gson:gson:2.8.4' testImplementation 'junit:junit:4.12' diff --git a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/es9plus/HttpRSPClient.java b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/es9plus/HttpRSPClient.java index 5c429d2..7952cfc 100644 --- a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/es9plus/HttpRSPClient.java +++ b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/es9plus/HttpRSPClient.java @@ -3,8 +3,6 @@ package com.truphone.es9plus; import com.truphone.util.LogStub; import com.truphone.util.TextUtil; -import org.apache.commons.lang3.StringUtils; - import java.io.BufferedWriter; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -57,7 +55,7 @@ public class HttpRSPClient { StringBuilder endpoint = new StringBuilder(rspServerUrl); HttpResponse httpResponse = new HttpResponse(); - if (StringUtils.isNotBlank(url)) { + if (TextUtil.isNotBlank(url)) { endpoint.append(url); } diff --git a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/apdu/ApduUtils.java b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/apdu/ApduUtils.java index 40bab8e..4b46c5f 100644 --- a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/apdu/ApduUtils.java +++ b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/apdu/ApduUtils.java @@ -1,6 +1,6 @@ package com.truphone.lpa.apdu; -import org.apache.commons.lang3.StringUtils; +import com.truphone.util.TextUtil; import com.truphone.util.ToTLV; import com.truphone.util.Tools; @@ -135,7 +135,7 @@ public class ApduUtils { public static String listNotificationApdu(String notificationType) { String data; - if (StringUtils.isNotBlank(notificationType)) { + if (TextUtil.isNotBlank(notificationType)) { data = ToTLV.toTLV("BF28", ToTLV.toTLV("81", "04" + notificationType)); } else { data = ToTLV.toTLV("BF28", ""); @@ -156,7 +156,7 @@ public class ApduUtils { public static String getProfilesInfoApdu(String isdp1) { String searchCriteria = ""; - if (!StringUtils.isEmpty(isdp1)) { + if (TextUtil.isNotEmpty(isdp1)) { searchCriteria = ToTLV.toTLV("A0", ToTLV.toTLV("4F", isdp1)); } String data = ToTLV.toTLV("BF2D", searchCriteria);// + tagList); diff --git a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/impl/LocalProfileAssistantImpl.java b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/impl/LocalProfileAssistantImpl.java index bfcec28..449f95a 100644 --- a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/impl/LocalProfileAssistantImpl.java +++ b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/impl/LocalProfileAssistantImpl.java @@ -15,8 +15,6 @@ import com.truphone.lpad.worker.LpadWorkerExchange; import com.truphone.util.LogStub; import com.truphone.util.TextUtil; -import org.apache.commons.lang3.StringUtils; - import java.util.List; import java.util.Map; import java.util.logging.Level; diff --git a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/impl/download/InstallationPhaseWorker.java b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/impl/download/InstallationPhaseWorker.java index d18ccc2..9916693 100644 --- a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/impl/download/InstallationPhaseWorker.java +++ b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpa/impl/download/InstallationPhaseWorker.java @@ -7,9 +7,10 @@ import com.truphone.lpad.progress.ProgressStep; import com.truphone.rsp.dto.asn1.rspdefinitions.ProfileInstallationResult; import com.truphone.rsp.dto.asn1.rspdefinitions.ProfileInstallationResultData; import com.truphone.util.LogStub; +import com.truphone.util.TextUtil; + import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; -import org.apache.commons.lang3.StringUtils; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -98,7 +99,7 @@ public class InstallationPhaseWorker { String profileInstallationResult = apduTransmitter.transmitApdus(sbpp); - if (StringUtils.isNotBlank(profileInstallationResult)) { + if (TextUtil.isNotBlank(profileInstallationResult)) { checkProfileInstallationResult(profileInstallationResult); } } @@ -110,7 +111,7 @@ public class InstallationPhaseWorker { String profileInstallationResult = apduTransmitter.transmitApdus(sbpp); - if (StringUtils.isNotBlank(profileInstallationResult)) { + if (TextUtil.isNotBlank(profileInstallationResult)) { checkProfileInstallationResult(profileInstallationResult); } } @@ -122,7 +123,7 @@ public class InstallationPhaseWorker { String profileInstallationResult = apduTransmitter.transmitApdus(sbpp); - if (StringUtils.isNotBlank(profileInstallationResult)) { + if (TextUtil.isNotBlank(profileInstallationResult)) { checkProfileInstallationResult(profileInstallationResult); } } @@ -134,7 +135,7 @@ public class InstallationPhaseWorker { String profileInstallationResult = apduTransmitter.transmitApdus(sbpp); - if (StringUtils.isNotBlank(profileInstallationResult)) { + if (TextUtil.isNotBlank(profileInstallationResult)) { checkProfileInstallationResult(profileInstallationResult); } } @@ -223,7 +224,7 @@ public class InstallationPhaseWorker { "loadReplaceSessionsKeys..."); String profileInstallationResult = apduTransmitter.transmitApdus(sbpp); - if (StringUtils.isNotBlank(profileInstallationResult)) { + if (TextUtil.isNotBlank(profileInstallationResult)) { checkProfileInstallationResult(profileInstallationResult); } } diff --git a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpad/worker/AllocateProfileWorker.java b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpad/worker/AllocateProfileWorker.java index debbcd9..68b87d5 100644 --- a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpad/worker/AllocateProfileWorker.java +++ b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/lpad/worker/AllocateProfileWorker.java @@ -3,14 +3,12 @@ package com.truphone.lpad.worker; import com.truphone.es9plus.AllocateProfileResponse; import com.truphone.es9plus.Es9PlusImpl; import com.truphone.util.LogStub; -import org.apache.commons.lang3.StringUtils; import com.truphone.lpad.LpadWorker; import com.truphone.lpad.progress.Progress; import com.truphone.lpad.progress.ProgressStep; import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.commons.lang3.NotImplementedException; /** * Worker containing all logic to allocate a profile for a MCC with a specific EID @@ -67,7 +65,7 @@ public class AllocateProfileWorker implements LpadWorker, progress.stepExecuted(ProgressStep.GET_EID_RETRIEVING, "getEID retrieving..."); inputValidation(lpadWorkerExchange == null, "Lpa dWorker Exchange must be provided"); - inputValidation(StringUtils.isBlank(lpadWorkerExchange.getBody()), "EID APDU must be provided"); + inputValidation(TextUtil.isBlank(lpadWorkerExchange.getBody()), "EID APDU must be provided"); logDebug("EID APDU: " + lpadWorkerExchange); @@ -62,7 +63,7 @@ public class GetEidLpadWorker implements LpadWorker, progress.stepExecuted(ProgressStep.GET_EID_CONVERTING, "getEID converting..."); - inputValidation(StringUtils.isBlank(eidapduResponseStr), "received an invalid eidapduResponseStr: " + eidapduResponseStr); + inputValidation(TextUtil.isBlank(eidapduResponseStr), "received an invalid eidapduResponseStr: " + eidapduResponseStr); GetEuiccDataResponse eidResponse = new GetEuiccDataResponse(); diff --git a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/util/TextUtil.kt b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/util/TextUtil.kt index 43dd934..014da14 100644 --- a/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/util/TextUtil.kt +++ b/libs/lpad-sm-dp-plus-connector/src/main/java/com/truphone/util/TextUtil.kt @@ -86,4 +86,22 @@ object TextUtil { */ @JvmStatic fun readInputStream(i: InputStream): ByteArray = i.readBytes() + + /* + * TODO: Remove after Kotlin migration + */ + @JvmStatic + fun isNotBlank(str: String): Boolean = str.isNotBlank() + + /* + * TODO: Remove after Kotlin migration + */ + @JvmStatic + fun isBlank(str: String): Boolean = str.isBlank() + + /* + * TODO: Remove after Kotlin migration + */ + @JvmStatic + fun isNotEmpty(str: String): Boolean = str.isNotEmpty() } \ No newline at end of file