Fix MESH ProxyConfiguration (#58)

Author: jared2501

service-config/src/main/java/com/palantir/remoting/api/config/service/ProxyConfiguration.java

@@ -76,6 +76,7 @@ public Type type() {
     @Value.Check
     protected final void check() {
         switch (type()) {
+            case MESH:
             case HTTP:
                 Preconditions.checkArgument(hostAndPort().isPresent(), "host-and-port must be "
                         + "configured for an HTTP proxy");
@@ -92,16 +93,24 @@ protected final void check() {
         }
 
         if (credentials().isPresent()) {
-            Preconditions.checkArgument(type() == Type.HTTP, "credentials only valid for http proxies");
+            Preconditions.checkArgument(type() == Type.HTTP, "credentials only valid for HTTP proxies");
         }
     }
 
     public static ProxyConfiguration of(String hostAndPort) {
-        return new ProxyConfiguration.Builder().hostAndPort(hostAndPort).build();
+        return builder().hostAndPort(hostAndPort).build();
     }
 
     public static ProxyConfiguration of(String hostAndPort, BasicCredentials credentials) {
-        return new ProxyConfiguration.Builder().hostAndPort(hostAndPort).credentials(credentials).build();
+        return builder().hostAndPort(hostAndPort).credentials(credentials).build();
+    }
+
+    public static ProxyConfiguration mesh(String hostAndPort) {
+        return builder().type(Type.MESH).hostAndPort(hostAndPort).build();
+    }
+
+    public static Builder builder() {
+        return new Builder();
     }
 
     // TODO(jnewman): #317 - remove kebab-case methods when Jackson 2.7 is picked up

service-config/src/test/java/com/palantir/remoting/api/config/service/ProxyConfigurationTests.java

@@ -60,7 +60,15 @@ public void testDeserializationDirect() throws Exception {
     }
 
     @Test
-    public void testDirectProxyWithHostAndPort() {
+    public void testDeserializationMesh() throws Exception {
+        URL resource = Resources.getResource("configs/proxy-config-mesh.yml");
+        ProxyConfiguration config = mapper.readValue(resource, ProxyConfiguration.class);
+        assertEquals(config,
+                ProxyConfiguration.builder().type(ProxyConfiguration.Type.MESH).hostAndPort("localhost:123").build());
+    }
+
+    @Test
+    public void testNonHttpProxyWithHostAndPort() {
         assertThatThrownBy(() -> new ProxyConfiguration.Builder()
                 .hostAndPort("squid:3128")
                 .type(ProxyConfiguration.Type.DIRECT)
@@ -69,6 +77,23 @@ public void testDirectProxyWithHostAndPort() {
                 .hasMessage("Neither credential nor host-and-port may be configured for DIRECT proxies");
     }
 
+    @Test
+    public void credentialsWithNonHttp() {
+        assertThatThrownBy(() -> ProxyConfiguration.builder()
+                .credentials(BasicCredentials.of("foo", "bar"))
+                .type(ProxyConfiguration.Type.DIRECT)
+                .build())
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Neither credential nor host-and-port may be configured for DIRECT proxies");
+        assertThatThrownBy(() -> ProxyConfiguration.builder()
+                .type(ProxyConfiguration.Type.MESH)
+                .credentials(BasicCredentials.of("foo", "bar"))
+                .hostAndPort("localhost:1234")
+                .build())
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("credentials only valid for HTTP proxies");
+    }
+
     @Test
     public void serDe() throws Exception {
         ProxyConfiguration config = ProxyConfiguration.of("host:80", BasicCredentials.of("username", "password"));

service-config/src/test/resources/configs/proxy-config-mesh.yml

@@ -0,0 +1,2 @@
+type: MESH
+hostAndPort: localhost:123