tests fixed

Author: hendrikebbers

hiero-enterprise-bom/pom.xml

@@ -49,6 +49,12 @@
         <groupId>com.hedera.hashgraph</groupId>
         <artifactId>sdk</artifactId>
         <version>${hedera.sdk-version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>

hiero-spring/src/main/java/com/openelements/hiero/spring/implementation/HieroAutoConfiguration.java

@@ -47,7 +47,6 @@ HieroConfig hieroConfig(final HieroProperties properties) {
     }
 
     @Bean
-    @ApplicationScope
     HieroNetwork hieroNetwork(final HieroConfig hieroConfig) {
         return hieroConfig.getNetwork();
     }

hiero-spring/src/test/java/com/openelements/hiero/spring/test/NftRepositoryTests.java

@@ -3,12 +3,13 @@
 import com.hedera.hashgraph.sdk.AccountId;
 import com.hedera.hashgraph.sdk.PrivateKey;
 import com.hedera.hashgraph.sdk.TokenId;
-import com.openelements.hiero.base.data.Account;
 import com.openelements.hiero.base.AccountClient;
-import com.openelements.hiero.base.data.Nft;
+import com.openelements.hiero.base.HieroContext;
 import com.openelements.hiero.base.NftClient;
-import com.openelements.hiero.base.mirrornode.NftRepository;
+import com.openelements.hiero.base.data.Account;
+import com.openelements.hiero.base.data.Nft;
 import com.openelements.hiero.base.data.Page;
+import com.openelements.hiero.base.mirrornode.NftRepository;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +36,7 @@ public class NftRepositoryTests {
     private AccountClient accountClient;
 
     @Autowired
-    private Account operatorAccount;
+    private HieroContext hieroContext;
 
     private <T> List<T> getAll(Page<T> page) {
         if (!page.isFirst()) {
@@ -163,8 +164,8 @@ void findByAccountId() throws Exception {
         final byte[] metadata2 = "https://example.com/metadata2".getBytes(StandardCharsets.UTF_8);
         final TokenId tokenId = nftClient.createNftType(name, symbol);
         final List<Long> serial = nftClient.mintNfts(tokenId, metadata1, metadata2);
-        final AccountId adminAccountId = operatorAccount.accountId();
-        final PrivateKey adminAccountPrivateKey = operatorAccount.privateKey();
+        final AccountId adminAccountId = hieroContext.getOperatorAccount().accountId();
+        final PrivateKey adminAccountPrivateKey = hieroContext.getOperatorAccount().privateKey();
         final Account account = accountClient.createAccount();
         final AccountId newOwner = account.accountId();
         final PrivateKey newOwnerPrivateKey = account.privateKey();
@@ -204,7 +205,7 @@ void findByAccountIdForSomePages() throws Exception {
             final int start = i;
             final int end = Math.min(i + transferBatchSize, metadata.size());
             final List<Long> serial = nftClient.mintNfts(tokenId, metadata.subList(start, end).toArray(new byte[0][]));
-            nftClient.transferNfts(tokenId, serial, operatorAccount, newOwnerId);
+            nftClient.transferNfts(tokenId, serial, hieroContext.getOperatorAccount(), newOwnerId);
         }
         hieroTestUtils.waitForMirrorNodeRecords();
 
@@ -249,8 +250,8 @@ void findByTokenIdAndAccountId() throws Exception {
         final byte[] metadata2 = "https://example.com/metadata2".getBytes(StandardCharsets.UTF_8);
         final TokenId tokenId = nftClient.createNftType(name, symbol);
         final List<Long> serial = nftClient.mintNfts(tokenId, metadata1, metadata2);
-        final AccountId adminAccountId = operatorAccount.accountId();
-        final PrivateKey adminAccountPrivateKey = operatorAccount.privateKey();
+        final AccountId adminAccountId = hieroContext.getOperatorAccount().accountId();
+        final PrivateKey adminAccountPrivateKey = hieroContext.getOperatorAccount().privateKey();
         final Account account = accountClient.createAccount();
         final AccountId newOwner = account.accountId();
         final PrivateKey newOwnerPrivateKey = account.privateKey();
@@ -289,7 +290,7 @@ void findByTokenIdAndAccountIdForSomePages() throws Exception {
             final int start = i;
             final int end = Math.min(i + transferBatchSize, metadata.size());
             final List<Long> serial = nftClient.mintNfts(tokenId, metadata.subList(start, end).toArray(new byte[0][]));
-            nftClient.transferNfts(tokenId, serial, operatorAccount, newOwnerId);
+            nftClient.transferNfts(tokenId, serial, hieroContext.getOperatorAccount(), newOwnerId);
         }
         hieroTestUtils.waitForMirrorNodeRecords();
 
@@ -369,8 +370,8 @@ void findByTokenIdAndAccountIdAndSerial() throws Exception {
         final byte[] metadata = "https://example.com/metadata1".getBytes(StandardCharsets.UTF_8);
         final TokenId tokenId = nftClient.createNftType(name, symbol);
         final long serial = nftClient.mintNft(tokenId, metadata);
-        final AccountId adminAccountId = operatorAccount.accountId();
-        final PrivateKey adminAccountPrivateKey = operatorAccount.privateKey();
+        final AccountId adminAccountId = hieroContext.getOperatorAccount().accountId();
+        final PrivateKey adminAccountPrivateKey = hieroContext.getOperatorAccount().privateKey();
         final Account account = accountClient.createAccount();
         final AccountId newOwner = account.accountId();
         final PrivateKey newOwnerPrivateKey = account.privateKey();

hiero-spring/src/test/java/com/openelements/hiero/spring/test/ProtocolLayerClientTests.java

@@ -3,6 +3,7 @@
 import com.hedera.hashgraph.sdk.FileId;
 import com.hedera.hashgraph.sdk.Hbar;
 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;
@@ -37,15 +38,16 @@ public class ProtocolLayerClientTests {
     private ProtocolLayerClient protocolLayerClient;
 
     @Autowired
-    private Account adminAccount;
+    private HieroContext hieroContext;
 
     @Autowired
     private HieroTestUtils hieroTestUtils;
 
     @Test
     void testGetBalance() throws Exception {
         //given
-        final AccountBalanceRequest accountBalanceRequest = AccountBalanceRequest.of(adminAccount.accountId());
+        final AccountBalanceRequest accountBalanceRequest = AccountBalanceRequest.of(
+                hieroContext.getOperatorAccount().accountId());
 
         //when
         final AccountBalanceResponse accountBalanceResult = protocolLayerClient.executeAccountBalanceQuery(