TokenClient -> FungibleTokenClient

Signed-off-by: Hendrik Ebbers <[email protected]>

Author: hendrikebbers

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

@@ -15,7 +15,7 @@
  * Hiero network. That account is the account that is used to pay for the transactions that are sent to the Hedera
  * network and called 'operator account'.
  */
-public interface NftClient {
+public interface NftClient extends TokenClient {
 
     /**
      * Create a new NFT type. That type is 'owned' by the operator account. The operator account is used as suppler

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

@@ -9,6 +9,7 @@
 import com.openelements.hiero.base.data.NetworkStake;
 import com.openelements.hiero.base.data.NetworkSupplies;
 import com.openelements.hiero.base.data.Nft;
+import com.openelements.hiero.base.data.NftMetadata;
 import com.openelements.hiero.base.mirrornode.MirrorNodeClient;
 import java.util.List;
 import java.util.Objects;
@@ -66,4 +67,10 @@ final Optional<NetworkSupplies> queryNetworkSupplies() throws HieroException {
         final JSON json = getRestClient().queryNetworkSupplies();
         return getJsonConverter().toNetworkSupplies(json);
     }
+
+    @Override
+    public @NonNull Optional<NftMetadata> getNftMetadata(TokenId tokenId) throws HieroException {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
 }

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

@@ -1,6 +1,6 @@
 package com.openelements.hiero.base.implementation;
 
-import com.openelements.hiero.base.TokenClient;
+import com.openelements.hiero.base.FungibleTokenClient;
 import com.hedera.hashgraph.sdk.AccountId;
 import com.hedera.hashgraph.sdk.PrivateKey;
 import com.hedera.hashgraph.sdk.TokenId;
@@ -12,12 +12,12 @@
 
 import java.util.Objects;
 
-public class TokenClientImpl implements TokenClient {
+public class FungibleTokenClientImpl implements FungibleTokenClient {
     private final ProtocolLayerClient client;
 
     private final Account operationalAccount;
 
-    public TokenClientImpl(@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");
     }

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

@@ -238,7 +238,7 @@ default Optional<AccountInfo> queryAccount(@NonNull String accountId) throws Hie
     Optional<NetworkSupplies> queryNetworkSupplies() throws HieroException;
 
     @NonNull
-    NftMetadata getNftMetadata(TokenId tokenId) throws HieroException;
+    Optional<NftMetadata> getNftMetadata(TokenId tokenId) throws HieroException;
 
     @NonNull
     Page<NftMetadata> findNftTypesByOwner(AccountId ownerId);

…base/implementation/TokenClientImpl.java …lementation/FungibleTokenClientImpl.javahiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/TokenClientImpl.java renamed to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FungibleTokenClientImpl.java hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/TokenClientImpl.java renamed to hiero-enterprise-base/src/main/java/com/openelements/hiero/base/implementation/FungibleTokenClientImpl.java

@@ -64,11 +64,6 @@ public MirrorNodeClientImpl(MirrorNodeRestClient<JsonObject> restClient,
         throw new RuntimeException("Not implemented");
     }
 
-    @Override
-    public @NonNull NftMetadata getNftMetadata(TokenId tokenId) throws HieroException {
-        throw new RuntimeException("Not implemented");
-    }
-
     @Override
     public @NonNull Page<NftMetadata> findNftTypesByOwner(AccountId ownerId) {
         throw new RuntimeException("Not implemented");

hiero-enterprise-base/src/main/java/com/openelements/hiero/base/mirrornode/MirrorNodeClient.java

@@ -2,18 +2,18 @@
 
 import com.openelements.hiero.base.AccountClient;
 import com.openelements.hiero.base.FileClient;
+import com.openelements.hiero.base.FungibleTokenClient;
 import com.openelements.hiero.base.HieroContext;
 import com.openelements.hiero.base.NftClient;
-import com.openelements.hiero.base.TokenClient;
 import com.openelements.hiero.base.SmartContractClient;
 import com.openelements.hiero.base.config.HieroConfig;
 import com.openelements.hiero.base.implementation.AccountClientImpl;
 import com.openelements.hiero.base.implementation.AccountRepositoryImpl;
 import com.openelements.hiero.base.implementation.FileClientImpl;
+import com.openelements.hiero.base.implementation.FungibleTokenClientImpl;
 import com.openelements.hiero.base.implementation.HieroNetwork;
 import com.openelements.hiero.base.implementation.NetworkRepositoryImpl;
 import com.openelements.hiero.base.implementation.NftClientImpl;
-import com.openelements.hiero.base.implementation.TokenClientImpl;
 import com.openelements.hiero.base.implementation.NftRepositoryImpl;
 import com.openelements.hiero.base.implementation.ProtocolLayerClientImpl;
 import com.openelements.hiero.base.implementation.SmartContractClientImpl;
@@ -85,8 +85,8 @@ NftClient nftClient(final ProtocolLayerClient protocolLayerClient, HieroContext
     }
 
     @Bean
-    TokenClient tokenClient(final ProtocolLayerClient protocolLayerClient, HieroContext hieroContext) {
-        return new TokenClientImpl(protocolLayerClient, hieroContext.getOperatorAccount());
+    FungibleTokenClient tokenClient(final ProtocolLayerClient protocolLayerClient, HieroContext hieroContext) {
+        return new FungibleTokenClientImpl(protocolLayerClient, hieroContext.getOperatorAccount());
     }
 
     @Bean

hiero-enterprise-microprofile/src/main/java/com/openelements/hiero/microprofile/implementation/MirrorNodeClientImpl.java

@@ -95,11 +95,6 @@ public Optional<TransactionInfo> queryTransaction(@NonNull final String transact
         return Optional.of(new TransactionInfo(transactionId));
     }
 
-    @Override
-    public @NonNull NftMetadata getNftMetadata(TokenId tokenId) throws HieroException {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
     @Override
     public @NonNull Page<NftMetadata> findNftTypesByOwner(AccountId ownerId) {
         throw new UnsupportedOperationException("Not yet implemented");

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

@@ -4,16 +4,17 @@
 import com.openelements.hiero.base.data.Account;
 import com.openelements.hiero.base.AccountClient;
 import com.openelements.hiero.base.HieroException;
-import com.openelements.hiero.base.TokenClient;
+import com.openelements.hiero.base.FungibleTokenClient;
 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)
-public class TokenClientTest {
+public class FungibleTokenClientTest {
+
     @Autowired
-    private TokenClient tokenClient;
+    private FungibleTokenClient tokenClient;
 
     @Autowired
     private AccountClient accountClient;