feat: support ports that are not well known for use with port forwarding

sdk/src/main/java/com/hedera/hashgraph/sdk/BaseNodeAddress.java

@@ -40,6 +40,7 @@ class BaseNodeAddress {
     @Nullable
     private final String address;
     private final int port;
+    private final boolean secure;
 
     /**
      * Constructor.
@@ -49,9 +50,22 @@ class BaseNodeAddress {
      * @param port                      the port part
      */
     public BaseNodeAddress(@Nullable String name, @Nullable String address, int port) {
+        this(name, address, port, false);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param name                      the name part
+     * @param address                   the address part
+     * @param port                      the port part
+     * @param secure                    secure transport
+     */
+    public BaseNodeAddress(@Nullable String name, @Nullable String address, int port, boolean secure) {
         this.name = name;
         this.address = address;
         this.port = port;
+        this.secure = secure;
     }
 
     /**
@@ -118,7 +132,7 @@ public boolean isInProcess() {
      * @return                          are we secure
      */
     public boolean isTransportSecurity() {
-        return port == PORT_NODE_TLS || port == PORT_MIRROR_TLS;
+        return port == PORT_NODE_TLS || port == PORT_MIRROR_TLS || secure;
     }
 
     /**
@@ -128,7 +142,7 @@ public boolean isTransportSecurity() {
      */
     public BaseNodeAddress toInsecure() {
         var newPort = (this.port == PORT_NODE_TLS) ? PORT_NODE_PLAIN : this.port;
-        return new BaseNodeAddress(name, address, newPort);
+        return new BaseNodeAddress(name, address, newPort, false);
     }
 
     /**
@@ -138,7 +152,7 @@ public BaseNodeAddress toInsecure() {
      */
     public BaseNodeAddress toSecure() {
         var newPort = (this.port == PORT_NODE_PLAIN) ? PORT_NODE_TLS : this.port;
-        return new BaseNodeAddress(name, address, newPort);
+        return new BaseNodeAddress(name, address, newPort, true);
     }
 
     @Override

sdk/src/main/java/com/hedera/hashgraph/sdk/Client.java

@@ -19,9 +19,6 @@
  */
 package com.hedera.hashgraph.sdk;
 
-import static com.hedera.hashgraph.sdk.BaseNodeAddress.PORT_NODE_PLAIN;
-import static com.hedera.hashgraph.sdk.BaseNodeAddress.PORT_NODE_TLS;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.gson.Gson;
@@ -469,10 +466,7 @@ void untrackSubscription(SubscriptionHandle subscriptionHandle) {
      */
     public synchronized Client setNetworkFromAddressBook(NodeAddressBook addressBook, boolean updateAddressBook)
         throws InterruptedException, TimeoutException {
-        network.setNetwork(Network.addressBookToNetwork(
-            addressBook.nodeAddresses,
-            isTransportSecurity() ? PORT_NODE_TLS : PORT_NODE_PLAIN
-        ));
+        network.setNetwork(Network.addressBookToNetwork(addressBook.nodeAddresses));
         if (updateAddressBook) {
             network.setAddressBook(addressBook);
         }

sdk/src/main/java/com/hedera/hashgraph/sdk/Network.java

@@ -22,10 +22,6 @@
 import com.google.common.io.ByteStreams;
 import com.google.errorprone.annotations.Var;
 import com.google.protobuf.ByteString;
-
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,6 +31,9 @@
 import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 
 /**
  * Internal utility class.
@@ -83,9 +82,7 @@ static Network forNetwork(ExecutorService executor, Map<String, AccountId> netwo
     static Network forMainnet(ExecutorService executor) {
         var addressBook = getAddressBookForLedger(LedgerId.MAINNET);
         HashMap<String, AccountId> network = addressBookToNetwork(
-            Objects.requireNonNull(addressBook).values(),
-            BaseNodeAddress.PORT_NODE_PLAIN
-        );
+            Objects.requireNonNull(addressBook).values());
         return new Network(executor, network).setLedgerIdInternal(LedgerId.MAINNET, addressBook);
     }
 
@@ -98,9 +95,7 @@ static Network forMainnet(ExecutorService executor) {
     static Network forTestnet(ExecutorService executor) {
         var addressBook = getAddressBookForLedger(LedgerId.TESTNET);
         HashMap<String, AccountId> network = addressBookToNetwork(
-            Objects.requireNonNull(addressBook).values(),
-            BaseNodeAddress.PORT_NODE_PLAIN
-        );
+            Objects.requireNonNull(addressBook).values());
         return new Network(executor, network).setLedgerIdInternal(LedgerId.TESTNET, addressBook);
     }
 
@@ -113,9 +108,7 @@ static Network forTestnet(ExecutorService executor) {
     static Network forPreviewnet(ExecutorService executor) {
         var addressBook = getAddressBookForLedger(LedgerId.PREVIEWNET);
         HashMap<String, AccountId> network = addressBookToNetwork(
-            Objects.requireNonNull(addressBook).values(),
-            BaseNodeAddress.PORT_NODE_PLAIN
-        );
+            Objects.requireNonNull(addressBook).values());
         return new Network(executor, network).setLedgerIdInternal(LedgerId.PREVIEWNET, addressBook);
     }
 
@@ -205,13 +198,11 @@ private static Map<AccountId, NodeAddress> getAddressBookForLedger(@Nullable Led
             readAddressBookResource("addressbook/" + ledgerId + ".pb");
     }
 
-    static HashMap<String, AccountId> addressBookToNetwork(Collection<NodeAddress> addressBook, int desiredPort) {
+    static HashMap<String, AccountId> addressBookToNetwork(Collection<NodeAddress> addressBook) {
         var network = new HashMap<String, AccountId>();
         for (var nodeAddress : addressBook) {
             for (var endpoint : nodeAddress.addresses) {
-                if (endpoint.port == desiredPort) {
                     network.put(endpoint.toString(), nodeAddress.accountId);
-                }
             }
         }
         return network;