Improvement rationalise shared (#432)

* Move callbacks used to handle checked exception and FileDelegate
used to make it easier to test IO operations into shared module.

* Ignore generated files

.gitignore

@@ -11,4 +11,6 @@
 /**/.idea/
 
 # Mac files
-.DS_Store
+.DS_Store
+/config/*.pub
+/config/*.key

config-cli/src/test/java/com/quorum/tessera/config/cli/CliDelegateTest.java

@@ -1,29 +1,31 @@
 package com.quorum.tessera.config.cli;
 
 import com.quorum.tessera.test.util.ElUtil;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import javax.validation.ConstraintViolationException;
 import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
 public class CliDelegateTest {
-    
-    private final CliDelegate instance =  CliDelegate.INSTANCE;
-    
+
+    private final CliDelegate instance = CliDelegate.INSTANCE;
+
     @Test
     public void createInstance() {
-  
-      assertThat(CliDelegate.instance()).isSameAs(instance);
-      
+
+        assertThat(CliDelegate.instance()).isSameAs(instance);
+
     }
 
-     @Test
+    @Test
     public void withValidConfig() throws Exception {
-        
+
         Path configFile = ElUtil.createAndPopulatePaths(getClass().getResource("/sample-config.json"));
-        
+
         CliResult result = instance.execute(
-            "-configfile",
-            configFile.toString());
+                "-configfile",
+                configFile.toString());
 
         assertThat(result).isNotNull();
         assertThat(result.getConfig()).isPresent();
@@ -32,6 +34,28 @@ public void withValidConfig() throws Exception {
         assertThat(result.isHelpOn()).isFalse();
         assertThat(result.isKeyGenOn()).isFalse();
     }
-
+
+    @Test
+    public void withEmptyConfigOverrideAll() throws Exception {
+
+        Path unixSocketFile = Files.createTempFile("unixSocketFile", ".ipc");
+        unixSocketFile.toFile().deleteOnExit();
+
+        Path configFile = Files.createTempFile("withEmptyConfigOverrideAll", ".json");
+        configFile.toFile().deleteOnExit();
+        Files.write(configFile, "{}".getBytes());
+        try {
+            CliResult result = instance.execute(
+                    "-configfile",
+                    configFile.toString(),
+                    "--unixSocketFile",
+                    unixSocketFile.toString()
+            );
+
+            assertThat(result).isNotNull();
+        } catch (ConstraintViolationException ex) {
+            ex.getConstraintViolations().forEach(System.out::println);
+        }
+    }
 
 }

config-migration/src/main/java/com/quorum/tessera/config/migration/TomlConfigFactory.java

@@ -4,7 +4,6 @@
 import com.quorum.tessera.config.ArgonOptions;
 import com.quorum.tessera.config.KeyDataConfig;
 import com.quorum.tessera.config.SslAuthenticationMode;
-import com.quorum.tessera.config.*;
 import com.quorum.tessera.config.builder.ConfigBuilder;
 import com.quorum.tessera.config.builder.JdbcConfigFactory;
 import com.quorum.tessera.config.builder.KeyDataBuilder;
@@ -153,7 +152,6 @@ static List<KeyDataConfig> createPrivateKeyData(List<String> privateKeys, List<S
 
         List<KeyDataConfig> privateKeyData = IntStream
                 .range(0, privateKeyJson.size())
-                //FIXME: Canyt set to null value.. need to use addNull("password")
                 .mapToObj(i -> {
 
                     final String password = passwordList.get(i);

config/217391d4-bdd1-4bd3-9364-1335d9522ba9.key

@@ -0,0 +1,6 @@
+{
+   "type" : "unlocked",
+   "data" : {
+      "bytes" : "cHJpdmF0ZUtleQ=="
+   }
+}

config/217391d4-bdd1-4bd3-9364-1335d9522ba9.pub

@@ -0,0 +1 @@
+cHVibGljS2V5

config/pom.xml

@@ -43,7 +43,12 @@
             <artifactId>test-util</artifactId>
             <scope>test</scope>
         </dependency>
-
+
+        <dependency>
+            <groupId>com.quorum.tessera</groupId>
+            <artifactId>shared</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.quorum.tessera</groupId>
             <artifactId>argon2</artifactId>

config/src/main/java/com/quorum/tessera/config/adapters/KeyConfigurationAdapter.java

@@ -1,7 +1,7 @@
 package com.quorum.tessera.config.adapters;
 
 import com.quorum.tessera.config.*;
-import com.quorum.tessera.config.util.FilesDelegate;
+import com.quorum.tessera.io.FilesDelegate;
 import com.quorum.tessera.config.util.JaxbUtil;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;

config/src/main/java/com/quorum/tessera/config/adapters/KeyDataAdapter.java

@@ -6,8 +6,8 @@
 import com.quorum.tessera.config.PrivateKeyType;
 import com.quorum.tessera.config.keys.KeyEncryptor;
 import com.quorum.tessera.config.keys.KeyEncryptorFactory;
-import com.quorum.tessera.config.util.FilesDelegate;
-import com.quorum.tessera.config.util.IOCallback;
+import com.quorum.tessera.io.FilesDelegate;
+import com.quorum.tessera.io.IOCallback;
 import com.quorum.tessera.config.util.JaxbUtil;
 import com.quorum.tessera.nacl.NaclException;
 import org.slf4j.Logger;

config/src/main/java/com/quorum/tessera/config/constraints/KeyDataValidator.java

@@ -1,7 +1,7 @@
 package com.quorum.tessera.config.constraints;
 
 import com.quorum.tessera.config.KeyData;
-import com.quorum.tessera.config.util.FilesDelegate;
+import com.quorum.tessera.io.FilesDelegate;
 import java.util.ArrayList;
 import java.util.List;
 import javax.validation.ConstraintValidator;

config/src/main/java/com/quorum/tessera/config/constraints/PathValidator.java

@@ -1,6 +1,6 @@
 package com.quorum.tessera.config.constraints;
 
-import com.quorum.tessera.config.util.FilesDelegate;
+import com.quorum.tessera.io.FilesDelegate;
 import java.io.UncheckedIOException;
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;

config/src/main/java/com/quorum/tessera/config/keys/KeyGeneratorFactory.java

@@ -1,6 +1,6 @@
 package com.quorum.tessera.config.keys;
 
-import com.quorum.tessera.config.ServiceLoaderUtil;
+import com.quorum.tessera.ServiceLoaderUtil;
 
 
 public interface KeyGeneratorFactory {

config/src/main/java/com/quorum/tessera/config/keys/KeyGeneratorImpl.java

@@ -1,7 +1,7 @@
 package com.quorum.tessera.config.keys;
 
 import com.quorum.tessera.config.*;
-import com.quorum.tessera.config.util.IOCallback;
+import com.quorum.tessera.io.IOCallback;
 import com.quorum.tessera.config.util.JaxbUtil;
 import com.quorum.tessera.config.util.PasswordReader;
 import com.quorum.tessera.nacl.KeyPair;

config/src/main/java/com/quorum/tessera/config/util/JaxbUtil.java

@@ -1,5 +1,6 @@
 package com.quorum.tessera.config.util;
 
+import com.quorum.tessera.io.IOCallback;
 import com.quorum.tessera.config.*;
 import java.io.ByteArrayOutputStream;
 

config/src/test/java/com/quorum/tessera/config/adapters/KeyConfigurationAdapterTest.java

@@ -1,7 +1,7 @@
 package com.quorum.tessera.config.adapters;
 
 import com.quorum.tessera.config.*;
-import com.quorum.tessera.config.util.FilesDelegate;
+import com.quorum.tessera.io.FilesDelegate;
 import org.junit.Before;
 import org.junit.Test;
 

config/src/test/java/com/quorum/tessera/config/adapters/KeyDataAdapterTest.java

@@ -13,7 +13,7 @@
 import java.nio.file.Paths;
 
 import static com.quorum.tessera.config.PrivateKeyType.UNLOCKED;
-import com.quorum.tessera.config.util.FilesDelegate;
+import com.quorum.tessera.io.FilesDelegate;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;

config/src/test/java/com/quorum/tessera/config/constraints/KeyDataValidatorTest.java

@@ -1,7 +1,7 @@
 package com.quorum.tessera.config.constraints;
 
 import com.quorum.tessera.config.KeyData;
-import com.quorum.tessera.config.util.FilesDelegate;
+import com.quorum.tessera.io.FilesDelegate;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collections;

config/src/test/java/com/quorum/tessera/config/constraints/PathValidatorTest.java

@@ -1,6 +1,6 @@
 package com.quorum.tessera.config.constraints;
 
-import com.quorum.tessera.config.util.FilesDelegate;
+import com.quorum.tessera.io.FilesDelegate;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;

data-migration/pom.xml

@@ -11,6 +11,12 @@
 
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.quorum.tessera</groupId>
+            <artifactId>shared</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>