X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sdclient%2Fdiscovery-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fmsb%2Fsdclient%2Fwrapper%2Fconsul%2Foption%2FQueryOptions.java;h=81585527669cf658adb4f230cfb899c9c674ccc1;hb=c9ca9000bc557bf62f4193163d4306a414e1b2c3;hp=e61b463de38a55ce9037708697fe480fc4b82fb4;hpb=2e7482cf8b50de9fb028ccd736901c3a1a9e3fbe;p=msb%2Fdiscovery.git diff --git a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/option/QueryOptions.java b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/option/QueryOptions.java index e61b463..8158552 100644 --- a/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/option/QueryOptions.java +++ b/sdclient/discovery-service/src/main/java/org/onap/msb/sdclient/wrapper/consul/option/QueryOptions.java @@ -1,17 +1,15 @@ /** * Copyright 2016-2017 ZTE, Inc. and others. * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. */ package org.onap.msb.sdclient.wrapper.consul.option; @@ -33,11 +31,14 @@ public abstract class QueryOptions implements ParamAdder { public static final QueryOptions BLANK = ImmutableQueryOptions.builder().build(); public abstract Optional getWait(); + public abstract Optional getToken(); + public abstract Optional getIndex(); + public abstract Optional getNear(); - + public ConsistencyMode getConsistencyMode() { return ConsistencyMode.DEFAULT; } @@ -68,9 +69,7 @@ public abstract class QueryOptions implements ParamAdder { } private static ImmutableQueryOptions.Builder blockBuilder(String identifier, int qty, BigInteger index) { - return ImmutableQueryOptions.builder() - .wait(String.format("%s%s", qty, identifier)) - .index(index); + return ImmutableQueryOptions.builder().wait(String.format("%s%s", qty, identifier)).index(index); } @Override @@ -87,8 +86,7 @@ public abstract class QueryOptions implements ParamAdder { } if (isBlocking()) { - added = added.queryParam("wait", getWait().get()) - .queryParam("index", String.valueOf(getIndex().get())); + added = added.queryParam("wait", getWait().get()).queryParam("index", String.valueOf(getIndex().get())); } added = optionallyAdd(added, "token", getToken());