From 77910e50edb3d21abc981eee49f9ee9b8296d73c Mon Sep 17 00:00:00 2001
From: Francois Visconte <f.visconte@criteo.com>
Date: Wed, 23 Dec 2015 15:36:37 +0100
Subject: [PATCH] Add support for QueryOptions for service registration

Allow to pass a QueryOptions for service registration and enable
registration with an ACL token
---
 src/main/java/com/orbitz/consul/AgentClient.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/orbitz/consul/AgentClient.java b/src/main/java/com/orbitz/consul/AgentClient.java
index c9fc7734..25d76450 100644
--- a/src/main/java/com/orbitz/consul/AgentClient.java
+++ b/src/main/java/com/orbitz/consul/AgentClient.java
@@ -2,14 +2,10 @@
 
 import com.google.common.base.Optional;
 import com.orbitz.consul.model.State;
-import com.orbitz.consul.model.agent.Agent;
-import com.orbitz.consul.model.agent.Check;
-import com.orbitz.consul.model.agent.ImmutableCheck;
-import com.orbitz.consul.model.agent.ImmutableRegistration;
-import com.orbitz.consul.model.agent.Member;
-import com.orbitz.consul.model.agent.Registration;
+import com.orbitz.consul.model.agent.*;
 import com.orbitz.consul.model.health.HealthCheck;
 import com.orbitz.consul.model.health.Service;
+import com.orbitz.consul.option.QueryOptions;
 
 import javax.ws.rs.InternalServerErrorException;
 import javax.ws.rs.client.Entity;
@@ -174,15 +170,19 @@ public void register(int port, List<Registration.RegCheck> checks, String name,
      * the use of checks.
      *
      * @param registration The registration payload.
+     * @param options An optional QueryOptions instance.
      */
-    public void register(Registration registration) {
-        Response response = webTarget.path("service").path("register").request()
+    public void register(Registration registration, QueryOptions options) {
+        Response response = options.apply(webTarget.path("service").path("register")).request()
                 .put(Entity.entity(registration, MediaType.APPLICATION_JSON_TYPE));
 
         if (response.getStatus() != Response.Status.OK.getStatusCode()) {
             throw new ConsulException(response.readEntity(String.class));
         }
     }
+    public void register(Registration registration){
+        register(registration, QueryOptions.BLANK);
+    }
 
     /**
      * De-register a particular service from the Consul Agent.