extend associateNft() & associateToken() to work with multiple token

Signed-off-by: Manish Dait <[email protected]>

Author: manishdait

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/FungibleTokenClient.java

@@ -232,6 +232,29 @@ default void associateToken(@NonNull TokenId tokenId, @NonNull Account account)
         associateToken(tokenId, account.accountId(), account.privateKey());
     }
 
+    /**
+     * Associate an account with token.
+     *
+     * @param tokenIds list of the ID of the token
+     * @param accountId the accountId
+     * @param  accountKey the account privateKey
+     * @throws HieroException if the account could not be associated with the token
+     */
+    void associateToken(@NonNull List<TokenId> tokenIds, @NonNull AccountId accountId, @NonNull PrivateKey accountKey)
+            throws HieroException;
+
+    /**
+     * Associate an account with token.
+     *
+     * @param tokenIds list of the ID of the token
+     * @param account the account
+     * @throws HieroException if the account could not be associated with the token
+     */
+    default void associateToken(@NonNull List<TokenId> tokenIds, @NonNull Account account) throws HieroException {
+        Objects.requireNonNull(account, "accountId must not be null");
+        associateToken(tokenIds, account.accountId(), account.privateKey());
+    };
+
     /**
      * Dissociate an account with token.
      *
@@ -294,7 +317,6 @@ default void dissociateToken(@NonNull List<TokenId> tokenIds, @NonNull Account a
         dissociateToken(tokenIds, account.accountId(), account.privateKey());
     };
 
-
     /**
      * Mint a Token.
      *

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/NftClient.java

@@ -205,6 +205,31 @@ default void associateNft(@NonNull TokenId tokenId, @NonNull Account account) th
         associateNft(tokenId, account.accountId(), account.privateKey());
     }
 
+    /**
+     * Associate an account with an NFT type. If an account is associated with an NFT type, the account can hold NFTs of
+     * that type. Otherwise, the account cannot hold NFTs of that type and tranfer NFTs of that type will fail.
+     *
+     * @param tokenIds the List of ID for NFT type
+     * @param accountId the  accountId
+     * @param accountKey the account privateKey
+     * @throws HieroException if the account could not be associated with the NFT type
+     */
+    void associateNft(@NonNull List<TokenId> tokenIds, @NonNull AccountId accountId, @NonNull PrivateKey accountKey)
+            throws HieroException;
+
+    /**
+     * Associate an account with an NFT type. If an account is associated with an NFT type, the account can hold NFTs of
+     * that type. Otherwise, the account cannot hold NFTs of that type and tranfer NFTs of that type will fail.
+     *
+     * @param tokenIds the List of ID for NFT type
+     * @param account the  account
+     * @throws HieroException if the account could not be associated with the NFT type
+     */
+    default void associateNft(@NonNull List<TokenId> tokenIds, @NonNull Account account) throws HieroException {
+        Objects.requireNonNull(account, "accountId must not be null");
+        associateNft(tokenIds, account.accountId(), account.privateKey());
+    };
+
     /**
      * Dissociate an account with an NFT type.
      *

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FungibleTokenClientImpl.java

@@ -67,6 +67,18 @@ public void associateToken(@NonNull TokenId tokenId, @NonNull AccountId accountI
         client.executeTokenAssociateTransaction(request);
     }
 
+    @Override
+    public void associateToken(@NonNull List<TokenId> tokenIds, @NonNull AccountId accountId, @NonNull PrivateKey accountKey) throws HieroException {
+        Objects.requireNonNull(tokenIds, "tokenIds must not be null");
+        Objects.requireNonNull(accountId, "accountId must not be null");
+        Objects.requireNonNull(accountKey, "accountKey must not be null");
+        if (tokenIds.isEmpty()) {
+            throw new IllegalArgumentException("tokenIds must not be empty");
+        }
+        final TokenAssociateRequest request = TokenAssociateRequest.of(tokenIds, accountId, accountKey);
+        client.executeTokenAssociateTransaction(request);
+    }
+
     @Override
     public void dissociateToken(@NonNull TokenId tokenId, @NonNull AccountId accountId, @NonNull PrivateKey accountKey) throws HieroException {
         Objects.requireNonNull(tokenId, "tokenId must not be null");

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/NftClientImpl.java

@@ -68,6 +68,18 @@ public void associateNft(@NonNull final TokenId tokenId, @NonNull final AccountI
         client.executeTokenAssociateTransaction(request);
     }
 
+    @Override
+    public void associateNft(@NonNull List<TokenId> tokenIds, @NonNull AccountId accountId, @NonNull PrivateKey accountKey) throws HieroException {
+        Objects.requireNonNull(tokenIds, "tokenIds must not be null");
+        Objects.requireNonNull(accountId, "accountId must not be null");
+        Objects.requireNonNull(accountKey, "accountKey must not be null");
+        if (tokenIds.isEmpty()) {
+            throw new IllegalArgumentException("tokenIds must not be empty");
+        }
+        final TokenAssociateRequest request = TokenAssociateRequest.of(tokenIds, accountId, accountKey);
+        client.executeTokenAssociateTransaction(request);
+    }
+
     @Override
     public void dissociateNft(@NonNull TokenId tokenId, @NonNull AccountId accountId, @NonNull PrivateKey accountKey) throws HieroException {
         Objects.requireNonNull(tokenId, "tokenId must not be null");

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/ProtocolLayerClientImpl.java

@@ -455,7 +455,7 @@ public TokenAssociateResult executeTokenAssociateTransaction(@NonNull final Toke
             final TokenAssociateTransaction transaction = new TokenAssociateTransaction()
                     .setMaxTransactionFee(request.maxTransactionFee())
                     .setTransactionValidDuration(request.transactionValidDuration())
-                    .setTokenIds(List.of(request.tokenId()))
+                    .setTokenIds(request.tokenIds())
                     .setAccountId(request.accountId());
             sign(transaction, request.accountPrivateKey());
             final TransactionReceipt receipt = executeTransactionAndWaitOnReceipt(transaction);

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenAssociateRequest.java

@@ -5,25 +5,30 @@
 import com.hedera.hashgraph.sdk.PrivateKey;
 import com.hedera.hashgraph.sdk.TokenId;
 import java.time.Duration;
+import java.util.List;
 import java.util.Objects;
 import org.jspecify.annotations.NonNull;
 
 public record TokenAssociateRequest(@NonNull Hbar maxTransactionFee,
                                     @NonNull Duration transactionValidDuration,
-                                    @NonNull TokenId tokenId,
+                                    @NonNull List<TokenId> tokenIds,
                                     @NonNull AccountId accountId,
                                     @NonNull PrivateKey accountPrivateKey) implements TransactionRequest {
 
     public TokenAssociateRequest {
-        Objects.requireNonNull(tokenId, "tokenId must not be null");
-        Objects.requireNonNull(accountId, "newAccountId must not be null");
+        Objects.requireNonNull(tokenIds, "tokenIds must not be null");
+        Objects.requireNonNull(accountId, "accountId must not be null");
         Objects.requireNonNull(accountPrivateKey, "accountPrivateKey must not be null");
     }
 
     public static TokenAssociateRequest of(@NonNull final TokenId tokenId, @NonNull final AccountId accountId,
+                                           @NonNull final PrivateKey accountPrivateKey) {
+        return of(List.of(tokenId), accountId, accountPrivateKey);
+    }
+
+    public static TokenAssociateRequest of(@NonNull final List<TokenId> tokenIds, @NonNull final AccountId accountId,
             @NonNull final PrivateKey accountPrivateKey) {
         return new TokenAssociateRequest(TransactionRequest.DEFAULT_MAX_TRANSACTION_FEE,
-                TransactionRequest.DEFAULT_TRANSACTION_VALID_DURATION, tokenId, accountId, accountPrivateKey);
+                TransactionRequest.DEFAULT_TRANSACTION_VALID_DURATION, tokenIds, accountId, accountPrivateKey);
     }
-
 }