CoordinateClient (#170)

src/main/java/com/orbitz/consul/Consul.java

@@ -45,12 +45,13 @@ public class Consul {
     private final SessionClient sessionClient;
     private final EventClient eventClient;
     private final PreparedQueryClient preparedQueryClient;
+    private final CoordinateClient coordinateClient;
 
     /**
      * Private constructor.
      *
      */
-    private Consul(AgentClient agentClient, HealthClient healthClient, KeyValueClient keyValueClient, CatalogClient catalogClient, StatusClient statusClient, SessionClient sessionClient, EventClient eventClient, PreparedQueryClient preparedQueryClient) {
+    private Consul(AgentClient agentClient, HealthClient healthClient, KeyValueClient keyValueClient, CatalogClient catalogClient, StatusClient statusClient, SessionClient sessionClient, EventClient eventClient, PreparedQueryClient preparedQueryClient, CoordinateClient coordinateClient) {
         this.agentClient = agentClient;
         this.healthClient = healthClient;
         this.keyValueClient = keyValueClient;
@@ -59,6 +60,7 @@ private Consul(AgentClient agentClient, HealthClient healthClient, KeyValueClien
         this.sessionClient = sessionClient;
         this.eventClient = eventClient;
         this.preparedQueryClient = preparedQueryClient;
+        this.coordinateClient = coordinateClient;
     }
 
 
@@ -151,6 +153,17 @@ public PreparedQueryClient preparedQueryClient() {
         return preparedQueryClient;
     }
 
+    /**
+     * Get the Coordinate HTTP client.
+     * <p>
+     * /v1/coordinate
+     *
+     * @return The Coordinate HTTP client.
+     */
+    public CoordinateClient coordinateClient() {
+        return coordinateClient;
+    }
+
     /**
      * Creates a new {@link Builder} object.
      *
@@ -399,11 +412,12 @@ public Consul build() {
             SessionClient sessionClient = new SessionClient(retrofit);
             EventClient eventClient = new EventClient(retrofit);
             PreparedQueryClient preparedQueryClient = new PreparedQueryClient(retrofit);
+            CoordinateClient coordinateClient = new CoordinateClient(retrofit);
 
             if (ping) {
                 agentClient.ping();
             }
-            return new Consul(agentClient, healthClient, keyValueClient, catalogClient, statusClient, sessionClient, eventClient, preparedQueryClient);
+            return new Consul(agentClient, healthClient, keyValueClient, catalogClient, statusClient, sessionClient, eventClient, preparedQueryClient, coordinateClient);
         }
 
         private String buildUrl(URL url) {

src/main/java/com/orbitz/consul/CoordinateClient.java

@@ -0,0 +1,68 @@
+package com.orbitz.consul;
+
+import com.google.common.collect.ImmutableMap;
+import com.orbitz.consul.model.coordinate.Coordinate;
+import com.orbitz.consul.model.coordinate.Datacenter;
+import retrofit2.Call;
+import retrofit2.Retrofit;
+import retrofit2.http.GET;
+import retrofit2.http.QueryMap;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static com.orbitz.consul.util.Http.extract;
+
+/**
+ * HTTP Client for /v1/coordinate/ endpoints.
+ *
+ * @see <a href="http://www.consul.io/docs/agent/http.html#agent">The Consul API Docs</a>
+ */
+public class CoordinateClient {
+
+    private final Api api;
+
+    /**
+     * Constructs an instance of this class.
+     *
+     * @param retrofit The {@link Retrofit} to build a client from.
+     */
+    CoordinateClient(Retrofit retrofit) {
+        this.api = retrofit.create(Api.class);
+    }
+
+    public List<Datacenter> getDatacenters() {
+        return extract(api.getDatacenters());
+    }
+
+    public List<Coordinate> getNodes(String dc) {
+        return extract(api.getNodes(dcQuery(dc)));
+    }
+
+    public List<Coordinate> getNodes() {
+        return getNodes(null);
+    }
+
+    private Map<String, String> dcQuery(String dc) {
+        Map<String, String> query = Collections.emptyMap();
+
+        if (dc != null) {
+            query = ImmutableMap.of("dc", dc);
+        }
+        return query;
+    }
+
+    /**
+     * Retrofit API interface.
+     */
+    interface Api {
+
+        @GET("coordinate/datacenters")
+        Call<List<Datacenter>> getDatacenters();
+
+        @GET("coordinate/nodes")
+        Call<List<Coordinate>> getNodes(@QueryMap Map<String, String> query);
+
+    }
+}

src/main/java/com/orbitz/consul/model/coordinate/Coord.java

@@ -0,0 +1,27 @@
+package com.orbitz.consul.model.coordinate;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
+
+@Value.Immutable
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonSerialize(as = ImmutableCoord.class)
+@JsonDeserialize(as = ImmutableCoord.class)
+public abstract class Coord {
+
+    @JsonProperty("Adjustment")
+    public abstract double getAdjustment();
+
+    @JsonProperty("Error")
+    public abstract double getError();
+
+    @JsonProperty("Height")
+    public abstract double getHeight();
+
+    @JsonProperty("Vec")
+    public abstract double[] getVec();
+
+}

src/main/java/com/orbitz/consul/model/coordinate/Coordinate.java

@@ -0,0 +1,21 @@
+package com.orbitz.consul.model.coordinate;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
+
+@Value.Immutable
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonSerialize(as = ImmutableCoordinate.class)
+@JsonDeserialize(as = ImmutableCoordinate.class)
+public abstract class Coordinate {
+
+    @JsonProperty("Node")
+    public abstract String getNode();
+
+    @JsonProperty("Coord")
+    public abstract Coord getCoord();
+
+}

src/main/java/com/orbitz/consul/model/coordinate/Datacenter.java

@@ -0,0 +1,23 @@
+package com.orbitz.consul.model.coordinate;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.immutables.value.Value;
+
+import java.util.List;
+
+@Value.Immutable
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonSerialize(as = ImmutableDatacenter.class)
+@JsonDeserialize(as = ImmutableDatacenter.class)
+public abstract class Datacenter {
+
+    @JsonProperty("Datacenter")
+    public abstract String getDatacenter();
+
+    @JsonProperty("Coordinates")
+    public abstract List<Coordinate> getCoordinates();
+
+}