Skip to content

Commit e09e47b

Browse files
chore: prepare release 2.5.2
1 parent a872777 commit e09e47b

File tree

7 files changed

+52
-41
lines changed

7 files changed

+52
-41
lines changed

CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
9+
## [2.5.2] - 2026-02-20
810
### Changed
11+
- Normalized logging and error messages using Keyple coding standards.
912
- Migrated the CI pipeline from Jenkins to GitHub Actions.
13+
### Upgraded
14+
- `keyple-common-java-api` from `2.0.1` to `2.0.2` (source code not impacted)
15+
- `keyple-distributed-remote-java-api` from `3.1.0` to `3.1.1` (source code not impacted)
16+
- `keyple-distributed-network-java-lib` from `2.5.1` to `2.5.2` (source code not impacted)
17+
- `keyple-util-java-lib` from `2.4.0` to `2.4.1` (source code not impacted)
18+
- `slf4j-api` from `1.7.32` to `1.7.36` (`compileOnly`)
1019

1120
## [2.5.1] - 2024-09-19
1221
### Fixed
@@ -92,7 +101,8 @@ It follows the extraction of Keyple 1.0 components contained in the `eclipse-key
92101
repositories.
93102
It also brings many major API changes.
94103

95-
[unreleased]: https://github.com/eclipse-keyple/keyple-distributed-remote-java-lib/compare/2.5.1...HEAD
104+
[unreleased]: https://github.com/eclipse-keyple/keyple-distributed-remote-java-lib/compare/2.5.2...HEAD
105+
[2.5.2]: https://github.com/eclipse-keyple/keyple-distributed-remote-java-lib/compare/2.5.1...2.5.2
96106
[2.5.1]: https://github.com/eclipse-keyple/keyple-distributed-remote-java-lib/compare/2.5.0...2.5.1
97107
[2.5.0]: https://github.com/eclipse-keyple/keyple-distributed-remote-java-lib/compare/2.4.0...2.5.0
98108
[2.4.0]: https://github.com/eclipse-keyple/keyple-distributed-remote-java-lib/compare/2.3.1...2.4.0

build.gradle.kts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ plugins {
1414
///////////////////////////////////////////////////////////////////////////////
1515

1616
dependencies {
17-
implementation("org.eclipse.keyple:keyple-common-java-api:2.0.1")
18-
implementation("org.eclipse.keyple:keyple-distributed-remote-java-api:3.1.0")
19-
implementation("org.eclipse.keyple:keyple-distributed-network-java-lib:2.5.1")
20-
implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.0")
17+
implementation("org.eclipse.keyple:keyple-common-java-api:2.0.2")
18+
implementation("org.eclipse.keyple:keyple-distributed-remote-java-api:3.1.1")
19+
implementation("org.eclipse.keyple:keyple-distributed-network-java-lib:2.5.2")
20+
implementation("org.eclipse.keyple:keyple-util-java-lib:2.4.1")
2121
implementation("com.google.code.gson:gson:2.10.1")
22-
implementation("org.slf4j:slf4j-api:1.7.32")
23-
testImplementation("org.slf4j:slf4j-simple:1.7.32")
22+
compileOnly("org.slf4j:slf4j-api:1.7.36")
23+
24+
testImplementation("org.slf4j:slf4j-simple:1.7.36")
2425
testImplementation(platform("org.junit:junit-bom:5.10.2"))
2526
testImplementation("org.junit.jupiter:junit-jupiter")
2627
testImplementation("org.junit.vintage:junit-vintage-engine")

src/main/java/org/eclipse/keyple/distributed/AbstractRemotePluginClientAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ public final AsyncNodeClient getAsyncNode() {
5252
return (AsyncNodeClient) getNode();
5353
}
5454
throw new IllegalStateException(
55-
String.format(
56-
"Remote plugin [%s] is not configured with an asynchronous network protocol",
57-
getName()));
55+
"Remote plugin '"
56+
+ getName()
57+
+ "' is not configured with an asynchronous network protocol");
5858
}
5959

6060
/**

src/main/java/org/eclipse/keyple/distributed/ObservableRemotePluginServerAdapter.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ public SyncNodeServer getSyncNode() {
6969
return (SyncNodeServer) getNode();
7070
}
7171
throw new IllegalStateException(
72-
String.format(
73-
"Remote plugin [%s] is not configured with a synchronous network protocol", getName()));
72+
"Remote plugin '" + getName() + "' is not configured with a synchronous network protocol");
7473
}
7574

7675
/**
@@ -84,9 +83,9 @@ public AsyncNodeServer getAsyncNode() {
8483
return (AsyncNodeServer) getNode();
8584
}
8685
throw new IllegalStateException(
87-
String.format(
88-
"Remote plugin [%s] is not configured with an asynchronous network protocol",
89-
getName()));
86+
"Remote plugin '"
87+
+ getName()
88+
+ "' is not configured with an asynchronous network protocol");
9089
}
9190

9291
/**
@@ -103,8 +102,7 @@ public void endRemoteService(String remoteReaderName, Object outputData) {
103102
RemoteReaderServerAdapter reader = readers.remove(remoteReaderName);
104103

105104
if (reader == null) {
106-
throw new IllegalArgumentException(
107-
String.format("No reader exists with name [%s]", remoteReaderName));
105+
throw new IllegalArgumentException("No reader exists with name '" + remoteReaderName + "'");
108106
}
109107

110108
// Unregister the remote reader.
@@ -235,7 +233,8 @@ public void onStopObservation() {
235233
void onMessage(MessageDto message) {
236234

237235
if (!Action.EXECUTE_REMOTE_SERVICE.name().equals(message.getAction())) {
238-
throw new IllegalStateException(String.format("Message not supported : %s", message));
236+
throw new IllegalStateException(
237+
"Message action '" + message.getAction() + "' not supported: " + message);
239238
}
240239

241240
// Creates a remote reader based on the incoming message.
@@ -303,14 +302,6 @@ void onMessage(MessageDto message) {
303302
// Other fields
304303
String remoteReaderName = UUID.randomUUID().toString();
305304

306-
logger.info(
307-
"Plugin [{}] create new remote reader (remoteReaderName: {}, serviceId: {}, sessionId: {}, clientNodeId: {})",
308-
getName(),
309-
remoteReaderName,
310-
serviceId,
311-
message.getSessionId(),
312-
message.getClientNodeId());
313-
314305
RemoteReaderServerAdapter remoteReader =
315306
new RemoteReaderServerAdapter(
316307
clientDistributedApiLevel,
@@ -331,5 +322,13 @@ void onMessage(MessageDto message) {
331322

332323
// Register the remote reader and notify observers.
333324
observableRemotePluginApi.addRemoteReader(remoteReader, clientCoreApiLevel);
325+
326+
logger.info(
327+
"[plugin={}] New 'RemoteReaderServer' created [remoteReaderName={}, serviceId={}, sessionId={}, clientNodeId={}]",
328+
getName(),
329+
remoteReaderName,
330+
serviceId,
331+
message.getSessionId(),
332+
message.getClientNodeId());
334333
}
335334
}

src/main/java/org/eclipse/keyple/distributed/RemotePluginClientFactoryAdapter.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ public AbstractRemotePluginSpi getRemotePlugin() {
9696

9797
// Bind the node.
9898
if (syncEndpointClientSpi != null) {
99+
100+
remotePlugin.bindSyncNodeClient(
101+
syncEndpointClientSpi, syncPluginObservationStrategy, syncReaderObservationStrategy);
102+
99103
String pluginObservationStrategy =
100104
syncPluginObservationStrategy != null
101105
? syncPluginObservationStrategy.getType().name()
@@ -111,25 +115,23 @@ public AbstractRemotePluginSpi getRemotePlugin() {
111115
+ "_millis"
112116
: null;
113117
logger.info(
114-
"Create new 'RemotePluginClient' (name: {}, nodeType: SyncNodeClient, isPluginObservationEnabled: {}, syncPluginObservationStrategy: {}, isReaderObservationEnabled: {}, syncReaderObservationStrategy: {})",
118+
"New 'RemotePluginClient' created [name={}, nodeType=SyncNodeClient, isPluginObservationEnabled={}, syncPluginObservationStrategy={}, isReaderObservationEnabled={}, syncReaderObservationStrategy={}]",
115119
getRemotePluginName(),
116120
isPluginObservationEnabled,
117121
pluginObservationStrategy,
118122
isReaderObservationEnabled,
119123
readerObservationStrategy);
120124

121-
remotePlugin.bindSyncNodeClient(
122-
syncEndpointClientSpi, syncPluginObservationStrategy, syncReaderObservationStrategy);
123-
124125
} else {
126+
127+
remotePlugin.bindAsyncNodeClient(asyncEndpointClientSpi, asyncNodeClientTimeoutSeconds);
128+
125129
logger.info(
126-
"Create new 'RemotePluginClient' (name: {}, nodeType: AsyncNodeClient, timeoutSeconds: {}, isPluginObservationEnabled: {}, isReaderObservationEnabled: {})",
130+
"New 'RemotePluginClient' created [name={}, nodeType=AsyncNodeClient, timeoutSeconds={}, isPluginObservationEnabled={}, isReaderObservationEnabled={}]",
127131
getRemotePluginName(),
128132
asyncNodeClientTimeoutSeconds,
129133
isPluginObservationEnabled,
130134
isReaderObservationEnabled);
131-
132-
remotePlugin.bindAsyncNodeClient(asyncEndpointClientSpi, asyncNodeClientTimeoutSeconds);
133135
}
134136

135137
return remotePlugin;

src/main/java/org/eclipse/keyple/distributed/RemotePluginServerFactoryAdapter.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,16 @@ public AbstractRemotePluginSpi getRemotePlugin() {
6565
new ObservableRemotePluginServerAdapter(getRemotePluginName(), executorService);
6666

6767
// Bind the node.
68-
String nodeType = asyncEndpointServerSpi != null ? "AsyncNodeServer" : "SyncNodeServer";
69-
logger.info(
70-
"Create new 'RemotePluginServer' (name: {}, nodeType: {}, timeoutSeconds: {})",
71-
getRemotePluginName(),
72-
nodeType,
73-
timeoutSeconds);
74-
7568
if (asyncEndpointServerSpi == null) {
7669
remotePlugin.bindSyncNodeServer(timeoutSeconds);
7770
} else {
7871
remotePlugin.bindAsyncNodeServer(asyncEndpointServerSpi, timeoutSeconds);
7972
}
73+
logger.info(
74+
"New 'RemotePluginServer' created [name={}, nodeType={}, timeoutSeconds={}]",
75+
getRemotePluginName(),
76+
asyncEndpointServerSpi != null ? "AsyncNodeServer" : "SyncNodeServer",
77+
timeoutSeconds);
8078

8179
return remotePlugin;
8280
}

src/main/java/org/eclipse/keyple/distributed/RemoteReaderServerAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ public Object getInitialCardContent() {
9898
Class<?> classOfInitialCardContent = Class.forName(initialCardContentClassName);
9999
return JsonUtil.getParser().fromJson(initialCardContentJson, classOfInitialCardContent);
100100
} catch (ClassNotFoundException e) {
101-
logger.error("Class not found: {}", initialCardContentClassName, e);
101+
logger.error(
102+
"Class not found [initialCardContentClassName={}]", initialCardContentClassName, e);
102103
}
103104
}
104105
return null;

0 commit comments

Comments
 (0)