Merge branch 'main' into token-client-ext

hendrikebbers · web-flow · commit 5d06df849350 · 2025-05-03T00:56:41.000-07:00
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/AccountRepositoryTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/AccountRepositoryTest.java
@@ -12,7 +12,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class AccountRepositoryTest {
 
     @Autowired
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ContractServiceTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ContractServiceTest.java
@@ -19,7 +19,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class ContractServiceTest {
 
     @Autowired
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ContractVerificationClientImplementationTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ContractVerificationClientImplementationTest.java
@@ -15,7 +15,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 class ContractVerificationClientImplementationTest {
 
     @Autowired
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
@@ -3,20 +3,18 @@
 import com.hedera.hashgraph.sdk.FileId;
 import com.openelements.hiero.base.FileClient;
 import com.openelements.hiero.base.HieroException;
-
+import com.openelements.hiero.base.protocol.data.FileCreateRequest;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.stream.IntStream;
-
-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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class FileClientTests {
 
     @Autowired
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/FungibleTokenClientTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/FungibleTokenClientTest.java
@@ -1,18 +1,18 @@
 package com.openelements.hiero.spring.test;
 
 import com.hedera.hashgraph.sdk.TokenId;
-import com.openelements.hiero.base.data.Account;
 import com.openelements.hiero.base.AccountClient;
-import com.openelements.hiero.base.HieroException;
 import com.openelements.hiero.base.FungibleTokenClient;
+import com.openelements.hiero.base.HieroException;
+import com.openelements.hiero.base.data.Account;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.List;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class FungibleTokenClientTest {
 
     @Autowired
@@ -178,6 +178,6 @@ void transferToken() throws HieroException {
 
         long totalSupply = tokenClient.mintToken(tokenId, 1L);
 
-        Assertions.assertDoesNotThrow(() -> tokenClient.transferToken(tokenId,  toAccount.accountId(), totalSupply));
+        Assertions.assertDoesNotThrow(() -> tokenClient.transferToken(tokenId, toAccount.accountId(), totalSupply));
     }
 }
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/HieroTestConfig.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/HieroTestConfig.java
@@ -11,7 +11,7 @@
 @EnableHiero
 @SpringBootConfiguration
 @ComponentScan
-public class TestConfig {
+public class HieroTestConfig {
 
     @Bean
     HieroTestUtils hieroTestUtils(MirrorNodeClient mirrorNodeClient, ProtocolLayerClient protocolLayerClient) {
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/NetworkRepositoryTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/NetworkRepositoryTest.java
@@ -1,11 +1,11 @@
 package com.openelements.hiero.spring.test;
 
 import com.openelements.hiero.base.HieroException;
-import com.openelements.hiero.base.mirrornode.NetworkRepository;
 import com.openelements.hiero.base.data.ExchangeRates;
 import com.openelements.hiero.base.data.NetworkFee;
 import com.openelements.hiero.base.data.NetworkStake;
 import com.openelements.hiero.base.data.NetworkSupplies;
+import com.openelements.hiero.base.mirrornode.NetworkRepository;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.Assertions;
@@ -14,7 +14,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class NetworkRepositoryTest {
     @Autowired
     private NetworkRepository networkRepository;
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/NftClientTests.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/NftClientTests.java
@@ -3,10 +3,10 @@
 import com.hedera.hashgraph.sdk.AccountId;
 import com.hedera.hashgraph.sdk.PrivateKey;
 import com.hedera.hashgraph.sdk.TokenId;
-import com.openelements.hiero.base.HieroException;
-import com.openelements.hiero.base.data.Account;
 import com.openelements.hiero.base.AccountClient;
+import com.openelements.hiero.base.HieroException;
 import com.openelements.hiero.base.NftClient;
+import com.openelements.hiero.base.data.Account;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Set;
@@ -17,7 +17,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class NftClientTests {
 
     @Autowired
@@ -42,7 +42,7 @@ void createNftType() throws Exception {
     @Test
     void testCreateNftForNullParam() {
         Assertions.assertThrows(
-                NullPointerException.class, () -> nftClient.createNftType((String)null, null)
+                NullPointerException.class, () -> nftClient.createNftType((String) null, null)
         );
         Assertions.assertThrows(
                 NullPointerException.class, () -> nftClient.createNftType(null, null, (PrivateKey) null)
@@ -275,7 +275,7 @@ void burnNft() throws HieroException {
         final List<Long> serial = nftClient.mintNfts(tokenId, metadata1, metadata2);
 
         Assertions.assertDoesNotThrow(() -> nftClient.burnNft(tokenId, serial.get(0)));
-        Assertions.assertDoesNotThrow(() -> nftClient.burnNft(tokenId, serial.get(1),supplierAccount.privateKey()));
+        Assertions.assertDoesNotThrow(() -> nftClient.burnNft(tokenId, serial.get(1), supplierAccount.privateKey()));
     }
 
     @Test
@@ -290,7 +290,8 @@ void burnNfts() throws HieroException {
         final List<Long> serials = nftClient.mintNfts(tokenId, metadata1, metadata2);
 
         Assertions.assertDoesNotThrow(() -> nftClient.burnNfts(tokenId, Set.of(serials.get(0))));
-        Assertions.assertDoesNotThrow(() -> nftClient.burnNfts(tokenId, Set.of(serials.get(1)),supplierAccount.privateKey()));
+        Assertions.assertDoesNotThrow(
+                () -> nftClient.burnNfts(tokenId, Set.of(serials.get(1)), supplierAccount.privateKey()));
     }
 
     @Test
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/NftRepositoryTests.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/NftRepositoryTests.java
@@ -21,7 +21,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class NftRepositoryTests {
 
     @Autowired
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
@@ -5,6 +5,7 @@
 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.ProtocolLayerClient;
 import com.openelements.hiero.base.protocol.data.AccountBalanceRequest;
 import com.openelements.hiero.base.protocol.data.AccountBalanceResponse;
 import com.openelements.hiero.base.protocol.data.AccountCreateRequest;
@@ -22,7 +23,6 @@
 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;
 import java.nio.file.Files;
@@ -33,7 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class ProtocolLayerClientTests {
 
     @Autowired
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ServicesTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/ServicesTest.java
@@ -1,15 +1,15 @@
 package com.openelements.hiero.spring.test;
 
-import com.openelements.hiero.base.verification.ContractVerificationClient;
 import com.openelements.hiero.base.FileClient;
 import com.openelements.hiero.base.SmartContractClient;
 import com.openelements.hiero.base.protocol.ProtocolLayerClient;
+import com.openelements.hiero.base.verification.ContractVerificationClient;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class ServicesTest {
 
     @Autowired
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/SmartContractDatatypesTests.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/SmartContractDatatypesTests.java
@@ -18,7 +18,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class SmartContractDatatypesTests {
 
     @Autowired
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/TokenRepositoryTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/TokenRepositoryTest.java
@@ -8,21 +8,20 @@
 import com.openelements.hiero.base.FungibleTokenClient;
 import com.openelements.hiero.base.HieroException;
 import com.openelements.hiero.base.NftClient;
-import com.openelements.hiero.base.data.Token;
-import com.openelements.hiero.base.data.TokenInfo;
-import com.openelements.hiero.base.data.Balance;
 import com.openelements.hiero.base.data.Account;
+import com.openelements.hiero.base.data.Balance;
 import com.openelements.hiero.base.data.Page;
+import com.openelements.hiero.base.data.Token;
+import com.openelements.hiero.base.data.TokenInfo;
 import com.openelements.hiero.base.mirrornode.TokenRepository;
 import com.openelements.hiero.test.HieroTestUtils;
+import java.util.Optional;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.util.Optional;
-
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class TokenRepositoryTest {
     @Autowired
     private TokenRepository tokenRepository;
@@ -42,11 +41,12 @@ public class TokenRepositoryTest {
     @Test
     void testNullParam() {
         Assertions.assertThrows(NullPointerException.class, () -> tokenRepository.findByAccount((String) null));
-        Assertions.assertThrows(NullPointerException.class, () -> tokenRepository.findById((String)null));
-        Assertions.assertThrows(NullPointerException.class, () -> tokenRepository.getBalances((String)null));
+        Assertions.assertThrows(NullPointerException.class, () -> tokenRepository.findById((String) null));
+        Assertions.assertThrows(NullPointerException.class, () -> tokenRepository.getBalances((String) null));
         Assertions.assertThrows(NullPointerException.class, () -> tokenRepository.getBalancesForAccount(null, "1.2.3"));
         Assertions.assertThrows(NullPointerException.class, () -> tokenRepository.getBalancesForAccount("1.2.3", null));
-        Assertions.assertThrows(NullPointerException.class, () -> tokenRepository.getBalancesForAccount((String)null, null));
+        Assertions.assertThrows(NullPointerException.class,
+                () -> tokenRepository.getBalancesForAccount((String) null, null));
     }
 
     @Test
@@ -102,7 +102,6 @@ void testQueryTokenById() throws HieroException {
         final Optional<TokenInfo> fungiToken = tokenRepository.findById(fungiTokenId);
         final Optional<TokenInfo> nftToken = tokenRepository.findById(nftTokenId);
 
-
         // then
         Assertions.assertTrue(fungiToken.isPresent());
         Assertions.assertEquals(name, fungiToken.get().name());
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/TopicClientTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/TopicClientTest.java
@@ -9,7 +9,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class TopicClientTest {
     @Autowired
     private TopicClient topicClient;
@@ -198,4 +198,4 @@ void testSubmitMessageThrowExceptionFroInvalidId() {
         final PrivateKey submitKey = PrivateKey.generateECDSA();
         Assertions.assertThrows(HieroException.class, () -> topicClient.submitMessage(topicId, submitKey, message));
     }
- }
+}
diff --git a/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/TransactionRepositoryTest.java b/hiero-enterprise-spring/src/test/java/com/openelements/hiero/spring/test/TransactionRepositoryTest.java
@@ -4,21 +4,20 @@
 import com.openelements.hiero.base.AccountClient;
 import com.openelements.hiero.base.HieroException;
 import com.openelements.hiero.base.data.Account;
+import com.openelements.hiero.base.data.BalanceModification;
 import com.openelements.hiero.base.data.Page;
 import com.openelements.hiero.base.data.Result;
-import com.openelements.hiero.base.data.BalanceModification;
 import com.openelements.hiero.base.data.TransactionInfo;
 import com.openelements.hiero.base.mirrornode.TransactionRepository;
 import com.openelements.hiero.base.protocol.data.TransactionType;
 import com.openelements.hiero.test.HieroTestUtils;
+import java.util.List;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import java.util.List;
-
-@SpringBootTest(classes = TestConfig.class)
+@SpringBootTest(classes = HieroTestConfig.class)
 public class TransactionRepositoryTest {
     @Autowired
     private TransactionRepository transactionRepository;
