feat: migrate to Keypop Generic Card API (#21)

Author: VincentDucrot

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Migrated to `keypop-genericcard-jvm-api` 1.0.0
+### Removed
+- Removed deprecated enum `ChannelControl`
+- Removed deprecated class `TransactionException`
+
 ## [3.2.1] - 2026-02-20
 ### Changed
 - Normalized logging and error messages using Keyple coding standards.

build.gradle.kts

@@ -16,6 +16,7 @@ plugins {
 dependencies {
   implementation("org.eclipse.keypop:keypop-reader-java-api:2.1.0")
   implementation("org.eclipse.keypop:keypop-card-java-api:2.0.1")
+  implementation("org.eclipse.keypop:keypop-genericcard-jvm-api:1.0.0")
   implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2")
   implementation("org.eclipse.keyple:keyple-service-resource-java-lib:3.1.1")
   implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.1")

src/main/java/org/eclipse/keyple/card/generic/CardTransactionManager.java

@@ -18,6 +18,7 @@
 import org.eclipse.keyple.core.util.HexUtil;
 import org.eclipse.keypop.card.*;
 import org.eclipse.keypop.card.spi.ApduRequestSpi;
+import org.eclipse.keypop.genericcard.CardTransactionManager;
 import org.eclipse.keypop.reader.CardCommunicationException;
 import org.eclipse.keypop.reader.CardReader;
 import org.eclipse.keypop.reader.InvalidCardResponseException;
@@ -94,60 +95,6 @@ public CardTransactionManager prepareApdu(
     return this;
   }
 
-  /**
-   * {@inheritDoc}
-   *
-   * @since 2.0.0
-   */
-  @Override
-  @Deprecated
-  public List<byte[]> processApdusToByteArrays(ChannelControl channelControl)
-      throws TransactionException {
-    CardResponseApi cardResponse;
-    if (apduRequests.isEmpty()) {
-      return new ArrayList<>(0);
-    }
-    try {
-      cardResponse =
-          ((ProxyReaderApi) reader)
-              .transmitCardRequest(
-                  new CardRequestAdapter(apduRequests, false),
-                  channelControl == ChannelControl.CLOSE_AFTER
-                      ? org.eclipse.keypop.card.ChannelControl.CLOSE_AFTER
-                      : org.eclipse.keypop.card.ChannelControl.KEEP_OPEN);
-    } catch (ReaderBrokenCommunicationException e) {
-      throw new TransactionException("Reader communication error", e);
-    } catch (CardBrokenCommunicationException e) {
-      throw new TransactionException("Card communication error", e);
-    } catch (UnexpectedStatusWordException e) {
-      throw new TransactionException("APDU error", e);
-    } finally {
-      apduRequests.clear();
-    }
-    List<byte[]> apduResponsesBytes = new ArrayList<>();
-    for (ApduResponseApi apduResponse : cardResponse.getApduResponses()) {
-      apduResponsesBytes.add(apduResponse.getApdu());
-    }
-    return apduResponsesBytes;
-  }
-
-  /**
-   * {@inheritDoc}
-   *
-   * @since 2.0.0
-   */
-  @Override
-  @Deprecated
-  public List<String> processApdusToHexStrings(ChannelControl channelControl)
-      throws TransactionException {
-    List<byte[]> apduResponsesBytes = processApdusToByteArrays(channelControl);
-    List<String> apduResponsesHex = new ArrayList<>();
-    for (byte[] bytes : apduResponsesBytes) {
-      apduResponsesHex.add(HexUtil.toHex(bytes));
-    }
-    return apduResponsesHex;
-  }
-
   /**
    * {@inheritDoc}
    *

src/main/java/org/eclipse/keyple/card/generic/CardTransactionManagerAdapter.java

@@ -0,0 +1,46 @@
+/* **************************************************************************************
+ * Copyright (c) 2026 Calypso Networks Association https://calypsonet.org/
+ *
+ * See the NOTICE file(s) distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ************************************************************************************** */
+package org.eclipse.keyple.card.generic;
+
+import org.eclipse.keypop.genericcard.CardTransactionManager;
+import org.eclipse.keypop.genericcard.GenericCardApiFactory;
+import org.eclipse.keypop.genericcard.GenericCardSelectionExtension;
+import org.eclipse.keypop.reader.CardReader;
+import org.eclipse.keypop.reader.selection.spi.SmartCard;
+
+/**
+ * Adapter of {@link GenericCardApiFactory}.
+ *
+ * @since 4.0.0
+ */
+class GenericCardApiFactoryAdapter implements GenericCardApiFactory {
+
+  /**
+   * {@inheritDoc}
+   *
+   * @since 4.0.0
+   */
+  @Override
+  public GenericCardSelectionExtension createGenericCardSelectionExtension() {
+    return new GenericCardSelectionExtensionAdapter();
+  }
+
+  /**
+   * {@inheritDoc}
+   *
+   * @since 4.0.0
+   */
+  @Override
+  public CardTransactionManager createCardTransaction(CardReader cardReader, SmartCard card) {
+    return new CardTransactionManagerAdapter(cardReader, card);
+  }
+}

src/main/java/org/eclipse/keyple/card/generic/ChannelControl.java

@@ -13,6 +13,7 @@
 
 import org.eclipse.keyple.core.service.resource.spi.CardResourceProfileExtension;
 import org.eclipse.keyple.core.util.Assert;
+import org.eclipse.keypop.genericcard.GenericCardSelectionExtension;
 import org.eclipse.keypop.reader.CardReader;
 import org.eclipse.keypop.reader.ReaderApiFactory;
 import org.eclipse.keypop.reader.selection.CardSelectionManager;
@@ -24,8 +25,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Implementation of {@link CardResourceProfileExtension} that provides the capability to filter
- * cards of any type.
+ * Implementation of {@link CardResourceProfileExtension} that provides the ability to filter cards
+ * of any type.
  *
  * @since 2.0.0
  */

src/main/java/org/eclipse/keyple/card/generic/GenericCardApiFactoryAdapter.java

@@ -15,6 +15,7 @@
 import java.util.Set;
 import org.eclipse.keypop.card.CardSelectionResponseApi;
 import org.eclipse.keypop.card.spi.*;
+import org.eclipse.keypop.genericcard.GenericCardSelectionExtension;
 
 /**
  * Implementation of {@link GenericCardSelectionExtension}.