From fa18d669f7e293a7fe83eb1e934c421b72d2efa7 Mon Sep 17 00:00:00 2001 From: Andrei Cristea Date: Thu, 13 Nov 2025 15:18:46 +0100 Subject: [PATCH 1/4] wip --- CHANGELOG.md | 2 + build.gradle.kts | 2 +- gradle.properties | 2 +- .../service/CardSelectionManagerAdapter.java | 39 +++++++++++++++++-- 4 files changed, 40 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dc26ab..c14d747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Upgraded +- Keypop Reader API `2.0.1` -> `2.1.0` (added `ChannelControl` enum) ## [3.3.7] - 2025-11-13 ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index 8a7f76e..e87e8e1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ plugins { /////////////////////////////////////////////////////////////////////////////// dependencies { - implementation("org.eclipse.keypop:keypop-reader-java-api:2.0.1") + implementation("org.eclipse.keypop:keypop-reader-java-api:2.1.0-SNAPSHOT") {isChanging = true} implementation("org.eclipse.keypop:keypop-card-java-api:2.0.1") implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") implementation("org.eclipse.keyple:keyple-plugin-java-api:2.3.1") diff --git a/gradle.properties b/gradle.properties index 21a449a..4878ab8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.eclipse.keyple title = Keyple Service Java Lib description = Keyple core components -version = 3.3.7-SNAPSHOT +version = 3.4.0-SNAPSHOT # Java Configuration javaSourceLevel = 1.8 diff --git a/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java b/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java index 55a5f4c..b81811c 100644 --- a/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java @@ -157,7 +157,18 @@ public String exportCardSelectionScenario() { return jsonObject.toString(); } - /** + /** + * {@inheritDoc} + * + * @since 3.4.0 + */ + @Override + public String exportCardSelectionScenario(org.eclipse.keypop.reader.ChannelControl channelControl) { + this.channelControl = ChannelControl.valueOf(channelControl.name()); + return exportCardSelectionScenario(); + } + + /** * {@inheritDoc} * * @since 2.1.1 @@ -258,7 +269,18 @@ public CardSelectionResult processCardSelectionScenario(CardReader reader) { return processCardSelectionResponses(cardSelectionResponses); } - /** + /** + * {@inheritDoc} + * + * @since 3.4.0 + */ + @Override + public CardSelectionResult processCardSelectionScenario(CardReader reader, org.eclipse.keypop.reader.ChannelControl channelControl) { + this.channelControl = ChannelControl.valueOf(channelControl.name()); + return processCardSelectionScenario(reader); + } + + /** * {@inheritDoc} * * @since 2.0.0 @@ -286,7 +308,18 @@ public void scheduleCardSelectionScenario( } } - /** + /** + * {@inheritDoc} + * + * @since 3.4.0 + */ + @Override + public void scheduleCardSelectionScenario(ObservableCardReader observableCardReader, ObservableCardReader.NotificationMode notificationMode, org.eclipse.keypop.reader.ChannelControl channelControl) { + this.channelControl = ChannelControl.valueOf(channelControl.name()); + scheduleCardSelectionScenario(observableCardReader, notificationMode); + } + + /** * {@inheritDoc} * * @since 2.0.0 From c70c1a5915748354df15121641d2d45373305034 Mon Sep 17 00:00:00 2001 From: Andrei Cristea Date: Thu, 20 Nov 2025 10:29:26 +0100 Subject: [PATCH 2/4] wip --- CHANGELOG.md | 2 +- .../service/CardSelectionManagerAdapter.java | 39 ++----------------- 2 files changed, 4 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c14d747..5977e01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Upgraded -- Keypop Reader API `2.0.1` -> `2.1.0` (added `ChannelControl` enum) +- Keypop Reader API `2.0.1` -> `2.1.0` (source code not impacted) ## [3.3.7] - 2025-11-13 ### Fixed diff --git a/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java b/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java index b81811c..55a5f4c 100644 --- a/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java +++ b/src/main/java/org/eclipse/keyple/core/service/CardSelectionManagerAdapter.java @@ -157,18 +157,7 @@ public String exportCardSelectionScenario() { return jsonObject.toString(); } - /** - * {@inheritDoc} - * - * @since 3.4.0 - */ - @Override - public String exportCardSelectionScenario(org.eclipse.keypop.reader.ChannelControl channelControl) { - this.channelControl = ChannelControl.valueOf(channelControl.name()); - return exportCardSelectionScenario(); - } - - /** + /** * {@inheritDoc} * * @since 2.1.1 @@ -269,18 +258,7 @@ public CardSelectionResult processCardSelectionScenario(CardReader reader) { return processCardSelectionResponses(cardSelectionResponses); } - /** - * {@inheritDoc} - * - * @since 3.4.0 - */ - @Override - public CardSelectionResult processCardSelectionScenario(CardReader reader, org.eclipse.keypop.reader.ChannelControl channelControl) { - this.channelControl = ChannelControl.valueOf(channelControl.name()); - return processCardSelectionScenario(reader); - } - - /** + /** * {@inheritDoc} * * @since 2.0.0 @@ -308,18 +286,7 @@ public void scheduleCardSelectionScenario( } } - /** - * {@inheritDoc} - * - * @since 3.4.0 - */ - @Override - public void scheduleCardSelectionScenario(ObservableCardReader observableCardReader, ObservableCardReader.NotificationMode notificationMode, org.eclipse.keypop.reader.ChannelControl channelControl) { - this.channelControl = ChannelControl.valueOf(channelControl.name()); - scheduleCardSelectionScenario(observableCardReader, notificationMode); - } - - /** + /** * {@inheritDoc} * * @since 2.0.0 From b330a67f2c90ec07a1b912ee1aa2fe21c13ea1ea Mon Sep 17 00:00:00 2001 From: Andrei Cristea Date: Thu, 20 Nov 2025 10:31:09 +0100 Subject: [PATCH 3/4] wip --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e87e8e1..dd27c5a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ plugins { /////////////////////////////////////////////////////////////////////////////// dependencies { - implementation("org.eclipse.keypop:keypop-reader-java-api:2.1.0-SNAPSHOT") {isChanging = true} + implementation("org.eclipse.keypop:keypop-reader-java-api:2.1.0-SNAPSHOT") { isChanging = true } implementation("org.eclipse.keypop:keypop-card-java-api:2.0.1") implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2") implementation("org.eclipse.keyple:keyple-plugin-java-api:2.3.1") From 456590aa8424dcca16b753a7980f2a006c40632b Mon Sep 17 00:00:00 2001 From: Andrei Cristea Date: Fri, 21 Nov 2025 11:13:56 +0100 Subject: [PATCH 4/4] wip --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index dd27c5a..2237a42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,7 @@ plugins { /////////////////////////////////////////////////////////////////////////////// dependencies { - implementation("org.eclipse.keypop:keypop-reader-java-api:2.1.0-SNAPSHOT") { isChanging = true } + 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.keyple:keyple-common-java-api:2.0.2") implementation("org.eclipse.keyple:keyple-plugin-java-api:2.3.1")