refactor: change signature design

Author: andrei-cristea

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

@@ -18,10 +18,10 @@
 /**
  * Common data to manage the security operations of a Calypso transaction.
  *
- * @param <T> The type of the lowest level child object.
+ * @param <S> The type of the lowest level child object.
  * @since 1.2.0
  */
-public interface CommonSecuritySetting<T extends CommonSecuritySetting<T>> {
+public interface CommonSecuritySetting<S extends CommonSecuritySetting<S>> {
 
   /**
    * Defines the control SAM and the reader through which it is accessible to be used to handle the
@@ -34,7 +34,7 @@ public interface CommonSecuritySetting<T extends CommonSecuritySetting<T>> {
    *     {@link CalypsoSam} is equal to {@link CalypsoSam.ProductType#UNKNOWN}.
    * @since 1.2.0
    */
-  T setControlSamResource(CardReader samReader, CalypsoSam calypsoSam);
+  S setControlSamResource(CardReader samReader, CalypsoSam calypsoSam);
 
   /**
    * Sets the service to be used to dynamically check if a SAM is revoked or not.
@@ -44,5 +44,5 @@ public interface CommonSecuritySetting<T extends CommonSecuritySetting<T>> {
    * @throws IllegalArgumentException If the provided service is null.
    * @since 1.2.0
    */
-  T setSamRevocationService(SamRevocationServiceSpi service);
+  S setSamRevocationService(SamRevocationServiceSpi service);
 }

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

@@ -17,20 +17,20 @@
  * Common service providing the high-level API to manage transactions with a Calypso card or SAM.
  *
  * @param <T> The type of the lowest level child object.
- * @param <E> The type of the lowest level child object of the associated {@link
+ * @param <S> The type of the lowest level child object of the associated {@link
  *     CommonSecuritySetting}.
  * @since 1.2.0
  */
 public interface CommonTransactionManager<
-    T extends CommonTransactionManager<T, E>, E extends CommonSecuritySetting<E>> {
+    T extends CommonTransactionManager<T, S>, S extends CommonSecuritySetting<S>> {
 
   /**
    * Returns the settings defining the security parameters of the transaction.
    *
    * @return Null if the transaction does not use security settings.
    * @since 1.2.0
    */
-  E getSecuritySetting();
+  S getSecuritySetting();
 
   /**
    * Returns the audit data of the transaction containing all APDU exchanges with the card and the

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

@@ -50,7 +50,7 @@ public interface SignatureComputationData {
    * <p>By default, the key diversification is performed with the full serial number of the target
    * card or SAM depending on the transaction context (Card or SAM transaction).
    *
-   * @param diversifier The diversifier to be used (8 bytes long).
+   * @param diversifier The diversifier to be used (from 1 to 8 bytes long).
    * @return The current instance.
    * @since 1.2.0
    */

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

@@ -40,7 +40,7 @@ public interface SignatureVerificationData {
    * <p>By default, the key diversification is performed with the full serial number of the target
    * card or SAM depending on the transaction context (Card or SAM transaction).
    *
-   * @param diversifier The diversifier to be used (8 bytes long).
+   * @param diversifier The diversifier to be used (from 1 to 8 bytes long).
    * @return The current instance.
    * @since 1.2.0
    */

src/main/uml/api_class_diagram.puml

@@ -266,8 +266,8 @@ package "org.calypsonet.terminal.calypso" as api {
     }
     package transaction {
         ' Common to Card and SAM
-        +interface CommonTransactionManager<T extends CommonTransactionManager<T, E>,\nE extends CommonSecuritySetting<E>> {
-            +E getSecuritySetting ()
+        +interface CommonTransactionManager<T extends CommonTransactionManager<T, S>,\nS extends CommonSecuritySetting<S>> {
+            +S getSecuritySetting ()
             +List<byte[]> getTransactionAuditData ()
 
             +T prepareComputeSignature (SignatureComputationData data)
@@ -293,9 +293,9 @@ package "org.calypsonet.terminal.calypso" as api {
 
             +boolean isSignatureValid ()
         }
-        +interface CommonSecuritySetting<T extends CommonSecuritySetting<T>> {
-            +T setControlSamResource (<back:yellow>CardReader</back> samReader, CalypsoSam calypsoSam)
-            +T setSamRevocationServiceSpi (SamRevocationServiceSpi service)
+        +interface CommonSecuritySetting<S extends CommonSecuritySetting<S>> {
+            +S setControlSamResource (<back:yellow>CardReader</back> samReader, CalypsoSam calypsoSam)
+            +S setSamRevocationServiceSpi (SamRevocationServiceSpi service)
         }
         ' Card
         +interface CardTransactionManager extends CommonTransactionManager {