Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit 6191ea4

Browse files
Release 1.4.0
1 parent 1420062 commit 6191ea4

File tree

6 files changed

+101
-256
lines changed

6 files changed

+101
-256
lines changed

CHANGELOG.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ 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+
## [1.4.0] - 2022-10-26
810
### Added
9-
- `prepareWriteEventCeiling`, `prepareWriteEventCeilings` methods to `SamTransactionManager` API (issue [#25])
10-
- `prepareReadEventCeiling`, `prepareReadEventCeilings` methods to `SamTransactionManager` and `getEventCeiling`, `getEventCeilings` methods to `CalypsoSam` API (issue [#26])
11-
- `prepareReadEventCounter`, `prepareReadEventCounters` methods to `SamTransactionManager` and `getEventCounter`, `getEventCounters` methods to `CalypsoSam` API (issue [#27])
1211
- `SelectFileException` to manage the status of the "Select File" card command.
1312
### Upgraded
1413
- "Calypsonet Terminal Reader API" to version `1.1.0`
@@ -100,7 +99,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
10099
## [1.0.0] - 2021-10-06
101100
This is the initial release.
102101

103-
[unreleased]: https://github.com/calypsonet/calypsonet-terminal-calypso-java-api/compare/1.3.0...HEAD
102+
[unreleased]: https://github.com/calypsonet/calypsonet-terminal-calypso-java-api/compare/1.4.0...HEAD
103+
[1.4.0]: https://github.com/calypsonet/calypsonet-terminal-calypso-java-api/compare/1.3.0...1.4.0
104104
[1.3.0]: https://github.com/calypsonet/calypsonet-terminal-calypso-java-api/compare/1.2.0...1.3.0
105105
[1.2.0]: https://github.com/calypsonet/calypsonet-terminal-calypso-java-api/compare/1.1.0...1.2.0
106106
[1.1.0]: https://github.com/calypsonet/calypsonet-terminal-calypso-java-api/compare/1.0.5...1.1.0

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repositories {
2727
maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots")
2828
}
2929
dependencies {
30-
implementation("org.calypsonet.terminal:calypsonet-terminal-reader-java-api:1.1.0-SNAPSHOT") { isChanging = true }
30+
implementation("org.calypsonet.terminal:calypsonet-terminal-reader-java-api:1.1.0")
3131
testImplementation("junit:junit:4.13.2")
3232
testImplementation("org.assertj:assertj-core:3.15.0")
3333
}

src/main/java/org/calypsonet/terminal/calypso/sam/CalypsoSam.java

-37
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
************************************************************************************** */
1212
package org.calypsonet.terminal.calypso.sam;
1313

14-
import java.util.SortedMap;
1514
import org.calypsonet.terminal.reader.selection.spi.SmartCard;
1615

1716
/**
@@ -142,40 +141,4 @@ enum ProductType {
142141
*/
143142
UNKNOWN
144143
}
145-
146-
/**
147-
* Returns the value of an event counter.
148-
*
149-
* @param eventCounterNumber The number of the event counter (in range [0..26]).
150-
* @return null if the event counter value is not set.
151-
* @since 1.4.0
152-
*/
153-
Integer getEventCounter(int eventCounterNumber);
154-
155-
/**
156-
* Returns the value of known event counters in a sorted map where {@code key} is the counter
157-
* number and {@code value} is the counter value.
158-
*
159-
* @return a not null map.
160-
* @since 1.4.0
161-
*/
162-
SortedMap<Integer, Integer> getEventCounters();
163-
164-
/**
165-
* Returns the value of an event ceiling.
166-
*
167-
* @param eventCeilingNumber The number of the event ceiling (in range [0..26]).
168-
* @return null if the event ceiling value is not set.
169-
* @since 1.4.0
170-
*/
171-
Integer getEventCeiling(int eventCeilingNumber);
172-
173-
/**
174-
* Returns the value of known event ceilings in a sorted map where {@code key} is the ceiling
175-
* number and {@code value} is the ceiling value.
176-
*
177-
* @return a not null map.
178-
* @since 1.4.0
179-
*/
180-
SortedMap<Integer, Integer> getEventCeilings();
181144
}

src/main/java/org/calypsonet/terminal/calypso/transaction/SamTransactionManager.java

-86
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
************************************************************************************** */
1212
package org.calypsonet.terminal.calypso.transaction;
1313

14-
import java.util.List;
1514
import org.calypsonet.terminal.calypso.sam.CalypsoSam;
1615
import org.calypsonet.terminal.reader.CardReader;
1716

@@ -56,89 +55,4 @@ public interface SamTransactionManager
5655
* @since 1.2.0
5756
*/
5857
CalypsoSam getCalypsoSam();
59-
60-
/**
61-
* Schedules the execution of a <b>Read Event Counter</b> command to read a single event counter.
62-
*
63-
* <p>Once this command is processed, the result is available in {@link CalypsoSam}.
64-
*
65-
* @param eventCounterNumber The number of the event counter to read (in range [0..26]).
66-
* @return The current instance.
67-
* @throws IllegalArgumentException If the provided argument is out of range.
68-
* @since 1.4.0
69-
*/
70-
SamTransactionManager prepareReadEventCounter(int eventCounterNumber);
71-
72-
/**
73-
* Schedules the execution of a <b>Read Event Counter</b> command to read one or more consecutive
74-
* event counters.
75-
*
76-
* <p>Once this command is processed, the result is available in {@link CalypsoSam}.
77-
*
78-
* @param fromEventCounterNumber The number of the first event counter to read (in range [0..26]).
79-
* @param toEventCounterNumber The number of the last event counter to read (in range [0..26]).
80-
* @return The current instance.
81-
* @throws IllegalArgumentException If one of the provided argument is out of range.
82-
* @since 1.4.0
83-
*/
84-
SamTransactionManager prepareReadEventCounters(
85-
int fromEventCounterNumber, int toEventCounterNumber);
86-
87-
/**
88-
* Schedules the execution of a <b>Read Ceilings</b> command to read a single event ceiling.
89-
*
90-
* <p>Once this command is processed, the result is available in {@link CalypsoSam}.
91-
*
92-
* @param eventCeilingNumber The number of the event ceiling to read (in range [0..26]).
93-
* @return The current instance.
94-
* @throws IllegalArgumentException If the provided argument is out of range.
95-
* @since 1.4.0
96-
*/
97-
SamTransactionManager prepareReadEventCeiling(int eventCeilingNumber);
98-
99-
/**
100-
* Schedules the execution of a <b>Read Ceilings</b> command to read one or more consecutive event
101-
* ceilings.
102-
*
103-
* <p>Once this command is processed, the result is available in {@link CalypsoSam}.
104-
*
105-
* @param fromEventCeilingNumber The number of the first event ceiling to read (in range [0..26]).
106-
* @param toEventCeilingNumber The number of the last event ceiling to read (in range [0..26]).
107-
* @return The current instance.
108-
* @throws IllegalArgumentException If one of the provided argument is out of range.
109-
* @since 1.4.0
110-
*/
111-
SamTransactionManager prepareReadEventCeilings(
112-
int fromEventCeilingNumber, int toEventCeilingNumber);
113-
114-
/**
115-
* Schedules the execution of a <b>Write Ceilings</b> command to write a single event ceiling.
116-
*
117-
* <p>Once this command is processed, the ceiling value available in {@link CalypsoSam} is
118-
* updated.
119-
*
120-
* @param eventCeilingNumber The number of the event ceiling to write.
121-
* @param newValue The desired value for the event ceiling (defined as a positive int {@code <=}
122-
* 16777215 [FFFFFFh]).
123-
* @return The current instance.
124-
* @throws IllegalArgumentException If the provided argument is out of range.
125-
* @since 1.4.0
126-
*/
127-
SamTransactionManager prepareWriteEventCeiling(int eventCeilingNumber, int newValue);
128-
129-
/**
130-
* Schedules the execution of a <b>Write Ceilings</b> command to write multiple event ceilings.
131-
*
132-
* <p>Once this command is processed, the ceiling values available in {@link CalypsoSam} are
133-
* updated.
134-
*
135-
* @param fromEventCeilingNumber The number of the first event ceiling to write.
136-
* @param newValues A list of event ceilings values to be written from the indicated position
137-
* (each event ceiling value is defined as a positive int {@code <=} 16777215 [FFFFFFh]).
138-
* @return The current instance.
139-
* @throws IllegalArgumentException If one of the provided argument is out of range.
140-
* @since 1.4.0
141-
*/
142-
SamTransactionManager prepareWriteEventCeilings(
143-
int fromEventCeilingNumber, List<Integer> newValues);
14458
}

src/main/uml/api_class_diagram.puml

+4-14
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,6 @@ package "org.calypsonet.terminal.calypso" as api {
261261
+byte getSoftwareIssuer ()
262262
+byte getSoftwareVersion ()
263263
+byte getSoftwareRevision ()
264-
265-
+Integer getEventCounter (int eventCounterNumber)
266-
+SortedMap<Integer, Integer> getEventCounters ()
267-
+Integer getEventCeiling (int eventCeilingNumber)
268-
+SortedMap<Integer, Integer> getEventCeilings ()
269264
}
270265
+enum "ProductType" as SamProductType {
271266
SAM_C1
@@ -421,13 +416,6 @@ package "org.calypsonet.terminal.calypso" as api {
421416
+interface SamTransactionManager extends CommonTransactionManager {
422417
+<back:yellow>CardReader</back> getSamReader ()
423418
+CalypsoSam getCalypsoSam ()
424-
425-
+SamTransactionManager prepareReadEventCounter (int eventCounterNumber)
426-
+SamTransactionManager prepareReadEventCounters (int fromEventCounterNumber, int toEventCounterNumber)
427-
+SamTransactionManager prepareReadEventCeiling (int eventCeilingNumber)
428-
+SamTransactionManager prepareReadEventCeilings (int fromEventCeilingNumber, int toEventCeilingNumber)
429-
+SamTransactionManager prepareWriteEventCeiling (int eventCeilingNumber, int newValue)
430-
+SamTransactionManager prepareWriteEventCeilings (int fromEventCeilingNumber, List<Integer> newValues)
431419
}
432420
+interface SamSecuritySetting extends CommonSecuritySetting {
433421
}
@@ -456,7 +444,8 @@ CommonTransactionManager .up.> CommonSignatureComputationData #C_USE : use >
456444
CommonTransactionManager .up.> CommonSignatureVerificationData #C_USE : use >
457445
CommonTransactionManager ..> CommonSecuritySetting #C_LINK : provide >
458446

459-
CommonSecuritySetting ..> SamRevocationServiceSpi #C_USE : use >
447+
CommonSecuritySetting .left.> SamRevocationServiceSpi #C_USE : use >
448+
CommonSecuritySetting .left.> CalypsoSam #C_USE : use >
460449

461450
CalypsoCardSelection +-- FileOccurrence
462451
CalypsoCardSelection ..> FileOccurrence #C_LINK : provide >
@@ -473,7 +462,6 @@ CardTransactionManager .right.> CalypsoCard #C_LINK : use and provide up to date
473462
CardTransactionManager ..> CardSecuritySetting #C_LINK : provide >
474463

475464
CardSecuritySetting ..> WriteAccessLevel #C_USE : use >
476-
CardSecuritySetting ..> CalypsoSam #C_LINK : provide >
477465

478466
CalypsoSamSelection ..> SamProductType #C_USE : use >
479467

@@ -504,6 +492,8 @@ FileHeader .right.> FileType #C_LINK : provide >
504492
' == LAYOUT ==
505493

506494
'CommonSignatureComputationData -[hidden]- CommonSignatureVerificationData
495+
'CardSecuritySetting -[hidden]- CalypsoSam
496+
'SamSecuritySetting -[hidden]- CalypsoSam
507497

508498
' == STYLE ==
509499

0 commit comments

Comments
 (0)