Fix some checkstyle errors

Author: martti007

src/main/java/com/unicity/sdk/StateTransitionClient.java

@@ -1,7 +1,6 @@
 
 package com.unicity.sdk;
 
-import com.unicity.sdk.api.AggregatorClient;
 import com.unicity.sdk.api.IAggregatorClient;
 import com.unicity.sdk.api.RequestId;
 import com.unicity.sdk.api.SubmitCommitmentResponse;
@@ -49,15 +48,15 @@ public CompletableFuture<SubmitCommitmentResponse> submitCommitment(
         .calculateHash(token.getId(), token.getType()), commitment.getAuthenticator());
   }
 
-  public <T extends Transaction<MintTransactionData<?>>> Token<T> finalizeTransaction(
+  public <T extends MintTransactionData<?>> Token<T> finalizeTransaction(
       Token<T> token,
       TokenState state,
       Transaction<TransferTransactionData> transaction
   ) {
     return this.finalizeTransaction(token, state, transaction, List.of());
   }
 
-  public <T extends Transaction<MintTransactionData<?>>> Token<T> finalizeTransaction(
+  public <T extends MintTransactionData<?>> Token<T> finalizeTransaction(
       Token<T> token,
       TokenState state,
       Transaction<TransferTransactionData> transaction,
@@ -69,7 +68,7 @@ public <T extends Transaction<MintTransactionData<?>>> Token<T> finalizeTransact
   }
 
   public CompletableFuture<InclusionProofVerificationStatus> getTokenStatus(
-      Token<? extends Transaction<MintTransactionData<?>>> token,
+      Token<? extends MintTransactionData<?>> token,
       byte[] publicKey) {
     RequestId requestId = RequestId.create(publicKey,
         token.getState().calculateHash(token.getId(), token.getType()));

src/main/java/com/unicity/sdk/address/ProxyAddress.java

@@ -26,6 +26,10 @@ private ProxyAddress(TokenId data, byte[] checksum) {
     this.checksum = Arrays.copyOf(checksum, checksum.length);
   }
 
+  public static ProxyAddress create(String name) {
+    return ProxyAddress.create(TokenId.fromNameTag(name));
+  }
+
   public static ProxyAddress create(TokenId tokenId) {
     DataHash checksum = new DataHasher(HashAlgorithm.SHA256).update(tokenId.getBytes())
         .digest();

src/main/java/com/unicity/sdk/serializer/cbor/token/TokenCbor.java

@@ -46,10 +46,10 @@ public void serialize(Token value, JsonGenerator gen, SerializerProvider seriali
   }
 
   public static class Deserializer extends
-      JsonDeserializer<Token<Transaction<MintTransactionData<?>>>> {
+      JsonDeserializer<Token<MintTransactionData<?>>> {
 
     @Override
-    public Token<Transaction<MintTransactionData<?>>> deserialize(JsonParser p,
+    public Token<MintTransactionData<?>> deserialize(JsonParser p,
         DeserializationContext ctx) throws IOException {
       if (!p.isExpectedStartArrayToken()) {
         throw MismatchedInputException.from(p, Token.class, "Expected array value");

src/main/java/com/unicity/sdk/serializer/json/token/TokenJson.java

@@ -49,10 +49,10 @@ public void serialize(Token value, JsonGenerator gen,
   }
 
   public static class Deserializer extends
-      JsonDeserializer<Token<Transaction<MintTransactionData<?>>>> {
+      JsonDeserializer<Token<MintTransactionData<?>>> {
 
     @Override
-    public Token<Transaction<MintTransactionData<?>>> deserialize(JsonParser p,
+    public Token<MintTransactionData<?>> deserialize(JsonParser p,
         DeserializationContext ctx)
         throws IOException {
       TokenState state = null;

src/main/java/com/unicity/sdk/token/Token.java

@@ -22,16 +22,16 @@
 import java.util.Objects;
 import java.util.Optional;
 
-public class Token<T extends Transaction<MintTransactionData<?>>> {
+public class Token<T extends MintTransactionData<?>> {
 
   public static final String TOKEN_VERSION = "2.0";
 
   private final TokenState state;
-  private final T genesis;
+  private final Transaction<T> genesis;
   private final List<Transaction<TransferTransactionData>> transactions;
   private final List<Token<?>> nametags;
 
-  public Token(TokenState state, T genesis, List<Transaction<TransferTransactionData>> transactions,
+  public Token(TokenState state, Transaction<T> genesis, List<Transaction<TransferTransactionData>> transactions,
       List<Token<?>> nametags) {
     Objects.requireNonNull(state, "State cannot be null");
     Objects.requireNonNull(genesis, "Genesis cannot be null");
@@ -44,7 +44,7 @@ public Token(TokenState state, T genesis, List<Transaction<TransferTransactionDa
     this.nametags = List.copyOf(nametags);
   }
 
-  public Token(TokenState state, T genesis) {
+  public Token(TokenState state, Transaction<T> genesis) {
     this(state, genesis, List.of(), List.of());
   }
 
@@ -72,7 +72,7 @@ public TokenState getState() {
     return this.state;
   }
 
-  public T getGenesis() {
+  public Transaction<T> getGenesis() {
     return this.genesis;
   }
 
@@ -216,13 +216,12 @@ private VerificationResult verifyTransaction(
     return VerificationResult.success();
   }
 
-  private VerificationResult verifyGenesis(
-      Transaction<MintTransactionData<?>> transaction) {
-    if (!transaction.getInclusionProof().getAuthenticator().isPresent()) {
+  private VerificationResult verifyGenesis(Transaction<T> transaction) {
+    if (transaction.getInclusionProof().getAuthenticator().isEmpty()) {
       return VerificationResult.fail("Missing authenticator.");
     }
 
-    if (!transaction.getInclusionProof().getTransactionHash().isPresent()) {
+    if (transaction.getInclusionProof().getTransactionHash().isEmpty()) {
       return VerificationResult.fail("Missing transaction hash.");
     }
 

src/main/java/com/unicity/sdk/token/TokenId.java

@@ -1,8 +1,11 @@
 
 package com.unicity.sdk.token;
 
+import com.unicity.sdk.hash.DataHasher;
+import com.unicity.sdk.hash.HashAlgorithm;
 import com.unicity.sdk.util.BitString;
 import com.unicity.sdk.util.HexConverter;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 /**
@@ -23,6 +26,15 @@ public BitString toBitString() {
         return new BitString(this.bytes);
     }
 
+    public static TokenId fromNameTag(String name) {
+      return new TokenId(
+          new DataHasher(HashAlgorithm.SHA256)
+              .update(name.getBytes(StandardCharsets.UTF_8))
+              .digest()
+              .getImprint()
+      );
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

src/main/java/com/unicity/sdk/transaction/MintCommitment.java

@@ -48,7 +48,7 @@ public Transaction<T> toTransaction(InclusionProof inclusionProof) {
       throw new RuntimeException("Inclusion proof verification failed.");
     }
 
-    if (!inclusionProof.getAuthenticator().isPresent()) {
+    if (inclusionProof.getAuthenticator().isEmpty()) {
       throw new RuntimeException("Authenticator is missing from inclusion proof.");
     }
 

src/main/java/com/unicity/sdk/transaction/MintTransactionData.java

@@ -56,7 +56,7 @@ public MintTransactionData(
     this.reason = reason;
   }
 
-  public static MintTransactionData<MintTransactionReason> createNametag(
+  public static MintTransactionData<MintTransactionReason> createForNametag(
       String name,
       TokenType tokenType,
       byte[] tokenData,
@@ -69,12 +69,7 @@ public static MintTransactionData<MintTransactionReason> createNametag(
     Objects.requireNonNull(targetAddress, "Target address cannot be null");
 
     return new MintTransactionData<>(
-        new TokenId(
-            new DataHasher(HashAlgorithm.SHA256)
-                .update(name.getBytes(StandardCharsets.UTF_8))
-                .digest()
-                .getImprint()
-        ),
+        TokenId.fromNameTag(name),
         tokenType,
         tokenData,
         coinData,

src/test/java/com/unicity/sdk/e2e/CommonTestFlow.java

@@ -24,6 +24,7 @@
 import com.unicity.sdk.token.TokenState;
 import com.unicity.sdk.token.TokenType;
 import com.unicity.sdk.token.fungible.CoinId;
+import com.unicity.sdk.transaction.MintTransactionReason;
 import com.unicity.sdk.transaction.split.SplitMintReason;
 import com.unicity.sdk.token.fungible.TokenCoinData;
 import com.unicity.sdk.transaction.InclusionProof;
@@ -48,7 +49,6 @@
 /**
  * Common test flows for token operations, matching TypeScript SDK's CommonTestFlow.
  */
-@SuppressWarnings({"unchecked", "rawtypes"})
 public class CommonTestFlow {
 
   private static final byte[] ALICE_SECRET = "Alice".getBytes(StandardCharsets.UTF_8);
@@ -76,8 +76,8 @@ public static void testTransferFlow(StateTransitionClient client) throws Excepti
     Address aliceAddress = alicePredicate.getReference(tokenType).toAddress();
     TokenState aliceTokenState = new TokenState(alicePredicate, null);
 
-    MintCommitment<?> aliceMintCommitment = MintCommitment.create(
-        new MintTransactionData(
+    MintCommitment<MintTransactionData<MintTransactionReason>> aliceMintCommitment = MintCommitment.create(
+        new MintTransactionData<>(
             tokenId,
             tokenType,
             new TestTokenData(randomBytes(32)).getData(),
@@ -104,13 +104,49 @@ public static void testTransferFlow(StateTransitionClient client) throws Excepti
     ).get();
 
     // Create mint transaction
-    Token aliceToken = new Token(
+    Token<?> aliceToken = new Token<>(
         aliceTokenState,
         aliceMintCommitment.toTransaction(mintInclusionProof)
     );
 
     assertTrue(aliceToken.verify().isSuccessful());
 
+    String bobNameTag = UUID.randomUUID().toString();
+
+    // Alice transfers to Bob
+    String bobCustomData = "Bob's custom data";
+    byte[] bobStateData = bobCustomData.getBytes(StandardCharsets.UTF_8);
+    DataHash bobDataHash = new DataHasher(HashAlgorithm.SHA256).update(bobStateData).digest();
+
+    // Submit transfer transaction
+    TransferCommitment aliceToBobTransferCommitment = TransferCommitment.create(
+        aliceToken,
+        ProxyAddress.create(bobNameTag),
+        randomBytes(32),
+        bobDataHash,
+        null,
+        aliceSigningService
+    );
+    SubmitCommitmentResponse aliceToBobTransferSubmitResponse = client.submitCommitment(aliceToken,
+        aliceToBobTransferCommitment).get();
+
+    if (aliceToBobTransferSubmitResponse.getStatus() != SubmitCommitmentStatus.SUCCESS) {
+      throw new Exception(String.format("Failed to submit transaction commitment: %s",
+          aliceToBobTransferSubmitResponse.getStatus()));
+    }
+
+    // Wait for inclusion proof
+    InclusionProof aliceToBobTransferInclusionProof = InclusionProofUtils.waitInclusionProof(
+        client,
+        aliceToBobTransferCommitment
+    ).get();
+
+    // Create transfer transaction
+    Transaction<TransferTransactionData> aliceToBobTransferTransaction = aliceToBobTransferCommitment.toTransaction(
+        aliceToken,
+        aliceToBobTransferInclusionProof
+    );
+
     // Bob prepares to receive the token
     byte[] bobNonce = randomBytes(32);
     SigningService bobSigningService = SigningService.createFromSecret(BOB_SECRET, bobNonce);
@@ -119,6 +155,7 @@ public static void testTransferFlow(StateTransitionClient client) throws Excepti
     DirectAddress bobAddress = bobPredicate.getReference(tokenType).toAddress();
 
     // Bob mints a name tag tokens
+
     byte[] bobNametagNonce = randomBytes(32);
     MaskedPredicate bobNametagPredicate = MaskedPredicate.create(
         SigningService.createFromSecret(BOB_SECRET, bobNametagNonce),
@@ -129,15 +166,16 @@ public static void testTransferFlow(StateTransitionClient client) throws Excepti
     DirectAddress bobNametagAddress = bobNametagPredicate.getReference(bobNametagTokenType)
         .toAddress();
     MintCommitment<?> nametagMintCommitment = MintCommitment.create(
-        MintTransactionData.createNametag(
-            UUID.randomUUID().toString(),
+        MintTransactionData.createForNametag(
+            bobNameTag,
             bobNametagTokenType,
             new byte[10],
             null,
             bobNametagAddress,
             randomBytes(32),
             bobAddress
         ));
+
     SubmitCommitmentResponse nametagMintResponse = client.submitCommitment(nametagMintCommitment)
         .get();
     if (nametagMintResponse.getStatus() != SubmitCommitmentStatus.SUCCESS) {
@@ -151,47 +189,13 @@ public static void testTransferFlow(StateTransitionClient client) throws Excepti
             nametagMintCommitment
         ).get()
     );
-    Token<?> bobNametagToken = new Token(
+    Token<?> bobNametagToken = new Token<>(
         new NameTagTokenState(bobNametagPredicate, bobAddress),
         bobNametagGenesis
     );
 
-    // Alice transfers to Bob
-    String bobCustomData = "Bob's custom data";
-    byte[] bobStateData = bobCustomData.getBytes(StandardCharsets.UTF_8);
-    DataHash bobDataHash = new DataHasher(HashAlgorithm.SHA256).update(bobStateData).digest();
-
-    // Submit transfer transaction
-    TransferCommitment aliceToBobTransferCommitment = TransferCommitment.create(
-        aliceToken,
-        ProxyAddress.create(bobNametagGenesis.getData().getTokenId()),
-        randomBytes(32),
-        bobDataHash,
-        null,
-        aliceSigningService
-    );
-    SubmitCommitmentResponse aliceToBobTransferSubmitResponse = client.submitCommitment(aliceToken,
-        aliceToBobTransferCommitment).get();
-
-    if (aliceToBobTransferSubmitResponse.getStatus() != SubmitCommitmentStatus.SUCCESS) {
-      throw new Exception(String.format("Failed to submit transaction commitment: %s",
-          aliceToBobTransferSubmitResponse.getStatus()));
-    }
-
-    // Wait for inclusion proof
-    InclusionProof aliceToBobTransferInclusionProof = InclusionProofUtils.waitInclusionProof(
-        client,
-        aliceToBobTransferCommitment
-    ).get();
-
-    // Create transfer transaction
-    Transaction<TransferTransactionData> aliceToBobTransferTransaction = aliceToBobTransferCommitment.toTransaction(
-        aliceToken,
-        aliceToBobTransferInclusionProof
-    );
-
     // Bob finalizes the token
-    Token bobToken = client.finalizeTransaction(
+    Token<?> bobToken = client.finalizeTransaction(
         aliceToken,
         new TokenState(bobPredicate, bobStateData),
         aliceToBobTransferTransaction,
@@ -246,7 +250,7 @@ public static void testTransferFlow(StateTransitionClient client) throws Excepti
         carolNonce
     );
 
-    Token carolToken = client.finalizeTransaction(
+    Token<?> carolToken = client.finalizeTransaction(
         bobToken,
         new TokenState(carolPredicate, null),
         bobToCarolTransaction
@@ -410,7 +414,7 @@ public static void testTransferFlow(StateTransitionClient client) throws Excepti
     );
 
     Assertions.assertTrue(
-        new Token(
+        new Token<>(
             new TokenState(splitTokenPredicate, null),
             splitTransactions.get(0)
         ).verify().isSuccessful()

src/test/java/com/unicity/sdk/token/TokenTest.java

@@ -47,7 +47,7 @@ public void testJsonSerialization() throws IOException {
             nametagNonce),
         DirectAddress.create(new DataHash(HashAlgorithm.SHA256, TestUtils.randomBytes(32)))
     );
-    MintTransactionData<?> nametagGenesisData = MintTransactionData.createNametag(
+    MintTransactionData<?> nametagGenesisData = MintTransactionData.createForNametag(
         UUID.randomUUID().toString(),
         new TokenType(TestUtils.randomBytes(32)),
         TestUtils.randomBytes(5),