Minor cleanups

martinpaljak · Oct 1, 2024 · e486682 · e486682
1 parent d7830f5
commit e486682
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 12 deletions.
diff --git a/capfile/src/main/java/pro/javacard/capfile/AID.java b/capfile/src/main/java/pro/javacard/capfile/AID.java
@@ -22,8 +22,6 @@
 
 package pro.javacard.capfile;
 
-import pro.javacard.HexUtils;
-
 import java.util.Arrays;
 
 public final class AID {

diff --git a/capfile/src/main/java/pro/javacard/capfile/CAPFile.java b/capfile/src/main/java/pro/javacard/capfile/CAPFile.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
-import pro.javacard.HexUtils;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

diff --git a/.../src/main/java/pro/javacard/HexUtils.java → ...n/java/pro/javacard/capfile/HexUtils.java b/.../src/main/java/pro/javacard/HexUtils.java → ...n/java/pro/javacard/capfile/HexUtils.java
@@ -19,9 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package pro.javacard;
+package pro.javacard.capfile;
 
-public class HexUtils {
+class HexUtils {
     // This code has been taken from Apache commons-codec 1.7 (License: Apache 2.0)
     private static final char[] UPPER_HEX = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 

diff --git a/capfile/src/test/java/pro/javacard/capfile/TestWellKnownAID.java b/capfile/src/test/java/pro/javacard/capfile/TestWellKnownAID.java
@@ -11,7 +11,6 @@ public class TestWellKnownAID {
     @Test
     public void testInternalList() throws Exception {
         try (InputStream in = WellKnownAID.class.getResourceAsStream("aid_list.properties")) {
-            System.out.println(in);
             WellKnownAID.load(in);
             Assert.assertEquals(WellKnownAID.getName(AID.fromString("D276000085494A434F5058")), Optional.of("com.nxp.id.jcopx"));
         }

diff --git a/capfile/src/test/java/pro/javacard/sdk/TestSDKs.java b/capfile/src/test/java/pro/javacard/sdk/TestSDKs.java
@@ -18,7 +18,7 @@ static boolean interactive() {
     public void testDetection() throws Exception {
         if (!interactive())
             throw new SkipException("Not interactive");
-        Stream<Path> dirs = Files.list(Paths.get("/Users/martin/projects/oracle_javacard_sdks"));
+        Stream<Path> dirs = Files.list(Paths.get("/Users/martin/Documents/GitHub/oracle_javacard_sdks"));
         dirs.forEach(dir -> {
             System.out.println("Folder: " + dir + ": " + JavaCardSDK.detectSDK(dir).map(sdk -> sdk.getRelease()).orElse("not SDK"));
         });

diff --git a/capfile/src/test/java/pro/javacard/sdk/TestVerifier.java b/capfile/src/test/java/pro/javacard/sdk/TestVerifier.java