Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Add support for QueryOptions for service registration #88

Merged
merged 1 commit into from
Dec 24, 2015
Merged

Add support for QueryOptions for service registration #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/main/java/com/orbitz/consul/AgentClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down