optional params

Author: hendrikebbers

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

@@ -72,11 +72,8 @@ private HederaNetwork getHederaNetwork() {
         if (networkConfiguration == null) {
             throw new IllegalStateException("network value is null");
         }
-        final String networkName = networkConfiguration.getName();
-        if (networkName == null) {
-            throw new IllegalStateException("networkName is null");
-        }
-        return HederaNetwork.findByName(networkName)
+        return networkConfiguration.getName()
+                .map(n -> HederaNetwork.findByName(n).orElse(HederaNetwork.CUSTOM))
                 .orElse(HederaNetwork.CUSTOM);
     }
 
@@ -89,11 +86,15 @@ private Client createClient() {
             networkConfiguration.getNodes()
                     .forEach(node -> nodes.put(node.ip() + ":" + node.port(), AccountId.fromString(node.account())));
             Client client = Client.forNetwork(nodes);
-            try {
-                client.setMirrorNetwork(List.of(networkConfiguration.getMirrornode()));
-            } catch (InterruptedException e) {
-                throw new RuntimeException("Error setting mirror network", e);
-            }
+            networkConfiguration.getMirrornode()
+                    .map(mirrorNode -> List.of(mirrorNode))
+                    .ifPresent(mirrorNodes -> {
+                        try {
+                            client.setMirrorNetwork(mirrorNodes);
+                        } catch (InterruptedException e) {
+                            throw new RuntimeException("Error setting mirror network", e);
+                        }
+                    });
             client.setOperator(accountId, privateKey);
             return client;
         } else {

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

@@ -2,9 +2,9 @@
 
 import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.eclipse.microprofile.config.inject.ConfigProperties;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
@@ -15,28 +15,28 @@ public class HieroNetworkConfiguration {
     public record Node(String ip, String port, String account) {
     }
 
-    private String name;
+    private Optional<String> name;
 
     @Inject
-    @ConfigProperty(name = "nodes", defaultValue = " ") //TODO: We need a better default value
-    private String[] nodes;
+    @ConfigProperty(name = "nodes")
+    private Optional<Set<String>> nodes;
 
-    @ConfigProperty(name = "mirrornode", defaultValue = " ") //TODO: We need a better default value
-    private String mirrornode;
+    @ConfigProperty(name = "mirrornode")
+    private Optional<String> mirrornode;
 
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
-    public String getMirrornode() {
+    public Optional<String> getMirrornode() {
         return mirrornode;
     }
 
     public Set<Node> getNodes() {
-        if (nodes == null) {
+        if (!nodes.isPresent()) {
             return Set.of();
         }
-        return Stream.of(nodes)
+        return nodes.get().stream()
                 .map(n -> {
                     // 172.234.134.4:8080:0.0.3
                     final String[] split = n.split(":");