diff options
11 files changed, 135 insertions, 163 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java b/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java index 97236222338..1d1b6c6c43a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/routing/DocumentProtocol.java @@ -132,8 +132,8 @@ public final class DocumentProtocol implements Protocol, Documentrouteselectorpo // Build the indexing hop if it is possible to derive. addIndexingHop(content, table); - // Build the default routes if possible - addDefaultRoutes(content, containerClusters, table); + // Build the default route if is is possible to derive. + addDefaultRoute(content, containerClusters, table); // Return the complete routing table. simplifyRouteNames(table); @@ -225,40 +225,49 @@ public final class DocumentProtocol implements Protocol, Documentrouteselectorpo } /** - * Create the {@code default} and {@code default-get} routes for the Document protocol. The {@code default} - * route will be either a route to storage or a route to search. Since recovery from storage is supported, - * storage takes precedence over search when deciding on the final target of the default route. If there - * is an unambiguous docproc cluster in the application, the {@code default} route will pass through it. - * The {@code default-get} route skips the docproc but is otherwise identical to the {@code default} route. + * Create the "default" route for the Document protocol. This route will be either a route to storage or a route to + * search. Since we will be supporting recovery from storage, storage takes precedence over search when deciding on + * the final target of the default route. If there is an unambigous docproc cluster in the application, the default + * route will pass through this. * * @param content The content model from {@link com.yahoo.vespa.model.VespaModel}. * @param containerClusters a collection of {@link com.yahoo.vespa.model.container.ContainerCluster}s * @param table The routing table to add to. */ - private static void addDefaultRoutes(List<ContentCluster> content, - Collection<ContainerCluster> containerClusters, - RoutingTableSpec table) { - if (content.isEmpty() || !indexingHopExists(table)) { - return; - } - RouteSpec route = new RouteSpec("default"); - String hop = getContainerClustersDocprocHop(containerClusters); - if (hop != null) { - route.addHop(hop); + private static void addDefaultRoute(List<ContentCluster> content, + Collection<ContainerCluster> containerClusters, + RoutingTableSpec table) { + List<String> hops = new ArrayList<>(); + if (!content.isEmpty()) { + boolean found = false; + for (int i = 0, len = table.getNumHops(); i < len; ++i) { + if (table.getHop(i).getName().equals("indexing")) { + found = true; + break; + } + } + if (found) { + hops.add("indexing"); + } } - route.addHop("indexing"); - table.addRoute(route); - - table.addRoute(new RouteSpec("default-get").addHop("indexing")); - } - - private static boolean indexingHopExists(RoutingTableSpec table) { - for (int i = 0, len = table.getNumHops(); i < len; ++i) { - if (table.getHop(i).getName().equals("indexing")) { - return true; + if (!hops.isEmpty()) { + RouteSpec route = new RouteSpec("default"); + String hop = getContainerClustersDocprocHop(containerClusters); + if (hop != null) { + route.addHop(hop); + } + int numHops = hops.size(); + if (numHops == 1) { + route.addHop(hops.get(0)); + } else { + StringBuilder str = new StringBuilder(); + for (int i = 0; i < numHops; ++i) { + str.append(hops.get(i)).append(i < numHops - 1 ? " " : ""); + } + route.addHop("[AND:" + str.toString() + "]"); } + table.addRoute(route); } - return false; } private static String getContainerClustersDocprocHop(Collection<ContainerCluster> containerClusters) { diff --git a/config-model/src/test/cfg/routing/replacehop/messagebus.cfg b/config-model/src/test/cfg/routing/replacehop/messagebus.cfg index 12701af6db3..ad8fb260824 100755 --- a/config-model/src/test/cfg/routing/replacehop/messagebus.cfg +++ b/config-model/src/test/cfg/routing/replacehop/messagebus.cfg @@ -11,14 +11,12 @@ routingtable[0].hop[2].selector "foo" routingtable[0].hop[2].ignoreresult false routingtable[0].route[0].name "default" routingtable[0].route[0].hop[0] "indexing" -routingtable[0].route[1].name "default-get" -routingtable[0].route[1].hop[0] "indexing" -routingtable[0].route[2].name "music" -routingtable[0].route[2].hop[0] "[MessageType:music]" -routingtable[0].route[3].name "music-direct" -routingtable[0].route[3].hop[0] "[Content:cluster=music]" -routingtable[0].route[4].name "music-index" -routingtable[0].route[4].hop[0] "docproc/cluster.music.indexing/chain.indexing" -routingtable[0].route[4].hop[1] "[Content:cluster=music]" -routingtable[0].route[5].name "storage/cluster.music" -routingtable[0].route[5].hop[0] "route:music" +routingtable[0].route[1].name "music" +routingtable[0].route[1].hop[0] "[MessageType:music]" +routingtable[0].route[2].name "music-direct" +routingtable[0].route[2].hop[0] "[Content:cluster=music]" +routingtable[0].route[3].name "music-index" +routingtable[0].route[3].hop[0] "docproc/cluster.music.indexing/chain.indexing" +routingtable[0].route[3].hop[1] "[Content:cluster=music]" +routingtable[0].route[4].name "storage/cluster.music" +routingtable[0].route[4].hop[0] "route:music" diff --git a/config-model/src/test/cfg/routing/replaceroute/messagebus.cfg b/config-model/src/test/cfg/routing/replaceroute/messagebus.cfg index d3af5b36c26..e9389a2a6d9 100755 --- a/config-model/src/test/cfg/routing/replaceroute/messagebus.cfg +++ b/config-model/src/test/cfg/routing/replaceroute/messagebus.cfg @@ -8,14 +8,12 @@ routingtable[0].hop[1].recipient[0] "music" routingtable[0].hop[1].ignoreresult false routingtable[0].route[0].name "default" routingtable[0].route[0].hop[0] "foo" -routingtable[0].route[1].name "default-get" -routingtable[0].route[1].hop[0] "indexing" -routingtable[0].route[2].name "music" -routingtable[0].route[2].hop[0] "[MessageType:music]" -routingtable[0].route[3].name "music-direct" -routingtable[0].route[3].hop[0] "[Content:cluster=music]" -routingtable[0].route[4].name "music-index" -routingtable[0].route[4].hop[0] "docproc/cluster.music.indexing/chain.indexing" -routingtable[0].route[4].hop[1] "[Content:cluster=music]" -routingtable[0].route[5].name "storage/cluster.music" -routingtable[0].route[5].hop[0] "route:music" +routingtable[0].route[1].name "music" +routingtable[0].route[1].hop[0] "[MessageType:music]" +routingtable[0].route[2].name "music-direct" +routingtable[0].route[2].hop[0] "[Content:cluster=music]" +routingtable[0].route[3].name "music-index" +routingtable[0].route[3].hop[0] "docproc/cluster.music.indexing/chain.indexing" +routingtable[0].route[3].hop[1] "[Content:cluster=music]" +routingtable[0].route[4].name "storage/cluster.music" +routingtable[0].route[4].hop[0] "route:music" diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java index 2a152219990..e059a673f41 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java @@ -3,11 +3,12 @@ package com.yahoo.vespa.model.content; import com.yahoo.cloud.config.ClusterListConfig; import com.yahoo.config.model.deploy.DeployState; +import com.yahoo.vespa.config.search.core.ProtonConfig; +import com.yahoo.vespa.config.content.core.StorServerConfig; import com.yahoo.documentmodel.NewDocumentType; import com.yahoo.messagebus.routing.RouteSpec; import com.yahoo.messagebus.routing.RoutingTableSpec; -import com.yahoo.vespa.config.content.core.StorServerConfig; -import com.yahoo.vespa.config.search.core.ProtonConfig; +import com.yahoo.vespa.model.HostResource; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.content.cluster.ContentCluster; @@ -22,10 +23,7 @@ import java.util.Arrays; import java.util.List; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; /** * Test for using the content model to create indexed search clusters. @@ -140,13 +138,12 @@ public class IndexedTest extends ContentBaseTest { @Test public void requireIndexedOnlyServices() { VespaModel model = getIndexedVespaModel(); - // TODO - // HostResource h = model.getHostSystem().getHosts().get(0); - // String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok", - // "logd", "configproxy","config-sentinel", - // "qrserver", "fleetcontroller", "topleveldispatch", - // "storagenode", "searchnode", "distributor", "transactionlogserver"}; - // DomContentBuilderTest.assertServices(h, expectedServices); + HostResource h = model.getHostSystem().getHosts().get(0); + String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok", + "logd", "configproxy","config-sentinel", + "qrserver", "fleetcontroller", "topleveldispatch", + "storagenode", "searchnode", "distributor", "transactionlogserver"}; + // TODO DomContentBuilderTest.assertServices(h, expectedServices); Routing routing = model.getRouting(); assertNotNull(routing); assertEquals("[]", routing.getErrors().toString()); @@ -157,36 +154,43 @@ public class IndexedTest extends ContentBaseTest { assertEquals("indexing", spec.getHop(0).getName()); assertEquals("jdisc/chain.indexing", spec.getHop(1).getName()); - assertRoute(spec.getRoute(0), "default", "indexing"); - assertRoute(spec.getRoute(1), "default-get", "indexing"); - assertRoute(spec.getRoute(2), "storage/cluster.test", "route:test"); - assertRoute(spec.getRoute(3), "test", "[MessageType:test]"); - assertRoute(spec.getRoute(4), "test-direct", "[Content:cluster=test]"); - assertRoute(spec.getRoute(5), "test-index", "jdisc/chain.indexing", "[Content:cluster=test]"); - } - - private static void assertRoute(RouteSpec r, String name, String... hops) { - assertEquals(name, r.getName()); - assertEquals(hops.length, r.getNumHops()); - for(int i = 0; i < hops.length; i++) { - assertEquals(hops[i], r.getHop(i)); - } + RouteSpec r; + r = spec.getRoute(0); + assertEquals("default", r.getName()); + assertEquals(1, r.getNumHops()); + assertEquals("indexing", r.getHop(0)); + r = spec.getRoute(1); + assertEquals("storage/cluster.test", r.getName()); + assertEquals(1, r.getNumHops()); + assertEquals("route:test", r.getHop(0)); + r = spec.getRoute(2); + assertEquals("test", r.getName()); + assertEquals(1, r.getNumHops()); + assertEquals("[MessageType:test]", r.getHop(0)); + r = spec.getRoute(3); + assertEquals("test-direct", r.getName()); + assertEquals(1, r.getNumHops()); + assertEquals("[Content:cluster=test]", r.getHop(0)); + r = spec.getRoute(4); + assertEquals("test-index", r.getName()); + assertEquals(2, r.getNumHops()); + assertEquals("jdisc/chain.indexing", r.getHop(0)); + assertEquals("[Content:cluster=test]", r.getHop(1)); } - @Test public void requireProtonStreamingOnly() { VespaModel model = getStreamingVespaModel(); - // TODO - // HostResource h = model.getHostSystem().getHosts().get(0); - // String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok", - // "logd", "configproxy","config-sentinel", - // "qrserver", "storagenode", "searchnode", "distributor", - // "transactionlogserver"}; - // DomContentBuilderTest.assertServices(h, expectedServices); + HostResource h = model.getHostSystem().getHosts().get(0); + String [] expectedServices = {"logserver", "configserver", "adminserver", "slobrok", + "logd", "configproxy","config-sentinel", + "qrserver", "storagenode", "searchnode", "distributor", + "transactionlogserver"}; +// TODO DomContentBuilderTest.assertServices(h, expectedServices); ContentCluster s = model.getContentClusters().get("test"); assertFalse(s.getSearch().hasIndexedCluster()); + StorServerConfig.Builder builder = new StorServerConfig.Builder(); s.getStorageNodes().getConfig(builder); s.getStorageNodes().getChildren().get("3").getConfig(builder); @@ -207,35 +211,35 @@ public class IndexedTest extends ContentBaseTest { @Test public void testContentSummaryStore() { - String services= + String services= "<services version='1.0'>" + "<admin version='2.0'><adminserver hostalias='node0' /></admin>" + - "<content id='docstore' version='1.0'>\n" + - " <redundancy>1</redundancy>\n" + - " <documents>\n" + - " <document mode='index' type='docstorebench'/>\n" + - " </documents>\n" + + "<content id='docstore' version='1.0'>\n" + + " <redundancy>1</redundancy>\n" + + " <documents>\n" + + " <document mode='index' type='docstorebench'/>\n" + + " </documents>\n" + " <group>\n" + - " <node distribution-key='0' hostalias='node0'/>\n" + - " </group>\n" + - " <engine>\n" + - " <proton>\n" + - " <searchable-copies>1</searchable-copies>\n" + - " <tuning>\n" + - " <searchnode>\n" + - " <summary>\n" + - " <store>\n" + - " <logstore>\n" + - " <chunk>\n" + - " <maxsize>2048</maxsize>\n" + - " </chunk>\n" + - " </logstore>\n" + - " </store>\n" + - " </summary>\n" + - " </searchnode>\n" + - " </tuning>\n" + - " </proton>\n" + - " </engine>\n" + + " <node distribution-key='0' hostalias='node0'/>\n" + + " </group>\n" + + " <engine>\n" + + " <proton>\n" + + " <searchable-copies>1</searchable-copies>\n" + + " <tuning>\n" + + " <searchnode>\n" + + " <summary>\n" + + " <store>\n" + + " <logstore>\n" + + " <chunk>\n" + + " <maxsize>2048</maxsize>\n" + + " </chunk>\n" + + " </logstore>\n" + + " </store>\n" + + " </summary>\n" + + " </searchnode>\n" + + " </tuning>\n" + + " </proton>\n" + + " </engine>\n" + " </content>\n" + " </services>"; diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json index 1619d053aa2..e1cdc6747e3 100644 --- a/documentapi/abi-spec.json +++ b/documentapi/abi-spec.json @@ -1055,9 +1055,6 @@ "public com.yahoo.documentapi.messagebus.MessageBusParams setRouteName(java.lang.String)", "public com.yahoo.documentapi.messagebus.MessageBusParams setRoute(java.lang.String)", "public java.lang.String getRoute()", - "public com.yahoo.documentapi.messagebus.MessageBusParams setRouteNameForGet(java.lang.String)", - "public com.yahoo.documentapi.messagebus.MessageBusParams setRouteForGet(java.lang.String)", - "public java.lang.String getRouteForGet()", "public int getTraceLevel()", "public com.yahoo.documentapi.messagebus.MessageBusParams setTraceLevel(int)", "public com.yahoo.messagebus.network.rpc.RPCNetworkParams getRPCNetworkParams()", diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java index a2bad9c84e1..67b9444e73f 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java @@ -5,34 +5,15 @@ import com.yahoo.document.Document; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentPut; import com.yahoo.document.DocumentUpdate; -import com.yahoo.documentapi.AsyncParameters; -import com.yahoo.documentapi.AsyncSession; -import com.yahoo.documentapi.DocumentIdResponse; -import com.yahoo.documentapi.DocumentResponse; -import com.yahoo.documentapi.DocumentUpdateResponse; -import com.yahoo.documentapi.RemoveResponse; -import com.yahoo.documentapi.Response; -import com.yahoo.documentapi.ResponseHandler; +import com.yahoo.documentapi.*; import com.yahoo.documentapi.Result; -import com.yahoo.documentapi.UpdateResponse; -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; -import com.yahoo.documentapi.messagebus.protocol.GetDocumentMessage; -import com.yahoo.documentapi.messagebus.protocol.GetDocumentReply; -import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage; -import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage; -import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentReply; -import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage; -import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentReply; +import com.yahoo.documentapi.messagebus.protocol.*; import com.yahoo.log.LogLevel; -import com.yahoo.messagebus.ErrorCode; -import com.yahoo.messagebus.Message; -import com.yahoo.messagebus.MessageBus; -import com.yahoo.messagebus.Reply; -import com.yahoo.messagebus.ReplyHandler; -import com.yahoo.messagebus.SourceSession; -import com.yahoo.messagebus.StaticThrottlePolicy; -import com.yahoo.messagebus.ThrottlePolicy; +import com.yahoo.messagebus.*; +import java.lang.Error; +import java.util.Set; +import java.util.HashSet; import java.util.Queue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -55,7 +36,6 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { private final ThrottlePolicy throttlePolicy; private final SourceSession session; private String route; - private String routeForGet; private int traceLevel; /** @@ -80,7 +60,6 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { MessageBusAsyncSession(AsyncParameters asyncParams, MessageBus bus, MessageBusParams mbusParams, ReplyHandler handler) { route = mbusParams.getRoute(); - routeForGet = mbusParams.getRouteForGet(); traceLevel = mbusParams.getTraceLevel(); throttlePolicy = mbusParams.getSourceSessionParams().getThrottlePolicy(); if (handler == null) { @@ -103,7 +82,7 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { @Override public Result get(DocumentId id) { - return get(id, DocumentProtocol.Priority.NORMAL_1); + return get(id, false, DocumentProtocol.Priority.NORMAL_1); } @Override @@ -155,9 +134,8 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { long reqId = requestId.incrementAndGet(); msg.setContext(reqId); msg.getTrace().setLevel(traceLevel); - String toRoute = (msg.getType() == DocumentProtocol.MESSAGE_GETDOCUMENT ? routeForGet : route); - if (toRoute != null) { - return toResult(reqId, session.send(msg, toRoute, true)); + if (route != null) { + return toResult(reqId, session.send(msg, route, true)); } else { return toResult(reqId, session.send(msg)); } @@ -265,6 +243,7 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { } } + @SuppressWarnings("deprecation") private static Response toSuccess(Reply reply, long reqId) { switch (reply.getType()) { case DocumentProtocol.REPLY_GETDOCUMENT: diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java index 0ad791a3213..9acdc12e769 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java @@ -14,7 +14,6 @@ public class MessageBusParams extends DocumentAccessParams { private String routingConfigId = null; private String protocolConfigId = null; private String route = "route:default"; - private String routeForGet = "route:default-get"; private int traceLevel = 0; private RPCNetworkParams rpcNetworkParams = new RPCNetworkParams(); private com.yahoo.messagebus.MessageBusParams mbusParams = new com.yahoo.messagebus.MessageBusParams(); @@ -103,14 +102,6 @@ public class MessageBusParams extends DocumentAccessParams { return this; } - public MessageBusParams setRouteNameForGet(String routeName) { - return setRouteForGet("route:" + routeName); - } - public MessageBusParams setRouteForGet(String route) { - this.routeForGet = route; - return this; - } - /** * Returns the route string that all requests will be sent to. * @@ -120,10 +111,6 @@ public class MessageBusParams extends DocumentAccessParams { return route; } - public String getRouteForGet() { - return routeForGet; - } - /** * Returns the trace level to use when sending. * diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusDocumentApiTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusDocumentApiTestCase.java index 4ba51f3b3d8..bb84b6f0104 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusDocumentApiTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusDocumentApiTestCase.java @@ -25,7 +25,7 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; /** - * @author Einar M R Rosenvinge + * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> */ public class MessageBusDocumentApiTestCase extends AbstractDocumentApiTestCase { @@ -49,7 +49,6 @@ public class MessageBusDocumentApiTestCase extends AbstractDocumentApiTestCase { params.getRPCNetworkParams().setSlobrokConfigId(slobrokConfigId); params.setDocumentManagerConfigId("file:src/test/cfg/documentmanager.cfg"); params.setRouteName("Route"); - params.setRouteNameForGet("Route"); params.setRoutingConfigId("file:src/test/cfg/messagebus.cfg"); params.setTraceLevel(9); params.setSourceSessionParams(new SourceSessionParams().setThrottlePolicy(null)); diff --git a/documentapi/src/test/java/com/yahoo/documentapi/test/AbstractDocumentApiTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/test/AbstractDocumentApiTestCase.java index 97d60c3bc4b..2b56d9c628d 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/test/AbstractDocumentApiTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/test/AbstractDocumentApiTestCase.java @@ -37,6 +37,7 @@ import static org.junit.Assert.assertTrue; * * @author bratseth */ +@SuppressWarnings("deprecation") public abstract class AbstractDocumentApiTestCase { protected abstract DocumentAccess access(); diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java index 5b006b9d1eb..703cdeba247 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/CommandLineOptions.java @@ -198,7 +198,7 @@ public class CommandLineOptions { } if (route.isEmpty() && cluster.isEmpty()) { - route = "default-get"; + route = "default"; } if (trace < 0 || trace > 9) { diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java index a9d8b85c480..8848b6f1e7f 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/CommandLineOptionsTest.java @@ -46,7 +46,7 @@ public class CommandLineOptionsTest { assertFalse(params.documentIds.hasNext()); assertFalse(params.printIdsOnly); assertEquals("[all]", params.fieldSet); - assertEquals("default-get", params.route); + assertEquals("default", params.route); assertTrue(params.cluster.isEmpty()); assertEquals("client", params.configId); assertFalse(params.showDocSize); @@ -145,7 +145,7 @@ public class CommandLineOptionsTest { public void testHeadersOnly() { exception.expect(IllegalArgumentException.class); exception.expectMessage("Headers only option has been removed."); - getParsedOptions("--headersonly"); + ClientParameters params = getParsedOptions("--headersonly"); } @Test |