diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/AccountClientImpl.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/AccountClientImpl.java index edcfd08d..e67394ce 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/AccountClientImpl.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/AccountClientImpl.java @@ -5,11 +5,11 @@ import com.openelements.hiero.base.AccountClient; import com.openelements.hiero.base.HieroException; import com.openelements.hiero.base.data.Account; -import com.openelements.hiero.base.protocol.AccountBalanceRequest; -import com.openelements.hiero.base.protocol.AccountBalanceResponse; -import com.openelements.hiero.base.protocol.AccountCreateRequest; -import com.openelements.hiero.base.protocol.AccountCreateResult; -import com.openelements.hiero.base.protocol.AccountDeleteRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceResponse; +import com.openelements.hiero.base.protocol.data.AccountCreateRequest; +import com.openelements.hiero.base.protocol.data.AccountCreateResult; +import com.openelements.hiero.base.protocol.data.AccountDeleteRequest; import com.openelements.hiero.base.protocol.ProtocolLayerClient; import java.util.Objects; import org.jspecify.annotations.NonNull; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FileClientImpl.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FileClientImpl.java index cde3ff92..7b4ce799 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FileClientImpl.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FileClientImpl.java @@ -3,15 +3,15 @@ import com.hedera.hashgraph.sdk.FileId; import com.openelements.hiero.base.FileClient; import com.openelements.hiero.base.HieroException; -import com.openelements.hiero.base.protocol.FileAppendRequest; -import com.openelements.hiero.base.protocol.FileContentsRequest; -import com.openelements.hiero.base.protocol.FileContentsResponse; -import com.openelements.hiero.base.protocol.FileCreateRequest; -import com.openelements.hiero.base.protocol.FileCreateResult; -import com.openelements.hiero.base.protocol.FileDeleteRequest; -import com.openelements.hiero.base.protocol.FileInfoRequest; -import com.openelements.hiero.base.protocol.FileInfoResponse; -import com.openelements.hiero.base.protocol.FileUpdateRequest; +import com.openelements.hiero.base.protocol.data.FileAppendRequest; +import com.openelements.hiero.base.protocol.data.FileContentsRequest; +import com.openelements.hiero.base.protocol.data.FileContentsResponse; +import com.openelements.hiero.base.protocol.data.FileCreateRequest; +import com.openelements.hiero.base.protocol.data.FileCreateResult; +import com.openelements.hiero.base.protocol.data.FileDeleteRequest; +import com.openelements.hiero.base.protocol.data.FileInfoRequest; +import com.openelements.hiero.base.protocol.data.FileInfoResponse; +import com.openelements.hiero.base.protocol.data.FileUpdateRequest; import com.openelements.hiero.base.protocol.ProtocolLayerClient; import java.time.Instant; import java.util.Arrays; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FungibleTokenClientImpl.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FungibleTokenClientImpl.java index 7565d882..69445b16 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FungibleTokenClientImpl.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FungibleTokenClientImpl.java @@ -8,6 +8,14 @@ import com.openelements.hiero.base.HieroException; import com.openelements.hiero.base.data.Account; import com.openelements.hiero.base.protocol.*; +import com.openelements.hiero.base.protocol.data.TokenAssociateRequest; +import com.openelements.hiero.base.protocol.data.TokenBurnRequest; +import com.openelements.hiero.base.protocol.data.TokenBurnResult; +import com.openelements.hiero.base.protocol.data.TokenCreateRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateResult; +import com.openelements.hiero.base.protocol.data.TokenMintRequest; +import com.openelements.hiero.base.protocol.data.TokenMintResult; +import com.openelements.hiero.base.protocol.data.TokenTransferRequest; import org.jspecify.annotations.NonNull; import java.util.Objects; @@ -17,7 +25,8 @@ public class FungibleTokenClientImpl implements FungibleTokenClient { private final Account operationalAccount; - public FungibleTokenClientImpl(@NonNull final ProtocolLayerClient client, @NonNull final Account operationalAccount) { + public FungibleTokenClientImpl(@NonNull final ProtocolLayerClient client, + @NonNull final Account operationalAccount) { this.client = Objects.requireNonNull(client, "client must not be null"); this.operationalAccount = Objects.requireNonNull(operationalAccount, "operationalAccount must not be null"); } @@ -36,17 +45,17 @@ public TokenId createToken(@NonNull String name, @NonNull String symbol, @NonNul @Override public TokenId createToken(@NonNull String name, @NonNull String symbol, @NonNull AccountId treasuryAccountId, - @NonNull PrivateKey treasuryKey) throws HieroException { + @NonNull PrivateKey treasuryKey) throws HieroException { return createToken(name, symbol, treasuryAccountId, treasuryKey, operationalAccount.privateKey()); } @Override public TokenId createToken(@NonNull String name, @NonNull String symbol, @NonNull AccountId treasuryAccountId, - @NonNull PrivateKey treasuryKey, @NonNull PrivateKey supplyKey) throws HieroException { + @NonNull PrivateKey treasuryKey, @NonNull PrivateKey supplyKey) throws HieroException { final TokenCreateRequest request = TokenCreateRequest.of(name, symbol, treasuryAccountId, treasuryKey, TokenType.FUNGIBLE_COMMON, supplyKey); final TokenCreateResult result = client.executeTokenCreateTransaction(request); - return result.tokenId(); + return result.tokenId(); } @Override @@ -82,14 +91,16 @@ public long burnToken(@NonNull TokenId tokenId, long amount, @NonNull PrivateKey } @Override - public void transferToken(@NonNull TokenId tokenId, @NonNull AccountId toAccountId, long amount) throws HieroException { + public void transferToken(@NonNull TokenId tokenId, @NonNull AccountId toAccountId, long amount) + throws HieroException { transferToken(tokenId, operationalAccount, toAccountId, amount); } @Override public void transferToken(@NonNull TokenId tokenId, @NonNull AccountId fromAccountId, - @NonNull PrivateKey fromAccountKey, @NonNull AccountId toAccountId, long amount) throws HieroException { - final TokenTransferRequest request = TokenTransferRequest.of(tokenId, fromAccountId, toAccountId, fromAccountKey, amount); + @NonNull PrivateKey fromAccountKey, @NonNull AccountId toAccountId, long amount) throws HieroException { + final TokenTransferRequest request = TokenTransferRequest.of(tokenId, fromAccountId, toAccountId, + fromAccountKey, amount); client.executeTransferTransaction(request); } } \ No newline at end of file diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/NftClientImpl.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/NftClientImpl.java index 9ef49e69..0d2ee173 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/NftClientImpl.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/NftClientImpl.java @@ -8,13 +8,13 @@ import com.openelements.hiero.base.HieroException; import com.openelements.hiero.base.NftClient; import com.openelements.hiero.base.protocol.ProtocolLayerClient; -import com.openelements.hiero.base.protocol.TokenAssociateRequest; -import com.openelements.hiero.base.protocol.TokenBurnRequest; -import com.openelements.hiero.base.protocol.TokenCreateRequest; -import com.openelements.hiero.base.protocol.TokenCreateResult; -import com.openelements.hiero.base.protocol.TokenMintRequest; -import com.openelements.hiero.base.protocol.TokenMintResult; -import com.openelements.hiero.base.protocol.TokenTransferRequest; +import com.openelements.hiero.base.protocol.data.TokenAssociateRequest; +import com.openelements.hiero.base.protocol.data.TokenBurnRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateResult; +import com.openelements.hiero.base.protocol.data.TokenMintRequest; +import com.openelements.hiero.base.protocol.data.TokenMintResult; +import com.openelements.hiero.base.protocol.data.TokenTransferRequest; import java.util.Collections; import java.util.List; import java.util.Objects; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/ProtocolLayerClientImpl.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/ProtocolLayerClientImpl.java index d386e075..f4d32cc3 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/ProtocolLayerClientImpl.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/ProtocolLayerClientImpl.java @@ -39,51 +39,51 @@ import com.openelements.hiero.base.HieroException; import com.openelements.hiero.base.data.Account; import com.openelements.hiero.base.data.ContractParam; -import com.openelements.hiero.base.protocol.AccountBalanceRequest; -import com.openelements.hiero.base.protocol.AccountBalanceResponse; -import com.openelements.hiero.base.protocol.AccountCreateRequest; -import com.openelements.hiero.base.protocol.AccountCreateResult; -import com.openelements.hiero.base.protocol.AccountDeleteRequest; -import com.openelements.hiero.base.protocol.AccountDeleteResult; -import com.openelements.hiero.base.protocol.ContractCallRequest; -import com.openelements.hiero.base.protocol.ContractCallResult; -import com.openelements.hiero.base.protocol.ContractCreateRequest; -import com.openelements.hiero.base.protocol.ContractCreateResult; -import com.openelements.hiero.base.protocol.ContractDeleteRequest; -import com.openelements.hiero.base.protocol.ContractDeleteResult; -import com.openelements.hiero.base.protocol.FileAppendRequest; -import com.openelements.hiero.base.protocol.FileAppendResult; -import com.openelements.hiero.base.protocol.FileContentsRequest; -import com.openelements.hiero.base.protocol.FileContentsResponse; -import com.openelements.hiero.base.protocol.FileCreateRequest; -import com.openelements.hiero.base.protocol.FileCreateResult; -import com.openelements.hiero.base.protocol.FileDeleteRequest; -import com.openelements.hiero.base.protocol.FileDeleteResult; -import com.openelements.hiero.base.protocol.FileInfoRequest; -import com.openelements.hiero.base.protocol.FileInfoResponse; -import com.openelements.hiero.base.protocol.FileUpdateRequest; -import com.openelements.hiero.base.protocol.FileUpdateResult; +import com.openelements.hiero.base.protocol.data.AccountBalanceRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceResponse; +import com.openelements.hiero.base.protocol.data.AccountCreateRequest; +import com.openelements.hiero.base.protocol.data.AccountCreateResult; +import com.openelements.hiero.base.protocol.data.AccountDeleteRequest; +import com.openelements.hiero.base.protocol.data.AccountDeleteResult; +import com.openelements.hiero.base.protocol.data.ContractCallRequest; +import com.openelements.hiero.base.protocol.data.ContractCallResult; +import com.openelements.hiero.base.protocol.data.ContractCreateRequest; +import com.openelements.hiero.base.protocol.data.ContractCreateResult; +import com.openelements.hiero.base.protocol.data.ContractDeleteRequest; +import com.openelements.hiero.base.protocol.data.ContractDeleteResult; +import com.openelements.hiero.base.protocol.data.FileAppendRequest; +import com.openelements.hiero.base.protocol.data.FileAppendResult; +import com.openelements.hiero.base.protocol.data.FileContentsRequest; +import com.openelements.hiero.base.protocol.data.FileContentsResponse; +import com.openelements.hiero.base.protocol.data.FileCreateRequest; +import com.openelements.hiero.base.protocol.data.FileCreateResult; +import com.openelements.hiero.base.protocol.data.FileDeleteRequest; +import com.openelements.hiero.base.protocol.data.FileDeleteResult; +import com.openelements.hiero.base.protocol.data.FileInfoRequest; +import com.openelements.hiero.base.protocol.data.FileInfoResponse; +import com.openelements.hiero.base.protocol.data.FileUpdateRequest; +import com.openelements.hiero.base.protocol.data.FileUpdateResult; import com.openelements.hiero.base.protocol.ProtocolLayerClient; -import com.openelements.hiero.base.protocol.TokenAssociateRequest; -import com.openelements.hiero.base.protocol.TokenAssociateResult; -import com.openelements.hiero.base.protocol.TokenBurnRequest; -import com.openelements.hiero.base.protocol.TokenBurnResult; -import com.openelements.hiero.base.protocol.TokenCreateRequest; -import com.openelements.hiero.base.protocol.TokenCreateResult; -import com.openelements.hiero.base.protocol.TokenMintRequest; -import com.openelements.hiero.base.protocol.TokenMintResult; -import com.openelements.hiero.base.protocol.TokenTransferRequest; -import com.openelements.hiero.base.protocol.TokenTransferResult; -import com.openelements.hiero.base.protocol.TopicCreateRequest; -import com.openelements.hiero.base.protocol.TopicCreateResult; -import com.openelements.hiero.base.protocol.TopicDeleteRequest; -import com.openelements.hiero.base.protocol.TopicDeleteResult; -import com.openelements.hiero.base.protocol.TopicMessageRequest; -import com.openelements.hiero.base.protocol.TopicMessageResult; -import com.openelements.hiero.base.protocol.TopicSubmitMessageRequest; -import com.openelements.hiero.base.protocol.TopicSubmitMessageResult; +import com.openelements.hiero.base.protocol.data.TokenAssociateRequest; +import com.openelements.hiero.base.protocol.data.TokenAssociateResult; +import com.openelements.hiero.base.protocol.data.TokenBurnRequest; +import com.openelements.hiero.base.protocol.data.TokenBurnResult; +import com.openelements.hiero.base.protocol.data.TokenCreateRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateResult; +import com.openelements.hiero.base.protocol.data.TokenMintRequest; +import com.openelements.hiero.base.protocol.data.TokenMintResult; +import com.openelements.hiero.base.protocol.data.TokenTransferRequest; +import com.openelements.hiero.base.protocol.data.TokenTransferResult; +import com.openelements.hiero.base.protocol.data.TopicCreateRequest; +import com.openelements.hiero.base.protocol.data.TopicCreateResult; +import com.openelements.hiero.base.protocol.data.TopicDeleteRequest; +import com.openelements.hiero.base.protocol.data.TopicDeleteResult; +import com.openelements.hiero.base.protocol.data.TopicMessageRequest; +import com.openelements.hiero.base.protocol.data.TopicMessageResult; +import com.openelements.hiero.base.protocol.data.TopicSubmitMessageRequest; +import com.openelements.hiero.base.protocol.data.TopicSubmitMessageResult; import com.openelements.hiero.base.protocol.TransactionListener; -import com.openelements.hiero.base.protocol.TransactionType; +import com.openelements.hiero.base.protocol.data.TransactionType; import java.util.List; import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/SmartContractClientImpl.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/SmartContractClientImpl.java index 1f8673c5..7012a9b4 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/SmartContractClientImpl.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/SmartContractClientImpl.java @@ -8,9 +8,9 @@ import com.openelements.hiero.base.SmartContractClient; import com.openelements.hiero.base.data.ContractCallResult; import com.openelements.hiero.base.data.ContractParam; -import com.openelements.hiero.base.protocol.ContractCallRequest; -import com.openelements.hiero.base.protocol.ContractCreateRequest; -import com.openelements.hiero.base.protocol.ContractCreateResult; +import com.openelements.hiero.base.protocol.data.ContractCallRequest; +import com.openelements.hiero.base.protocol.data.ContractCreateRequest; +import com.openelements.hiero.base.protocol.data.ContractCreateResult; import com.openelements.hiero.base.protocol.ProtocolLayerClient; import java.nio.file.Files; import java.nio.file.Path; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ProtocolLayerClient.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ProtocolLayerClient.java index b9a2882c..1e3387db 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ProtocolLayerClient.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ProtocolLayerClient.java @@ -2,6 +2,48 @@ import com.hedera.hashgraph.sdk.AccountId; import com.openelements.hiero.base.HieroException; +import com.openelements.hiero.base.protocol.data.AccountBalanceRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceResponse; +import com.openelements.hiero.base.protocol.data.AccountCreateRequest; +import com.openelements.hiero.base.protocol.data.AccountCreateResult; +import com.openelements.hiero.base.protocol.data.AccountDeleteRequest; +import com.openelements.hiero.base.protocol.data.AccountDeleteResult; +import com.openelements.hiero.base.protocol.data.ContractCallRequest; +import com.openelements.hiero.base.protocol.data.ContractCallResult; +import com.openelements.hiero.base.protocol.data.ContractCreateRequest; +import com.openelements.hiero.base.protocol.data.ContractCreateResult; +import com.openelements.hiero.base.protocol.data.ContractDeleteRequest; +import com.openelements.hiero.base.protocol.data.ContractDeleteResult; +import com.openelements.hiero.base.protocol.data.FileAppendRequest; +import com.openelements.hiero.base.protocol.data.FileAppendResult; +import com.openelements.hiero.base.protocol.data.FileContentsRequest; +import com.openelements.hiero.base.protocol.data.FileContentsResponse; +import com.openelements.hiero.base.protocol.data.FileCreateRequest; +import com.openelements.hiero.base.protocol.data.FileCreateResult; +import com.openelements.hiero.base.protocol.data.FileDeleteRequest; +import com.openelements.hiero.base.protocol.data.FileDeleteResult; +import com.openelements.hiero.base.protocol.data.FileInfoRequest; +import com.openelements.hiero.base.protocol.data.FileInfoResponse; +import com.openelements.hiero.base.protocol.data.FileUpdateRequest; +import com.openelements.hiero.base.protocol.data.FileUpdateResult; +import com.openelements.hiero.base.protocol.data.TokenAssociateRequest; +import com.openelements.hiero.base.protocol.data.TokenAssociateResult; +import com.openelements.hiero.base.protocol.data.TokenBurnRequest; +import com.openelements.hiero.base.protocol.data.TokenBurnResult; +import com.openelements.hiero.base.protocol.data.TokenCreateRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateResult; +import com.openelements.hiero.base.protocol.data.TokenMintRequest; +import com.openelements.hiero.base.protocol.data.TokenMintResult; +import com.openelements.hiero.base.protocol.data.TokenTransferRequest; +import com.openelements.hiero.base.protocol.data.TokenTransferResult; +import com.openelements.hiero.base.protocol.data.TopicCreateRequest; +import com.openelements.hiero.base.protocol.data.TopicCreateResult; +import com.openelements.hiero.base.protocol.data.TopicDeleteRequest; +import com.openelements.hiero.base.protocol.data.TopicDeleteResult; +import com.openelements.hiero.base.protocol.data.TopicMessageRequest; +import com.openelements.hiero.base.protocol.data.TopicMessageResult; +import com.openelements.hiero.base.protocol.data.TopicSubmitMessageRequest; +import com.openelements.hiero.base.protocol.data.TopicSubmitMessageResult; import org.jspecify.annotations.NonNull; /** diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicMessageResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicMessageResult.java deleted file mode 100644 index 743c8945..00000000 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicMessageResult.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.openelements.hiero.base.protocol; - -public record TopicMessageResult() { -} diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionListener.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionListener.java index 1a16e7fb..8ec57395 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionListener.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionListener.java @@ -2,6 +2,7 @@ import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; +import com.openelements.hiero.base.protocol.data.TransactionType; public interface TransactionListener { diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountBalanceRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountBalanceRequest.java similarity index 94% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountBalanceRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountBalanceRequest.java index 2a1d3016..a97a7975 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountBalanceRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountBalanceRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.AccountId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountBalanceResponse.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountBalanceResponse.java similarity index 92% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountBalanceResponse.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountBalanceResponse.java index 271c8369..d39325b8 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountBalanceResponse.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountBalanceResponse.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import java.util.Objects; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountCreateRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountCreateRequest.java similarity index 96% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountCreateRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountCreateRequest.java index 177df34d..8e2f6d55 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountCreateRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountCreateRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import java.time.Duration; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountCreateResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountCreateResult.java similarity index 96% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountCreateResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountCreateResult.java index 6bc00bf3..61090b8c 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountCreateResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountCreateResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.hedera.hashgraph.sdk.Status; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountDeleteRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountDeleteRequest.java similarity index 97% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountDeleteRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountDeleteRequest.java index c0651647..2e9e6651 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountDeleteRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountDeleteRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.openelements.hiero.base.data.Account; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountDeleteResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountDeleteResult.java similarity index 93% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountDeleteResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountDeleteResult.java index 043df5ac..bd38d3b3 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/AccountDeleteResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/AccountDeleteResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.hedera.hashgraph.sdk.Status; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCallRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCallRequest.java similarity index 98% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCallRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCallRequest.java index c26c56da..b7df1e23 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCallRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCallRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.ContractId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCallResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCallResult.java similarity index 96% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCallResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCallResult.java index 2954958a..ee3b695a 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCallResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCallResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.ContractFunctionResult; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCreateRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCreateRequest.java similarity index 97% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCreateRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCreateRequest.java index 385af289..034a50bc 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCreateRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCreateRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCreateResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCreateResult.java similarity index 92% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCreateResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCreateResult.java index 4985b134..cc9d49cb 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractCreateResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractCreateResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.ContractId; import com.hedera.hashgraph.sdk.Status; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractDeleteRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractDeleteRequest.java similarity index 97% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractDeleteRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractDeleteRequest.java index 2d2718b1..d40163d0 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractDeleteRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractDeleteRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.AccountId; import com.hedera.hashgraph.sdk.ContractId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractDeleteResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractDeleteResult.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractDeleteResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractDeleteResult.java index d5380935..03b300e6 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/ContractDeleteResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/ContractDeleteResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileAppendRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileAppendRequest.java similarity index 97% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileAppendRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileAppendRequest.java index 298ce85a..9c513d28 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileAppendRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileAppendRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileAppendResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileAppendResult.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileAppendResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileAppendResult.java index f4fb6fb1..e92af259 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileAppendResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileAppendResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileContentsRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileContentsRequest.java similarity index 95% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileContentsRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileContentsRequest.java index bbc4076c..d86626d0 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileContentsRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileContentsRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileContentsResponse.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileContentsResponse.java similarity index 88% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileContentsResponse.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileContentsResponse.java index 6f7ff02b..137ca9d6 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileContentsResponse.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileContentsResponse.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import java.util.Objects; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileCreateRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileCreateRequest.java similarity index 96% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileCreateRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileCreateRequest.java index 5baeb1d8..3f8cc1ee 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileCreateRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileCreateRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import java.time.Duration; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileCreateResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileCreateResult.java similarity index 92% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileCreateResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileCreateResult.java index a38d3071..6b01179b 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileCreateResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileCreateResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import com.hedera.hashgraph.sdk.Status; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileDeleteRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileDeleteRequest.java similarity index 94% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileDeleteRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileDeleteRequest.java index 3c37f8ea..8444cfee 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileDeleteRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileDeleteRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileDeleteResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileDeleteResult.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileDeleteResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileDeleteResult.java index ca532e20..e80a5054 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileDeleteResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileDeleteResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileInfoRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileInfoRequest.java similarity index 95% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileInfoRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileInfoRequest.java index d3d9652b..33905a75 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileInfoRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileInfoRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileInfoResponse.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileInfoResponse.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileInfoResponse.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileInfoResponse.java index bee6857a..9976cd89 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileInfoResponse.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileInfoResponse.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import java.time.Instant; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileUpdateRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileUpdateRequest.java similarity index 96% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileUpdateRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileUpdateRequest.java index fe8cad61..816d7fcb 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileUpdateRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileUpdateRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.FileId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileUpdateResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileUpdateResult.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileUpdateResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileUpdateResult.java index a89b3737..8dcd3ee5 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/FileUpdateResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/FileUpdateResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/QueryRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/QueryRequest.java similarity index 71% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/QueryRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/QueryRequest.java index 30179c58..ee52f547 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/QueryRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/QueryRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenAssociateRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenAssociateRequest.java similarity index 96% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenAssociateRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenAssociateRequest.java index 8448512b..9083d660 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenAssociateRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenAssociateRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.AccountId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenAssociateResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenAssociateResult.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenAssociateResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenAssociateResult.java index c56e34eb..d7caddb4 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenAssociateResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenAssociateResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenBurnRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenBurnRequest.java similarity index 97% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenBurnRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenBurnRequest.java index 8531d7ae..050b507e 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenBurnRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenBurnRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.hedera.hashgraph.sdk.PrivateKey; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenBurnResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenBurnResult.java similarity index 91% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenBurnResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenBurnResult.java index f5e530b7..a46fb292 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenBurnResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenBurnResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenCreateRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenCreateRequest.java similarity index 98% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenCreateRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenCreateRequest.java index 5fcaadbd..9181a145 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenCreateRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenCreateRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.AccountId; import com.hedera.hashgraph.sdk.Hbar; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenCreateResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenCreateResult.java similarity index 92% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenCreateResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenCreateResult.java index 24fcf08d..909b0510 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenCreateResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenCreateResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TokenId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenMintRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenMintRequest.java similarity index 98% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenMintRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenMintRequest.java index 4333e8b3..fc3bfada 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenMintRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenMintRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.hedera.hashgraph.sdk.PrivateKey; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenMintResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenMintResult.java similarity index 93% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenMintResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenMintResult.java index 5337bb6f..1385f7aa 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenMintResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenMintResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenTransferRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenTransferRequest.java similarity index 89% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenTransferRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenTransferRequest.java index 5b8aa3bb..09e1065e 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenTransferRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenTransferRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.AccountId; import com.hedera.hashgraph.sdk.Hbar; @@ -46,12 +46,14 @@ public static TokenTransferRequest of(@NonNull final TokenId tokenId, final long public static TokenTransferRequest of(@NonNull final TokenId tokenId, @NonNull final List serials, @NonNull final AccountId sender, @NonNull final AccountId receiver, @NonNull final PrivateKey senderKey) { return new TokenTransferRequest(TransactionRequest.DEFAULT_MAX_TRANSACTION_FEE, - TransactionRequest.DEFAULT_TRANSACTION_VALID_DURATION, tokenId, serials, null, sender, receiver, senderKey); + TransactionRequest.DEFAULT_TRANSACTION_VALID_DURATION, tokenId, serials, null, sender, receiver, + senderKey); } public static TokenTransferRequest of(@NonNull final TokenId tokenId, @NonNull final AccountId sender, - @NonNull final AccountId receiver, @NonNull final PrivateKey senderKey, @NonNull final Long amount) { + @NonNull final AccountId receiver, @NonNull final PrivateKey senderKey, @NonNull final Long amount) { return new TokenTransferRequest(TransactionRequest.DEFAULT_MAX_TRANSACTION_FEE, - TransactionRequest.DEFAULT_TRANSACTION_VALID_DURATION, tokenId, List.of(), amount, sender, receiver, senderKey); + TransactionRequest.DEFAULT_TRANSACTION_VALID_DURATION, tokenId, List.of(), amount, sender, receiver, + senderKey); } } diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenTransferResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenTransferResult.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenTransferResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenTransferResult.java index a41477f8..f1be49b5 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TokenTransferResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TokenTransferResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicCreateRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicCreateRequest.java similarity index 94% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicCreateRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicCreateRequest.java index b7ddcb63..f86ae7af 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicCreateRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicCreateRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import java.time.Duration; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicCreateResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicCreateResult.java similarity index 92% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicCreateResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicCreateResult.java index de1e6058..42cf0914 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicCreateResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicCreateResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TopicId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicDeleteRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicDeleteRequest.java similarity index 93% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicDeleteRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicDeleteRequest.java index 07fe4f59..8b04a873 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicDeleteRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicDeleteRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.hedera.hashgraph.sdk.TopicId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicDeleteResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicDeleteResult.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicDeleteResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicDeleteResult.java index f80fc1d5..dd23cb03 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicDeleteResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicDeleteResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicMessageRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicMessageRequest.java similarity index 95% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicMessageRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicMessageRequest.java index 886387c2..dca2c425 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicMessageRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicMessageRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.hedera.hashgraph.sdk.TopicId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicMessageResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicMessageResult.java new file mode 100644 index 00000000..29781979 --- /dev/null +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicMessageResult.java @@ -0,0 +1,4 @@ +package com.openelements.hiero.base.protocol.data; + +public record TopicMessageResult() { +} diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicSubmitMessageRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicSubmitMessageRequest.java similarity index 96% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicSubmitMessageRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicSubmitMessageRequest.java index d1d39976..257955d6 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicSubmitMessageRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicSubmitMessageRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.hedera.hashgraph.sdk.TopicId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicSubmitMessageResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicSubmitMessageResult.java similarity index 90% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicSubmitMessageResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicSubmitMessageResult.java index 822f8bea..623da8aa 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TopicSubmitMessageResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TopicSubmitMessageResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionRecord.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionRecord.java similarity index 87% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionRecord.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionRecord.java index 55125fa7..fb82a0d0 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionRecord.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionRecord.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import com.hedera.hashgraph.sdk.Status; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionRequest.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionRequest.java similarity index 88% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionRequest.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionRequest.java index 3846dbca..38e086a7 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionRequest.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionRequest.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Hbar; import java.time.Duration; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionResult.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionResult.java similarity index 78% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionResult.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionResult.java index d72789d2..7b6d1f02 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionResult.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionResult.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; import com.hedera.hashgraph.sdk.Status; import com.hedera.hashgraph.sdk.TransactionId; diff --git a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionType.java b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionType.java similarity index 92% rename from hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionType.java rename to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionType.java index e1da2402..042bf9a7 100644 --- a/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/TransactionType.java +++ b/hiero-enterprise-base/src/main/java/com/openelements/hiero/base/protocol/data/TransactionType.java @@ -1,4 +1,4 @@ -package com.openelements.hiero.base.protocol; +package com.openelements.hiero.base.protocol.data; public enum TransactionType { ACCOUNT_CREATE, diff --git a/hiero-enterprise-base/src/main/java/module-info.java b/hiero-enterprise-base/src/main/java/module-info.java index c3cc0298..546a85e2 100644 --- a/hiero-enterprise-base/src/main/java/module-info.java +++ b/hiero-enterprise-base/src/main/java/module-info.java @@ -8,6 +8,7 @@ exports com.openelements.hiero.base.implementation to com.openelements.hiero.base.test; exports com.openelements.hiero.base.implementation.data to com.openelements.hiero.base.test; exports com.openelements.hiero.base.config.implementation; + exports com.openelements.hiero.base.protocol.data; uses com.openelements.hiero.base.config.NetworkSettingsProvider; provides com.openelements.hiero.base.config.NetworkSettingsProvider with com.openelements.hiero.base.config.hedera.HederaNetworkSettingsProvider; diff --git a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/AccountClientImplTest.java b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/AccountClientImplTest.java index 5596276c..2a7641d2 100644 --- a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/AccountClientImplTest.java +++ b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/AccountClientImplTest.java @@ -5,10 +5,10 @@ import com.openelements.hiero.base.data.Account; import com.hedera.hashgraph.sdk.Hbar; import com.openelements.hiero.base.HieroException; -import com.openelements.hiero.base.protocol.AccountBalanceRequest; -import com.openelements.hiero.base.protocol.AccountBalanceResponse; -import com.openelements.hiero.base.protocol.AccountCreateRequest; -import com.openelements.hiero.base.protocol.AccountCreateResult; +import com.openelements.hiero.base.protocol.data.AccountBalanceRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceResponse; +import com.openelements.hiero.base.protocol.data.AccountCreateRequest; +import com.openelements.hiero.base.protocol.data.AccountCreateResult; import com.openelements.hiero.base.protocol.ProtocolLayerClient; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -97,8 +97,8 @@ public void testGetAccountBalance_ProtocolLayerClientFails() throws HieroExcepti }); } -//tests for createAccount method - @Test + //tests for createAccount method + @Test void testCreateAccount_successful() throws HieroException { Hbar initialBalance = Hbar.from(100); @@ -128,12 +128,12 @@ void testCreateAccount_invalidInitialBalance_null() { @Test void testCreateAccount_invalidInitialBalance_negative() { Hbar initialBalance = Hbar.from(-100); - HieroException exception = assertThrows(HieroException.class, - () -> accountClientImpl.createAccount(initialBalance)); - + HieroException exception = assertThrows(HieroException.class, + () -> accountClientImpl.createAccount(initialBalance)); + assertTrue(exception.getMessage().contains("Invalid initial balance")); } - + @Test void testCreateAccount_hieroExceptionThrown() throws HieroException { diff --git a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/FileClientImplTest.java b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/FileClientImplTest.java index 3b32ce7a..4228a406 100644 --- a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/FileClientImplTest.java +++ b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/FileClientImplTest.java @@ -3,16 +3,16 @@ import com.hedera.hashgraph.sdk.FileId; import com.openelements.hiero.base.HieroException; import com.openelements.hiero.base.implementation.FileClientImpl; -import com.openelements.hiero.base.protocol.FileCreateResult; -import com.openelements.hiero.base.protocol.FileCreateRequest; -import com.openelements.hiero.base.protocol.FileUpdateResult; -import com.openelements.hiero.base.protocol.FileUpdateRequest; -import com.openelements.hiero.base.protocol.FileAppendRequest; -import com.openelements.hiero.base.protocol.FileAppendResult; -import com.openelements.hiero.base.protocol.FileInfoRequest; -import com.openelements.hiero.base.protocol.FileInfoResponse; -import com.openelements.hiero.base.protocol.FileContentsRequest; -import com.openelements.hiero.base.protocol.FileContentsResponse; +import com.openelements.hiero.base.protocol.data.FileCreateResult; +import com.openelements.hiero.base.protocol.data.FileCreateRequest; +import com.openelements.hiero.base.protocol.data.FileUpdateResult; +import com.openelements.hiero.base.protocol.data.FileUpdateRequest; +import com.openelements.hiero.base.protocol.data.FileAppendRequest; +import com.openelements.hiero.base.protocol.data.FileAppendResult; +import com.openelements.hiero.base.protocol.data.FileInfoRequest; +import com.openelements.hiero.base.protocol.data.FileInfoResponse; +import com.openelements.hiero.base.protocol.data.FileContentsRequest; +import com.openelements.hiero.base.protocol.data.FileContentsResponse; import com.openelements.hiero.base.protocol.ProtocolLayerClient; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -113,7 +113,7 @@ void testCreateFileThrowsExceptionForExpirationTimeBeforeNow() { final Instant expiration = Instant.now().minusSeconds(1); // then - final IllegalArgumentException exception =Assertions.assertThrows( + final IllegalArgumentException exception = Assertions.assertThrows( IllegalArgumentException.class, () -> fileClientImpl.createFile(contents, expiration) ); Assertions.assertTrue(exception.getMessage().contains(message)); diff --git a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/NftClientImplTest.java b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/NftClientImplTest.java index ee031492..6276ee28 100644 --- a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/NftClientImplTest.java +++ b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/NftClientImplTest.java @@ -7,8 +7,8 @@ import com.openelements.hiero.base.data.Account; import com.openelements.hiero.base.implementation.NftClientImpl; import com.openelements.hiero.base.protocol.ProtocolLayerClient; -import com.openelements.hiero.base.protocol.TokenCreateRequest; -import com.openelements.hiero.base.protocol.TokenCreateResult; +import com.openelements.hiero.base.protocol.data.TokenCreateRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateResult; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -188,7 +188,7 @@ void testCreateNftWithAllParam() throws HieroException { @Test void testCreateNftForNullParam() { Assertions.assertThrows( - NullPointerException.class, () -> nftClientImpl.createNftType((String)null, null) + NullPointerException.class, () -> nftClientImpl.createNftType((String) null, null) ); Assertions.assertThrows( NullPointerException.class, () -> nftClientImpl.createNftType(null, null, (PrivateKey) null) diff --git a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientAccountTests.java b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientAccountTests.java index d4ac24dd..1bd3f415 100644 --- a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientAccountTests.java +++ b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientAccountTests.java @@ -6,11 +6,11 @@ import com.openelements.hiero.base.HieroException; import com.openelements.hiero.base.data.Account; import com.openelements.hiero.base.implementation.ProtocolLayerClientImpl; -import com.openelements.hiero.base.protocol.AccountBalanceRequest; -import com.openelements.hiero.base.protocol.AccountBalanceResponse; -import com.openelements.hiero.base.protocol.AccountCreateRequest; -import com.openelements.hiero.base.protocol.AccountCreateResult; -import com.openelements.hiero.base.protocol.AccountDeleteRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceResponse; +import com.openelements.hiero.base.protocol.data.AccountCreateRequest; +import com.openelements.hiero.base.protocol.data.AccountCreateResult; +import com.openelements.hiero.base.protocol.data.AccountDeleteRequest; import com.openelements.hiero.base.protocol.ProtocolLayerClient; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientTokenTests.java b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientTokenTests.java index a51dd7eb..b0b8462c 100644 --- a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientTokenTests.java +++ b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerClientTokenTests.java @@ -5,11 +5,11 @@ import com.hedera.hashgraph.sdk.TokenType; import com.openelements.hiero.base.implementation.ProtocolLayerClientImpl; import com.openelements.hiero.base.protocol.ProtocolLayerClient; -import com.openelements.hiero.base.protocol.TokenBurnRequest; -import com.openelements.hiero.base.protocol.TokenCreateRequest; -import com.openelements.hiero.base.protocol.TokenCreateResult; -import com.openelements.hiero.base.protocol.TokenMintRequest; -import com.openelements.hiero.base.protocol.TokenMintResult; +import com.openelements.hiero.base.protocol.data.TokenBurnRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateResult; +import com.openelements.hiero.base.protocol.data.TokenMintRequest; +import com.openelements.hiero.base.protocol.data.TokenMintResult; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerDataCreationTests.java b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerDataCreationTests.java index 4dff9894..65380401 100644 --- a/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerDataCreationTests.java +++ b/hiero-enterprise-base/src/test/java/com/openelements/hiero/base/test/ProtocolLayerDataCreationTests.java @@ -14,46 +14,46 @@ import com.hedera.hashgraph.sdk.proto.ContractFunctionResultOrBuilder; import com.openelements.hiero.base.data.Account; import com.openelements.hiero.base.data.ContractParam; -import com.openelements.hiero.base.protocol.AccountBalanceRequest; -import com.openelements.hiero.base.protocol.AccountBalanceResponse; -import com.openelements.hiero.base.protocol.AccountCreateRequest; -import com.openelements.hiero.base.protocol.AccountCreateResult; -import com.openelements.hiero.base.protocol.AccountDeleteRequest; -import com.openelements.hiero.base.protocol.AccountDeleteResult; -import com.openelements.hiero.base.protocol.ContractCallRequest; -import com.openelements.hiero.base.protocol.ContractCallResult; -import com.openelements.hiero.base.protocol.ContractCreateRequest; -import com.openelements.hiero.base.protocol.ContractCreateResult; -import com.openelements.hiero.base.protocol.ContractDeleteRequest; -import com.openelements.hiero.base.protocol.ContractDeleteResult; -import com.openelements.hiero.base.protocol.FileAppendRequest; -import com.openelements.hiero.base.protocol.TokenTransferResult; -import com.openelements.hiero.base.protocol.TopicDeleteResult; -import com.openelements.hiero.base.protocol.TopicCreateResult; -import com.openelements.hiero.base.protocol.TokenMintResult; -import com.openelements.hiero.base.protocol.TokenCreateResult; -import com.openelements.hiero.base.protocol.TokenBurnResult; -import com.openelements.hiero.base.protocol.TokenAssociateResult; -import com.openelements.hiero.base.protocol.FileUpdateResult; -import com.openelements.hiero.base.protocol.FileInfoResponse; -import com.openelements.hiero.base.protocol.FileDeleteResult; -import com.openelements.hiero.base.protocol.FileCreateResult; -import com.openelements.hiero.base.protocol.FileContentsResponse; -import com.openelements.hiero.base.protocol.FileAppendResult; -import com.openelements.hiero.base.protocol.FileContentsRequest; -import com.openelements.hiero.base.protocol.TokenTransferRequest; -import com.openelements.hiero.base.protocol.TokenMintRequest; -import com.openelements.hiero.base.protocol.TokenCreateRequest; -import com.openelements.hiero.base.protocol.TokenBurnRequest; -import com.openelements.hiero.base.protocol.TokenAssociateRequest; -import com.openelements.hiero.base.protocol.FileUpdateRequest; -import com.openelements.hiero.base.protocol.FileInfoRequest; -import com.openelements.hiero.base.protocol.FileDeleteRequest; -import com.openelements.hiero.base.protocol.FileCreateRequest; -import com.openelements.hiero.base.protocol.TopicSubmitMessageResult; -import com.openelements.hiero.base.protocol.TopicSubmitMessageRequest; -import com.openelements.hiero.base.protocol.TopicDeleteRequest; -import com.openelements.hiero.base.protocol.TopicCreateRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceResponse; +import com.openelements.hiero.base.protocol.data.AccountCreateRequest; +import com.openelements.hiero.base.protocol.data.AccountCreateResult; +import com.openelements.hiero.base.protocol.data.AccountDeleteRequest; +import com.openelements.hiero.base.protocol.data.AccountDeleteResult; +import com.openelements.hiero.base.protocol.data.ContractCallRequest; +import com.openelements.hiero.base.protocol.data.ContractCallResult; +import com.openelements.hiero.base.protocol.data.ContractCreateRequest; +import com.openelements.hiero.base.protocol.data.ContractCreateResult; +import com.openelements.hiero.base.protocol.data.ContractDeleteRequest; +import com.openelements.hiero.base.protocol.data.ContractDeleteResult; +import com.openelements.hiero.base.protocol.data.FileAppendRequest; +import com.openelements.hiero.base.protocol.data.TokenTransferResult; +import com.openelements.hiero.base.protocol.data.TopicDeleteResult; +import com.openelements.hiero.base.protocol.data.TopicCreateResult; +import com.openelements.hiero.base.protocol.data.TokenMintResult; +import com.openelements.hiero.base.protocol.data.TokenCreateResult; +import com.openelements.hiero.base.protocol.data.TokenBurnResult; +import com.openelements.hiero.base.protocol.data.TokenAssociateResult; +import com.openelements.hiero.base.protocol.data.FileUpdateResult; +import com.openelements.hiero.base.protocol.data.FileInfoResponse; +import com.openelements.hiero.base.protocol.data.FileDeleteResult; +import com.openelements.hiero.base.protocol.data.FileCreateResult; +import com.openelements.hiero.base.protocol.data.FileContentsResponse; +import com.openelements.hiero.base.protocol.data.FileAppendResult; +import com.openelements.hiero.base.protocol.data.FileContentsRequest; +import com.openelements.hiero.base.protocol.data.TokenTransferRequest; +import com.openelements.hiero.base.protocol.data.TokenMintRequest; +import com.openelements.hiero.base.protocol.data.TokenCreateRequest; +import com.openelements.hiero.base.protocol.data.TokenBurnRequest; +import com.openelements.hiero.base.protocol.data.TokenAssociateRequest; +import com.openelements.hiero.base.protocol.data.FileUpdateRequest; +import com.openelements.hiero.base.protocol.data.FileInfoRequest; +import com.openelements.hiero.base.protocol.data.FileDeleteRequest; +import com.openelements.hiero.base.protocol.data.FileCreateRequest; +import com.openelements.hiero.base.protocol.data.TopicSubmitMessageResult; +import com.openelements.hiero.base.protocol.data.TopicSubmitMessageRequest; +import com.openelements.hiero.base.protocol.data.TopicDeleteRequest; +import com.openelements.hiero.base.protocol.data.TopicCreateRequest; import java.lang.reflect.Constructor; import java.nio.charset.StandardCharsets; @@ -549,10 +549,14 @@ public void testTokenMintResultCreation() { // Then Assertions.assertDoesNotThrow(() -> new TokenMintResult(transactionId, status, serials, totalSupply)); - Assertions.assertThrows(NullPointerException.class, () -> new TokenMintResult(null, status, serials, totalSupply)); - Assertions.assertThrows(NullPointerException.class, () -> new TokenMintResult(transactionId, null, serials, totalSupply)); - Assertions.assertThrows(NullPointerException.class, () -> new TokenMintResult(transactionId, status, null, totalSupply)); - Assertions.assertThrows(NullPointerException.class, () -> new TokenMintResult(transactionId, status, serials, null)); + Assertions.assertThrows(NullPointerException.class, + () -> new TokenMintResult(null, status, serials, totalSupply)); + Assertions.assertThrows(NullPointerException.class, + () -> new TokenMintResult(transactionId, null, serials, totalSupply)); + Assertions.assertThrows(NullPointerException.class, + () -> new TokenMintResult(transactionId, status, null, totalSupply)); + Assertions.assertThrows(NullPointerException.class, + () -> new TokenMintResult(transactionId, status, serials, null)); } @Test @@ -579,7 +583,8 @@ public void testTokenBurnResultCreation() { //Then Assertions.assertDoesNotThrow(() -> new TokenBurnResult(transactionId, status, totalSupply)); Assertions.assertThrows(NullPointerException.class, () -> new TokenBurnResult(null, status, totalSupply)); - Assertions.assertThrows(NullPointerException.class, () -> new TokenBurnResult(transactionId, null, totalSupply)); + Assertions.assertThrows(NullPointerException.class, + () -> new TokenBurnResult(transactionId, null, totalSupply)); Assertions.assertThrows(NullPointerException.class, () -> new TokenBurnResult(transactionId, status, null)); } @@ -685,37 +690,46 @@ void testTokenTransferRequestCreation() { //then Assertions.assertDoesNotThrow( - () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, emptySerials, amount, sender, + () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, emptySerials, + amount, sender, receiver, senderKey)); Assertions.assertDoesNotThrow( - () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, serials, null, sender, + () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, serials, null, + sender, receiver, senderKey)); Assertions.assertDoesNotThrow(() -> TokenTransferRequest.of(tokenId, 1L, sender, receiver, senderKey)); Assertions.assertThrows(NullPointerException.class, - () -> new TokenTransferRequest(null, transactionValidDuration, tokenId, serials, amount, sender, receiver, + () -> new TokenTransferRequest(null, transactionValidDuration, tokenId, serials, amount, sender, + receiver, senderKey)); Assertions.assertThrows(NullPointerException.class, - () -> new TokenTransferRequest(maxTransactionFee, null, tokenId, serials, null, sender, receiver, senderKey)); + () -> new TokenTransferRequest(maxTransactionFee, null, tokenId, serials, null, sender, receiver, + senderKey)); Assertions.assertThrows(NullPointerException.class, () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, null, serials, null, sender, receiver, senderKey)); Assertions.assertThrows(NullPointerException.class, - () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, null, amount, sender, + () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, null, amount, + sender, receiver, senderKey)); Assertions.assertThrows(NullPointerException.class, - () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, serials,null, null, + () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, serials, null, + null, receiver, senderKey)); Assertions.assertThrows(NullPointerException.class, - () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, serials, null, sender, + () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, serials, null, + sender, null, senderKey)); Assertions.assertThrows(NullPointerException.class, - () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, serials, null, sender, + () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, serials, null, + sender, receiver, null)); Assertions.assertThrows(IllegalArgumentException.class, () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, emptySerials, null, sender, receiver, senderKey)); Assertions.assertThrows(IllegalArgumentException.class, - () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, negativeSerials, null, + () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, negativeSerials, + null, sender, receiver, senderKey)); Assertions.assertThrows(NullPointerException.class, () -> new TokenTransferRequest(maxTransactionFee, transactionValidDuration, tokenId, null, null, diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/FileClientTests.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/FileClientTests.java index 0e8b37e7..fd44c7a0 100644 --- a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/FileClientTests.java +++ b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/FileClientTests.java @@ -9,7 +9,7 @@ import java.time.temporal.ChronoUnit; import java.util.stream.IntStream; -import com.openelements.hiero.base.protocol.FileCreateRequest; +import com.openelements.hiero.base.protocol.data.FileCreateRequest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ProtocolLayerClientTests.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ProtocolLayerClientTests.java index 67e68e91..29d01d2b 100644 --- a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ProtocolLayerClientTests.java +++ b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ProtocolLayerClientTests.java @@ -5,23 +5,23 @@ import com.hedera.hashgraph.sdk.Status; import com.openelements.hiero.base.HieroContext; import com.openelements.hiero.base.data.Account; -import com.openelements.hiero.base.protocol.AccountBalanceRequest; -import com.openelements.hiero.base.protocol.AccountBalanceResponse; -import com.openelements.hiero.base.protocol.AccountCreateRequest; -import com.openelements.hiero.base.protocol.AccountCreateResult; -import com.openelements.hiero.base.protocol.AccountDeleteRequest; -import com.openelements.hiero.base.protocol.ContractCreateRequest; -import com.openelements.hiero.base.protocol.ContractCreateResult; -import com.openelements.hiero.base.protocol.FileAppendRequest; -import com.openelements.hiero.base.protocol.FileContentsRequest; -import com.openelements.hiero.base.protocol.FileContentsResponse; -import com.openelements.hiero.base.protocol.FileCreateRequest; -import com.openelements.hiero.base.protocol.FileCreateResult; -import com.openelements.hiero.base.protocol.FileDeleteRequest; -import com.openelements.hiero.base.protocol.FileDeleteResult; -import com.openelements.hiero.base.protocol.FileInfoRequest; -import com.openelements.hiero.base.protocol.FileInfoResponse; -import com.openelements.hiero.base.protocol.FileUpdateRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceRequest; +import com.openelements.hiero.base.protocol.data.AccountBalanceResponse; +import com.openelements.hiero.base.protocol.data.AccountCreateRequest; +import com.openelements.hiero.base.protocol.data.AccountCreateResult; +import com.openelements.hiero.base.protocol.data.AccountDeleteRequest; +import com.openelements.hiero.base.protocol.data.ContractCreateRequest; +import com.openelements.hiero.base.protocol.data.ContractCreateResult; +import com.openelements.hiero.base.protocol.data.FileAppendRequest; +import com.openelements.hiero.base.protocol.data.FileContentsRequest; +import com.openelements.hiero.base.protocol.data.FileContentsResponse; +import com.openelements.hiero.base.protocol.data.FileCreateRequest; +import com.openelements.hiero.base.protocol.data.FileCreateResult; +import com.openelements.hiero.base.protocol.data.FileDeleteRequest; +import com.openelements.hiero.base.protocol.data.FileDeleteResult; +import com.openelements.hiero.base.protocol.data.FileInfoRequest; +import com.openelements.hiero.base.protocol.data.FileInfoResponse; +import com.openelements.hiero.base.protocol.data.FileUpdateRequest; import com.openelements.hiero.base.protocol.ProtocolLayerClient; import com.openelements.hiero.test.HieroTestUtils; import java.nio.charset.StandardCharsets; diff --git a/hiero-enterprise-test/src/main/java/com/openelements/hiero/test/HieroTestUtils.java b/hiero-enterprise-test/src/main/java/com/openelements/hiero/test/HieroTestUtils.java index 1937f0d6..4eaa9cfa 100644 --- a/hiero-enterprise-test/src/main/java/com/openelements/hiero/test/HieroTestUtils.java +++ b/hiero-enterprise-test/src/main/java/com/openelements/hiero/test/HieroTestUtils.java @@ -6,7 +6,7 @@ import com.openelements.hiero.base.mirrornode.MirrorNodeClient; import com.openelements.hiero.base.protocol.ProtocolLayerClient; import com.openelements.hiero.base.protocol.TransactionListener; -import com.openelements.hiero.base.protocol.TransactionType; +import com.openelements.hiero.base.protocol.data.TransactionType; import java.io.Serializable; import java.time.LocalDateTime; import java.util.concurrent.atomic.AtomicReference;