RM-3063: add deprecated tags to enc/dec key material methods

Author: OlesjaAarma

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocCreateCmd.java

@@ -105,9 +105,6 @@ public Void call() throws Exception {
                 Arrays.toString(inputFiles));
         }
 
-
-
-
         CDocBuilder cDocBuilder = new CDocBuilder()
             .withPayloadFiles(Arrays.asList(inputFiles));
 
@@ -116,7 +113,6 @@ public Void call() throws Exception {
             cDocBuilder.withServerProperties(p);
         }
 
-
         List<EncryptionKeyMaterial> symmetricKMs =
             SymmetricKeyUtil.getEncryptionKeyMaterialFromFormattedSecrets(recipient.secrets);
 

cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/keymaterial/DecryptionKeyMaterial.java

@@ -30,13 +30,13 @@ public interface DecryptionKeyMaterial {
     EncryptionKeyOrigin getKeyOrigin();
 
     /**
-     * Deprecated decryption key. Will be removed later.
      * Creates decryption key material with secret key.
+     * @deprecated decryption key
      * @param secretKey secret key
      * @param label key label
      * @return DecryptionKeyMaterial key material required for decryption
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     static DecryptionKeyMaterial fromSecretKey(SecretKey secretKey, String label) {
         return new SecretDecryptionKeyMaterial(secretKey, label);
     }

cdoc2-lib/src/main/java/ee/cyber/cdoc2/crypto/keymaterial/EncryptionKeyMaterial.java

@@ -41,11 +41,12 @@ public interface EncryptionKeyMaterial {
      * For backward compatibility. This method doesn't support correct keylabel generation as there
      * is no info, where pubKey is coming from (pubkey, cert, LDAP)
      * Use {@link #fromPublicKey(PublicKey, KeyLabelParams)} instead.
-     * @param pubKey
-     * @param keyLabel
-     * @return
+     * @deprecated ecryption key
+     * @param pubKey public key
+     * @param keyLabel key label
+     * @return EncryptionKeyMaterial
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     static EncryptionKeyMaterial fromPublicKey(
         PublicKey pubKey,
         String keyLabel