Split rest endpoints and improve modularisation

.travis.yml

@@ -42,11 +42,6 @@ jobs:
       install: *build_no_checks
       script: mvn verify -pl tests/acceptance-test -P reduce-logging || travis_terminate 1
 
-    - name: "GRPC Only Acceptance Tests"
-      jdk:  oraclejdk8
-      install: *build_no_checks
-      script: mvn verify -pl tests/acceptance-test -P grpc-acceptance-tests,reduce-logging -o || travis_terminate 1
-
     - name: "Simple Only Acceptance Tests"
       jdk:  oraclejdk8
       install: *build_no_checks

config/src/main/java/com/quorum/tessera/config/AppType.java

@@ -7,9 +7,9 @@
 import java.util.stream.Collectors;
 
 public enum AppType {
-    P2P(CommunicationType.GRPC, CommunicationType.REST),
+    P2P(CommunicationType.REST, CommunicationType.GRPC),
 
-    Q2T(CommunicationType.GRPC, CommunicationType.REST),
+    Q2T(CommunicationType.REST, CommunicationType.GRPC),
 
     @XmlEnumValue("ThirdParty")
     THIRD_PARTY(CommunicationType.REST),

config/src/main/java/com/quorum/tessera/config/CommunicationType.java

@@ -1,7 +1,8 @@
 package com.quorum.tessera.config;
 
 public enum CommunicationType {
-    REST, 
-    GRPC, 
-    WEB_SOCKET;
+    REST,
+    WEB_SOCKET,
+    @Deprecated
+    GRPC;
 }

config/src/main/java/com/quorum/tessera/config/ServerConfig.java

@@ -19,6 +19,8 @@ public class ServerConfig extends ConfigItem {
     @XmlElement(required = true)
     private AppType app;
 
+    //TODO: Remove this nobody asked for it
+    @Deprecated
     @NotNull
     @XmlElement(required = true)
     private boolean enabled;
@@ -36,9 +38,9 @@ public class ServerConfig extends ConfigItem {
     private InfluxConfig influxConfig;
 
     @ValidServerAddress(
-        message = "Binding Address is invalid",
-        isBindingAddress = true,
-        supportedSchemes = {"http", "https"}
+            message = "Binding Address is invalid",
+            isBindingAddress = true,
+            supportedSchemes = {"http", "https"}
     )
     @XmlElement
     private String bindingAddress;
@@ -50,14 +52,14 @@ public class ServerConfig extends ConfigItem {
 
     @XmlElement(name = "cors")
     private CrossDomainConfig crossDomainConfig;
-    
+
     public ServerConfig(final AppType app,
-                        final boolean enabled,
-                        final String serverAddress,
-                        final CommunicationType communicationType,
-                        final SslConfig sslConfig,
-                        final InfluxConfig influxConfig,
-                        final String bindingAddress) {
+            final boolean enabled,
+            final String serverAddress,
+            final CommunicationType communicationType,
+            final SslConfig sslConfig,
+            final InfluxConfig influxConfig,
+            final String bindingAddress) {
         this.app = app;
         this.enabled = enabled;
         this.serverAddress = serverAddress;
@@ -103,10 +105,14 @@ public void setApp(AppType app) {
         this.app = app;
     }
 
+    //TODO: Remove this nobody asked for it
+    @Deprecated
     public boolean isEnabled() {
         return enabled;
     }
 
+    //TODO: Remove this nobody asked for it
+    @Deprecated
     public void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }

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

@@ -60,9 +60,10 @@ public void isValidWhenValidDataIsSupplied() {
     }
 
     @Test
-    public void testInvalidCommTypeForApp() {
-        serverConfig.setApp(AppType.THIRD_PARTY);
-        serverConfig.setCommunicationType(CommunicationType.GRPC);
+    public void unsupportedCommunicationType() {
+
+        serverConfig.setCommunicationType(CommunicationType.WEB_SOCKET);
+
         assertThat(validator.isValid(serverConfig, cvc)).isFalse();
         verify(cvc).disableDefaultConstraintViolation();
         verify(cvc).buildConstraintViolationWithTemplate(anyString());

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

@@ -9,22 +9,18 @@
 
 import javax.validation.ConstraintValidatorContext;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
 
 public class ServerConfigsValidatorTest {
 
-    private List<ServerConfig> serverConfigs;
-
-    private ServerConfig p2pServerConfig;
-
-    private ServerConfig q2tServerConfig;
-
-    private ServerConfig thirdPartyServerConfig;
+    private Map<AppType, ServerConfig> serverConfigs = new HashMap<>();
 
     private ConstraintValidatorContext cvc;
 
@@ -33,28 +29,25 @@ public class ServerConfigsValidatorTest {
     @Before
     public void onSetUp() {
         cvc = mock(ConstraintValidatorContext.class);
-        p2pServerConfig = new ServerConfig();
-        p2pServerConfig.setApp(AppType.P2P);
-        p2pServerConfig.setEnabled(true);
-        p2pServerConfig.setServerAddress("localhost:123");
-        p2pServerConfig.setCommunicationType(CommunicationType.REST);
-        p2pServerConfig.setSslConfig(null);
-        p2pServerConfig.setInfluxConfig(null);
-        p2pServerConfig.setBindingAddress(null);
-
-        q2tServerConfig = new ServerConfig(AppType.Q2T, true,
-            "localhost:1234", CommunicationType.REST,
-            null, null, null);
-        thirdPartyServerConfig = new ServerConfig(AppType.THIRD_PARTY, true,
-            "localhost:12345", CommunicationType.REST,
-            null, null, null);
-
-        serverConfigs = new ArrayList<>(Arrays.asList(p2pServerConfig, q2tServerConfig, thirdPartyServerConfig));
+
+        for (AppType appType : AppType.values()) {
+
+            ServerConfig serverConfig = new ServerConfig();
+            serverConfig.setApp(appType);
+            serverConfig.setEnabled(true);
+            serverConfig.setServerAddress("localhost:123");
+            serverConfig.setCommunicationType(CommunicationType.REST);
+            serverConfig.setSslConfig(null);
+            serverConfig.setInfluxConfig(null);
+            serverConfig.setBindingAddress(null);
+
+            serverConfigs.put(appType, serverConfig);
+        }
 
         validator = new ServerConfigsValidator();
 
         when(cvc.buildConstraintViolationWithTemplate(anyString()))
-            .thenReturn(mock(ConstraintValidatorContext.ConstraintViolationBuilder.class));
+                .thenReturn(mock(ConstraintValidatorContext.ConstraintViolationBuilder.class));
     }
 
     @After
@@ -69,47 +62,58 @@ public void isValidWhenServerConfigsIsNull() {
 
     @Test
     public void isValidWhenValidDataIsSupplied() {
-        thirdPartyServerConfig.setEnabled(false);
-        assertThat(validator.isValid(serverConfigs, cvc)).isTrue();
+        List<ServerConfig> serverConfigList = serverConfigList();
+
+        assertThat(validator.isValid(serverConfigList, cvc)).isTrue();
     }
 
     @Test
     public void isNotValidWhenNoP2PServersAreEnabled() {
-        p2pServerConfig.setEnabled(false);
-        assertThat(validator.isValid(serverConfigs, cvc)).isFalse();
+
+        serverConfigs.get(AppType.P2P).setEnabled(false);
+
+        assertThat(validator.isValid(serverConfigList(), cvc)).isFalse();
         verify(cvc).disableDefaultConstraintViolation();
         verify(cvc).buildConstraintViolationWithTemplate(eq("Only one P2P server must be configured and enabled."));
     }
 
     @Test
     public void isNotValidWhenNoP2PServersAreDefined() {
-        serverConfigs.remove(p2pServerConfig);
-        assertThat(validator.isValid(serverConfigs, cvc)).isFalse();
+        List<ServerConfig> serverConfigList =
+                serverConfigList().stream().filter(s -> s.getApp() != AppType.P2P).collect(Collectors.toList());
+        assertThat(validator.isValid(serverConfigList, cvc)).isFalse();
         verify(cvc).disableDefaultConstraintViolation();
         verify(cvc).buildConstraintViolationWithTemplate(eq("Only one P2P server must be configured and enabled."));
     }
 
     @Test
     public void isNotValidWhenTwoOrMoreP2PServersAreDefinedAndEnabled() {
-        serverConfigs.add(p2pServerConfig);
-        assertThat(validator.isValid(serverConfigs, cvc)).isFalse();
+        List<ServerConfig> serverConfigList = serverConfigList();
+        serverConfigList.add(serverConfigs.get(AppType.P2P));
+        assertThat(validator.isValid(serverConfigList, cvc)).isFalse();
         verify(cvc).disableDefaultConstraintViolation();
         verify(cvc).buildConstraintViolationWithTemplate(eq("Only one P2P server must be configured and enabled."));
     }
 
     @Test
     public void isNotValidWhenNoQ2TServersAreEnabled() {
-        q2tServerConfig.setEnabled(false);
-        assertThat(validator.isValid(serverConfigs, cvc)).isFalse();
+        serverConfigs.get(AppType.Q2T).setEnabled(false);
+        assertThat(validator.isValid(serverConfigList(), cvc)).isFalse();
         verify(cvc).disableDefaultConstraintViolation();
         verify(cvc).buildConstraintViolationWithTemplate(eq("At least one Q2T server must be configured and enabled."));
     }
 
     @Test
     public void isNotValidWhenNoQ2TServersAreDefined() {
-        serverConfigs.remove(q2tServerConfig);
-        assertThat(validator.isValid(serverConfigs, cvc)).isFalse();
+        List<ServerConfig> serverConfigList =
+                serverConfigList().stream().filter(s -> s.getApp() != AppType.Q2T).collect(Collectors.toList());
+
+        assertThat(validator.isValid(serverConfigList, cvc)).isFalse();
         verify(cvc).disableDefaultConstraintViolation();
         verify(cvc).buildConstraintViolationWithTemplate(eq("At least one Q2T server must be configured and enabled."));
     }
+
+    private List<ServerConfig> serverConfigList() {
+        return new ArrayList<>(serverConfigs.values());
+    }
 }

enclave/enclave-jaxrs/pom.xml

@@ -164,6 +164,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.2</version>
                 <configuration>
                     <excludes>
                         <exclude>logback-enclave.xml</exclude>