logging

Author: hendrikebbers

hedera-microprofile/src/main/java/com/openelements/hedera/microprofile/ClientProvider.java

@@ -18,10 +18,10 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import org.eclipse.microprofile.config.inject.ConfigProperties;
 import org.jspecify.annotations.NonNull;
 
@@ -82,9 +82,8 @@ private Client createClient() {
         final PrivateKey privateKey = getPrivateKey();
         final HederaNetwork hederaNetwork = getHederaNetwork();
         if (Objects.equals(HederaNetwork.CUSTOM, hederaNetwork)) {
-            final Map<String, AccountId> nodes = new HashMap<>();
-            networkConfiguration.getNodes()
-                    .forEach(node -> nodes.put(node.ip() + ":" + node.port(), AccountId.fromString(node.account())));
+            final Map<String, AccountId> nodes = networkConfiguration.getNodes()
+                    .stream().collect(Collectors.toMap(n -> n.getAddress(), n -> n.getAccountId()));
             Client client = Client.forNetwork(nodes);
             networkConfiguration.getMirrornode()
                     .map(mirrorNode -> List.of(mirrorNode))

hedera-microprofile/src/main/java/com/openelements/hedera/microprofile/HieroNetworkConfiguration.java

@@ -1,5 +1,6 @@
 package com.openelements.hedera.microprofile;
 
+import com.hedera.hashgraph.sdk.AccountId;
 import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
 import java.util.Optional;
@@ -14,6 +15,14 @@
 public class HieroNetworkConfiguration {
 
     public record Node(String ip, String port, String account) {
+
+        String getAddress() {
+            return ip + ":" + port;
+        }
+
+        AccountId getAccountId() {
+            return AccountId.fromString(account);
+        }
     }
 
     private Optional<String> name;

hedera-microprofile/src/test/java/com/openelements/hedera/microprofile/test/TestConfigSource.java

@@ -3,6 +3,7 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.slf4j.Logger;
@@ -36,14 +37,16 @@ public TestConfigSource() {
         final String hederaNetwork = System.getenv("HEDERA_NETWORK");
         if (hederaNetwork != null) {
             properties.put("hiero.network.name", hederaNetwork);
-            //TODO: Hardcoded for Solo tests,should be fixed later
-            if (hederaNetwork == "solo") {
-                properties.put("hiero.network.nodes", "127.0.0.1:50211:0.0.3");
-                properties.put("hiero.network.mirrornode", "http://localhost:8080");
-            }
         } else {
             properties.put("hiero.network.name", Dotenv.load().get("hedera.network.name"));
         }
+
+        //TODO: Hardcoded for Solo tests,should be fixed later
+        if (Objects.equals(properties.get("hiero.network.name"), "solo")) {
+            properties.put("hiero.network.nodes", "127.0.0.1:50211:0.0.3");
+            properties.put("hiero.network.mirrornode", "http://localhost:8080");
+        }
+
         properties.forEach((k, v) -> log.info("CONFIG: '" + k + "'->'" + v + "'"));
     }