Skip to content

Commit 569a41f

Browse files
authored
Merge pull request #167 from aleksandrserbin/master
Add token support for Catalog Deregistration
2 parents 2d2ef98 + 62a6672 commit 569a41f

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

src/main/java/com/ecwid/consul/v1/ConsulClient.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,11 @@ public Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistrat
352352
return catalogClient.catalogDeregister(catalogDeregistration);
353353
}
354354

355+
@Override
356+
public Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration, String token) {
357+
return catalogClient.catalogDeregister(catalogDeregistration, token);
358+
}
359+
355360
@Override
356361
public Response<List<String>> getCatalogDatacenters() {
357362
return catalogClient.getCatalogDatacenters();

src/main/java/com/ecwid/consul/v1/catalog/CatalogClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ public interface CatalogClient {
2121

2222
public Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration);
2323

24+
public Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration, String token);
25+
2426
public Response<List<String>> getCatalogDatacenters();
2527

2628
public Response<List<Node>> getCatalogNodes(QueryParams queryParams);

src/main/java/com/ecwid/consul/v1/catalog/CatalogConsulClient.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,15 @@ public Response<Void> catalogRegister(CatalogRegistration catalogRegistration, S
7373

7474
@Override
7575
public Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration) {
76+
return catalogDeregister(catalogDeregistration, null);
77+
}
78+
79+
@Override
80+
public Response<Void> catalogDeregister(CatalogDeregistration catalogDeregistration, String token) {
7681
String json = GsonFactory.getGson().toJson(catalogDeregistration);
82+
UrlParameters tokenParam = token != null ? new SingleUrlParameters("token", token) : null;
7783

78-
RawResponse rawResponse = rawClient.makePutRequest("/v1/catalog/deregister", json);
84+
RawResponse rawResponse = rawClient.makePutRequest("/v1/catalog/deregister", json, tokenParam);
7985
if (rawResponse.getStatusCode() == 200) {
8086
return new Response<Void>(null, rawResponse);
8187
} else {

0 commit comments

Comments
 (0)