fix(base): clean misleading messages (#93)

alejandroGM0 · web-flow · commit 60da62582e61 · 2026-04-28T16:36:56.000+03:00
Signed-off-by: Alejandro &lt;26930485+alejandroGM0@users.noreply.github.com&gt;
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/AccountClient.java b/hiero-enterprise-base/src/main/java/org/hiero/base/AccountClient.java
@@ -123,7 +123,7 @@ default Account createAccount(long initialBalanceInHbar) throws HieroException {
    */
   @NonNull
   default Hbar getAccountBalance(@NonNull String accountId) throws HieroException {
-    Objects.requireNonNull(accountId, "newAccountId must not be null");
+    Objects.requireNonNull(accountId, "accountId must not be null");
     return getAccountBalance(AccountId.fromString(accountId));
   }
 
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/data/Account.java b/hiero-enterprise-base/src/main/java/org/hiero/base/data/Account.java
@@ -17,7 +17,7 @@ public record Account(
     @NonNull AccountId accountId, @NonNull PublicKey publicKey, @NonNull PrivateKey privateKey) {
 
   public Account {
-    Objects.requireNonNull(accountId, "newAccountId must not be null");
+    Objects.requireNonNull(accountId, "accountId must not be null");
     Objects.requireNonNull(publicKey, "publicKey must not be null");
     Objects.requireNonNull(privateKey, "privateKey must not be null");
   }
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/implementation/FileClientImpl.java b/hiero-enterprise-base/src/main/java/org/hiero/base/implementation/FileClientImpl.java
@@ -29,7 +29,7 @@ public class FileClientImpl implements FileClient {
 
   public FileClientImpl(@NonNull final ProtocolLayerClient protocolLayerClient) {
     this.protocolLayerClient =
-        Objects.requireNonNull(protocolLayerClient, "protocolLevelClient must not be null");
+        Objects.requireNonNull(protocolLayerClient, "protocolLayerClient must not be null");
   }
 
   @Override
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/implementation/ProtocolLayerClientImpl.java b/hiero-enterprise-base/src/main/java/org/hiero/base/implementation/ProtocolLayerClientImpl.java
@@ -303,7 +303,7 @@ public ContractDeleteResult executeContractDeleteTransaction(
   public ContractCallResult executeContractCallTransaction(
       @NonNull final ContractCallRequest request) throws HieroException {
     Objects.requireNonNull(request, "request must not be null");
-    final ContractFunctionParameters functionParams = createParameters(request.constructorParams());
+    final ContractFunctionParameters functionParams = createParameters(request.functionParams());
     final ContractExecuteTransaction transaction =
         new ContractExecuteTransaction()
             .setMaxTransactionFee(request.maxTransactionFee())
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/implementation/SmartContractClientImpl.java b/hiero-enterprise-base/src/main/java/org/hiero/base/implementation/SmartContractClientImpl.java
@@ -32,7 +32,7 @@ public class SmartContractClientImpl implements SmartContractClient {
   public SmartContractClientImpl(
       @NonNull final ProtocolLayerClient protocolLayerClient, FileClient fileClient) {
     this.protocolLayerClient =
-        Objects.requireNonNull(protocolLayerClient, "protocolLevelClient must not be null");
+        Objects.requireNonNull(protocolLayerClient, "protocolLayerClient must not be null");
     this.fileClient = Objects.requireNonNull(fileClient, "fileClient must not be null");
   }
 
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/interceptors/ReceiveRecordInterceptor.java b/hiero-enterprise-base/src/main/java/org/hiero/base/interceptors/ReceiveRecordInterceptor.java
@@ -20,7 +20,7 @@ public interface ReceiveRecordInterceptor {
   /**
    * Intercept the call for receiving a record for a transaction.
    *
-   * @param handler the handler that will be used to receive the record
+   * @param handler the record handler to invoke
    * @return the record for the transaction
    * @throws Exception if the interceptor fails
    */
@@ -31,7 +31,7 @@ public interface ReceiveRecordInterceptor {
    *
    * @param transaction the transaction for which the record is received
    * @param receipt the receipt for the transaction
-   * @param function the function that will be used to receive the record
+   * @param function the callback that fetches the record from the receipt
    */
   record ReceiveRecordHandler(
       @NonNull Transaction transaction,
@@ -41,7 +41,7 @@ record ReceiveRecordHandler(
     public ReceiveRecordHandler {
       Objects.requireNonNull(transaction, "transaction must not be null");
       Objects.requireNonNull(receipt, "receipt must not be null");
-      Objects.requireNonNull(function, "handler must not be null");
+      Objects.requireNonNull(function, "function must not be null");
     }
 
     /**
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/mirrornode/MirrorNodeClient.java b/hiero-enterprise-base/src/main/java/org/hiero/base/mirrornode/MirrorNodeClient.java
@@ -142,7 +142,7 @@ default Optional<Nft> queryNftsByTokenIdAndSerial(@NonNull String tokenId, long
   default Optional<Nft> queryNftsByAccountAndTokenIdAndSerial(
       @NonNull AccountId accountId, @NonNull TokenId tokenId, long serialNumber)
       throws HieroException {
-    Objects.requireNonNull(accountId, "newAccountId must not be null");
+    Objects.requireNonNull(accountId, "accountId must not be null");
     return queryNftsByTokenIdAndSerial(tokenId, serialNumber)
         .filter(nft -> Objects.equals(nft.owner(), accountId));
   }
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/mirrornode/TransactionRepository.java b/hiero-enterprise-base/src/main/java/org/hiero/base/mirrornode/TransactionRepository.java
@@ -89,7 +89,7 @@ default Page<TransactionInfo> findByAccountAndType(
   default Page<TransactionInfo> findByAccountAndResult(
       @NonNull String accountId, @NonNull Result result) throws HieroException {
     Objects.requireNonNull(accountId, "accountId must not be null");
-    Objects.requireNonNull(result, "type must not be null");
+    Objects.requireNonNull(result, "result must not be null");
     return findByAccountAndResult(AccountId.fromString(accountId), result);
   }
   ;
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/protocol/data/AccountBalanceRequest.java b/hiero-enterprise-base/src/main/java/org/hiero/base/protocol/data/AccountBalanceRequest.java
@@ -9,7 +9,7 @@ public record AccountBalanceRequest(
     @NonNull AccountId accountId, Hbar queryPayment, Hbar maxQueryPayment) implements QueryRequest {
 
   public AccountBalanceRequest {
-    Objects.requireNonNull(accountId, "newAccountId must not be null");
+    Objects.requireNonNull(accountId, "accountId must not be null");
   }
 
   @NonNull
@@ -19,7 +19,7 @@ public static AccountBalanceRequest of(@NonNull AccountId accountId) {
 
   @NonNull
   public static AccountBalanceRequest of(@NonNull String accountId) {
-    Objects.requireNonNull(accountId, "newAccountId must not be null");
+    Objects.requireNonNull(accountId, "accountId must not be null");
     return of(AccountId.fromString(accountId));
   }
 
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/protocol/data/AccountCreateResult.java b/hiero-enterprise-base/src/main/java/org/hiero/base/protocol/data/AccountCreateResult.java
@@ -23,7 +23,7 @@ public record AccountCreateResult(
     Objects.requireNonNull(transactionHash, "transactionHash must not be null");
     Objects.requireNonNull(consensusTimestamp, "consensusTimestamp must not be null");
     Objects.requireNonNull(transactionFee, "transactionFee must not be null");
-    Objects.requireNonNull(newAccount, "newAccountId must not be null");
+    Objects.requireNonNull(newAccount, "newAccount must not be null");
     if (transactionFee.toTinybars() < 0) {
       throw new IllegalArgumentException("transactionFee must be non-negative");
     }
diff --git a/hiero-enterprise-base/src/main/java/org/hiero/base/protocol/data/ContractCallRequest.java b/hiero-enterprise-base/src/main/java/org/hiero/base/protocol/data/ContractCallRequest.java
@@ -14,20 +14,20 @@ public record ContractCallRequest(
     @NonNull Duration transactionValidDuration,
     @NonNull ContractId contractId,
     @NonNull String functionName,
-    @NonNull List<ContractParam<?>> constructorParams)
+    @NonNull List<ContractParam<?>> functionParams)
     implements TransactionRequest {
 
   public ContractCallRequest {
     Objects.requireNonNull(maxTransactionFee, "maxTransactionFee is required");
     Objects.requireNonNull(transactionValidDuration, "transactionValidDuration is required");
     Objects.requireNonNull(contractId, "contractId is required");
     Objects.requireNonNull(functionName, "functionName is required");
-    Objects.requireNonNull(constructorParams, "constructorParams is required");
+    Objects.requireNonNull(functionParams, "functionParams is required");
     if (maxTransactionFee.toTinybars() < 0) {
-      throw new IllegalArgumentException("maxTransactionFee must be at >= null");
+      throw new IllegalArgumentException("maxTransactionFee must be non-negative");
     }
     if (!transactionValidDuration.isPositive()) {
-      throw new IllegalArgumentException("transactionValidDuration must be at >= zero");
+      throw new IllegalArgumentException("transactionValidDuration must be positive");
     }
     if (functionName.isBlank() || functionName.contains(" ")) {
       throw new IllegalArgumentException("functionName must not be blank or contain spaces");
@@ -38,42 +38,42 @@ public record ContractCallRequest(
   public static ContractCallRequest of(
       @NonNull String contractId,
       @NonNull String functionName,
-      @Nullable ContractParam<?>... constructorParams) {
+      @Nullable ContractParam<?>... functionParams) {
     Objects.requireNonNull(contractId, "contractId must not be null");
-    return of(ContractId.fromString(contractId), functionName, constructorParams);
+    return of(ContractId.fromString(contractId), functionName, functionParams);
   }
 
   @NonNull
   public static ContractCallRequest of(
       @NonNull ContractId contractId,
       @NonNull String functionName,
-      @Nullable ContractParam<?>... constructorParams) {
-    if (constructorParams == null) {
+      @Nullable ContractParam<?>... functionParams) {
+    if (functionParams == null) {
       return of(contractId, functionName, List.of());
     } else {
-      return of(contractId, functionName, List.of(constructorParams));
+      return of(contractId, functionName, List.of(functionParams));
     }
   }
 
   @NonNull
   public static ContractCallRequest of(
       @NonNull String contractId,
       @NonNull String functionName,
-      @NonNull List<ContractParam<?>> constructorParams) {
+      @NonNull List<ContractParam<?>> functionParams) {
     Objects.requireNonNull(contractId, "contractId must not be null");
-    return of(ContractId.fromString(contractId), functionName, constructorParams);
+    return of(ContractId.fromString(contractId), functionName, functionParams);
   }
 
   @NonNull
   public static ContractCallRequest of(
       @NonNull ContractId contractId,
       @NonNull String functionName,
-      @NonNull List<ContractParam<?>> constructorParams) {
+      @NonNull List<ContractParam<?>> functionParams) {
     return new ContractCallRequest(
         DEFAULT_MAX_TRANSACTION_FEE,
         DEFAULT_TRANSACTION_VALID_DURATION,
         contractId,
         functionName,
-        List.copyOf(constructorParams));
+        List.copyOf(functionParams));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ default Account createAccount(long initialBalanceInHbar) throws HieroException {`
`123`	`123`	`*/`
`124`	`124`	`@NonNull`
`125`	`125`	`default Hbar getAccountBalance(@NonNull String accountId) throws HieroException {`
`126`		`- Objects.requireNonNull(accountId, "newAccountId must not be null");`
	`126`	`+ Objects.requireNonNull(accountId, "accountId must not be null");`
`127`	`127`	`return getAccountBalance(AccountId.fromString(accountId));`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public record Account(`
`17`	`17`	`@NonNull AccountId accountId, @NonNull PublicKey publicKey, @NonNull PrivateKey privateKey) {`
`18`	`18`
`19`	`19`	`public Account {`
`20`		`- Objects.requireNonNull(accountId, "newAccountId must not be null");`
	`20`	`+ Objects.requireNonNull(accountId, "accountId must not be null");`
`21`	`21`	`Objects.requireNonNull(publicKey, "publicKey must not be null");`
`22`	`22`	`Objects.requireNonNull(privateKey, "privateKey must not be null");`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class FileClientImpl implements FileClient {`
`29`	`29`
`30`	`30`	`public FileClientImpl(@NonNull final ProtocolLayerClient protocolLayerClient) {`
`31`	`31`	`this.protocolLayerClient =`
`32`		`- Objects.requireNonNull(protocolLayerClient, "protocolLevelClient must not be null");`
	`32`	`+ Objects.requireNonNull(protocolLayerClient, "protocolLayerClient must not be null");`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class SmartContractClientImpl implements SmartContractClient {`
`32`	`32`	`public SmartContractClientImpl(`
`33`	`33`	`@NonNull final ProtocolLayerClient protocolLayerClient, FileClient fileClient) {`
`34`	`34`	`this.protocolLayerClient =`
`35`		`- Objects.requireNonNull(protocolLayerClient, "protocolLevelClient must not be null");`
	`35`	`+ Objects.requireNonNull(protocolLayerClient, "protocolLayerClient must not be null");`
`36`	`36`	`this.fileClient = Objects.requireNonNull(fileClient, "fileClient must not be null");`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ default Optional<Nft> queryNftsByTokenIdAndSerial(@NonNull String tokenId, long`
`142`	`142`	`default Optional<Nft> queryNftsByAccountAndTokenIdAndSerial(`
`143`	`143`	`@NonNull AccountId accountId, @NonNull TokenId tokenId, long serialNumber)`
`144`	`144`	`throws HieroException {`
`145`		`- Objects.requireNonNull(accountId, "newAccountId must not be null");`
	`145`	`+ Objects.requireNonNull(accountId, "accountId must not be null");`
`146`	`146`	`return queryNftsByTokenIdAndSerial(tokenId, serialNumber)`
`147`	`147`	`.filter(nft -> Objects.equals(nft.owner(), accountId));`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ default Page<TransactionInfo> findByAccountAndType(`
`89`	`89`	`default Page<TransactionInfo> findByAccountAndResult(`
`90`	`90`	`@NonNull String accountId, @NonNull Result result) throws HieroException {`
`91`	`91`	`Objects.requireNonNull(accountId, "accountId must not be null");`
`92`		`- Objects.requireNonNull(result, "type must not be null");`
	`92`	`+ Objects.requireNonNull(result, "result must not be null");`
`93`	`93`	`return findByAccountAndResult(AccountId.fromString(accountId), result);`
`94`	`94`	`}`
`95`	`95`	`;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public record AccountBalanceRequest(`
`9`	`9`	`@NonNull AccountId accountId, Hbar queryPayment, Hbar maxQueryPayment) implements QueryRequest {`
`10`	`10`
`11`	`11`	`public AccountBalanceRequest {`
`12`		`- Objects.requireNonNull(accountId, "newAccountId must not be null");`
	`12`	`+ Objects.requireNonNull(accountId, "accountId must not be null");`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@NonNull`
`@@ -19,7 +19,7 @@ public static AccountBalanceRequest of(@NonNull AccountId accountId) {`
`19`	`19`
`20`	`20`	`@NonNull`
`21`	`21`	`public static AccountBalanceRequest of(@NonNull String accountId) {`
`22`		`- Objects.requireNonNull(accountId, "newAccountId must not be null");`
	`22`	`+ Objects.requireNonNull(accountId, "accountId must not be null");`
`23`	`23`	`return of(AccountId.fromString(accountId));`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public record AccountCreateResult(`
`23`	`23`	`Objects.requireNonNull(transactionHash, "transactionHash must not be null");`
`24`	`24`	`Objects.requireNonNull(consensusTimestamp, "consensusTimestamp must not be null");`
`25`	`25`	`Objects.requireNonNull(transactionFee, "transactionFee must not be null");`
`26`		`- Objects.requireNonNull(newAccount, "newAccountId must not be null");`
	`26`	`+ Objects.requireNonNull(newAccount, "newAccount must not be null");`
`27`	`27`	`if (transactionFee.toTinybars() < 0) {`
`28`	`28`	`throw new IllegalArgumentException("transactionFee must be non-negative");`
`29`	`29`	`}`