Merge pull request #6 from vsbogd/fix-npe-on-no-contract-addresses

Fix NPE when no contract addresses is set in configuration

Author: vsbogd

docs/class-diagram.plantuml

@@ -97,8 +97,8 @@ package io.singularitynet.sdk.client {
         SignerType getSignerType();
         String getSignerMnemonic();
         byte[] getSignerPrivateKey();
-        Address getRegistryAddress();
-        Address getMultiPartyEscrowAddress();
+        Optional<Address> getRegistryAddress();
+        Optional<Address> getMultiPartyEscrowAddress();
     }
 
     class JsonConfiguration

docs/class-diagram.svg

@@ -1,6 +1,7 @@
 package io.singularitynet.sdk.client;
 
 import java.net.URL;
+import java.util.Optional;
 
 import io.singularitynet.sdk.ethereum.Address;
 import io.singularitynet.sdk.ethereum.Signer;
@@ -17,7 +18,7 @@ static enum SignerType {
     SignerType getSignerType();
     String getSignerMnemonic();
     byte[] getSignerPrivateKey();
-    Address getRegistryAddress();
-    Address getMultiPartyEscrowAddress();
+    Optional<Address> getRegistryAddress();
+    Optional<Address> getMultiPartyEscrowAddress();
 
 }

sdk/src/main/java/io/singularitynet/sdk/client/Configuration.java

@@ -60,15 +60,19 @@ public ConfigurationDependencyFactory(Configuration config) {
                 // TODO: add unit test on prefix adding
                 web3j, signer.getAddress().toString());
 
-        Address registryAddress = config.getRegistryAddress();
-        if (registryAddress == null) {
+        Address registryAddress;
+        if (config.getRegistryAddress().isPresent()) {
+            registryAddress = config.getRegistryAddress().get();
+        } else {
             registryAddress = ContractUtils.readContractAddress(networkId, "Registry");
         }
         this.registry = Registry.load(registryAddress.toString(), web3j,
                 transactionManager, gasProvider);
 
-        Address mpeAddress = config.getMultiPartyEscrowAddress();
-        if (mpeAddress == null) {
+        Address mpeAddress;
+        if (config.getMultiPartyEscrowAddress().isPresent()) {
+            mpeAddress = config.getMultiPartyEscrowAddress().get();
+        } else {
             mpeAddress = ContractUtils.readContractAddress(networkId, "MultiPartyEscrow");
         }
         this.mpe = MultiPartyEscrow.load(mpeAddress.toString(), web3j,

sdk/src/main/java/io/singularitynet/sdk/client/ConfigurationDependencyFactory.java

@@ -1,6 +1,7 @@
 package io.singularitynet.sdk.client;
 
 import java.net.URL;
+import java.util.Optional;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.FieldNamingPolicy;
@@ -59,13 +60,19 @@ public byte[] getSignerPrivateKey() {
     }
 
     @Override
-    public Address getRegistryAddress() {
-        return new Address(registryAddress);
+    public Optional<Address> getRegistryAddress() {
+        if (registryAddress == null) {
+            return Optional.<Address>empty();
+        }
+        return Optional.of(new Address(registryAddress));
     }
 
     @Override
-    public Address getMultiPartyEscrowAddress() {
-        return new Address(multiPartyEscrowAddress);
+    public Optional<Address> getMultiPartyEscrowAddress() {
+        if (multiPartyEscrowAddress == null) {
+            return Optional.<Address>empty();
+        }
+        return Optional.of(new Address(multiPartyEscrowAddress));
     }
 
 }

sdk/src/main/java/io/singularitynet/sdk/client/JsonConfiguration.java

@@ -5,6 +5,7 @@
 
 import java.net.URL;
 import java.net.MalformedURLException;
+import java.util.Optional;
 
 import io.singularitynet.sdk.common.Utils;
 import io.singularitynet.sdk.ethereum.Address;
@@ -59,7 +60,16 @@ public void configureRegistryAddress() {
 
         Configuration config = new JsonConfiguration(json);
 
-        assertEquals("Registry address", new Address(registryAddress), config.getRegistryAddress());
+        assertEquals("Registry address", Optional.of(new Address(registryAddress)), config.getRegistryAddress());
+    }
+
+    @Test
+    public void configureDefaultRegistryAddress() {
+        String json = "{}";
+
+        Configuration config = new JsonConfiguration(json);
+
+        assertEquals("Registry address", Optional.<Address>empty(), config.getRegistryAddress());
     }
 
     @Test
@@ -71,7 +81,16 @@ public void configureMultiPartyEscrowAddress() {
 
         Configuration config = new JsonConfiguration(json);
 
-        assertEquals("MultiPartyEscrow address", new Address(mpeAddress), config.getMultiPartyEscrowAddress());
+        assertEquals("MultiPartyEscrow address", Optional.of(new Address(mpeAddress)), config.getMultiPartyEscrowAddress());
+    }
+
+    @Test
+    public void configureDefaultMultiPartyEscrowAddress() {
+        String json = "{}";
+
+        Configuration config = new JsonConfiguration(json);
+
+        assertEquals("MultiPartyEscrow address", Optional.<Address>empty(), config.getMultiPartyEscrowAddress());
     }
 
 }