diff options
7 files changed, 7 insertions, 18 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java index cb99d8ff9f5..d8149486b32 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java @@ -210,7 +210,7 @@ public abstract class AbstractService extends TreeConfigProducer<AnyConfigProduc * @throws IllegalStateException if i is out of range. */ public int getRelativePort(int i) { - if (ports.size() < 1) { + if (ports.isEmpty()) { throw new IllegalStateException("Requested port with offset " + i + " for service that " + "has not reserved any ports: " + this); } @@ -355,7 +355,7 @@ public abstract class AbstractService extends TreeConfigProducer<AnyConfigProduc jvmOptions = (args == null) ? "" : args; } public final void appendJvmOptions(String args) { - if ((args != null) && ! "".equals(args)) { + if ((args != null) && !args.isEmpty()) { setJvmOptions(jvmOptions + getSeparator(jvmOptions) + args); } } @@ -363,7 +363,7 @@ public abstract class AbstractService extends TreeConfigProducer<AnyConfigProduc return ("".equals(current)) ? "" : " "; } public final void prependJvmOptions(String args) { - if ((args != null) && ! "".equals(args)) { + if ((args != null) && !args.isEmpty()) { setJvmOptions(args + getSeparator(jvmOptions) + jvmOptions); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java index e095d6a27e0..e3fc680ad6a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java @@ -66,9 +66,9 @@ public final class ApplicationContainer extends Container implements StringBuilder b = new StringBuilder(); if (isHostedVespa) { b.append("-Djdk.tls.server.enableStatusRequestExtension=true ") - .append("-Djdk.tls.stapling.responseTimeout=2000 ") - .append("-Djdk.tls.stapling.cacheSize=256 ") - .append("-Djdk.tls.stapling.cacheLifetime=3600 "); + .append("-Djdk.tls.stapling.responseTimeout=2000 ") + .append("-Djdk.tls.stapling.cacheSize=256 ") + .append("-Djdk.tls.stapling.cacheLifetime=3600 "); } String jvmArgs = super.getJvmOptions(); if (!jvmArgs.isBlank()) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java index 4c382a75b24..3f1de25f71f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/SearchChains.java @@ -38,6 +38,7 @@ public class SearchChains extends Chains<SearchChain> { initializeComponents(); } + private void setSearchClusterForLocalProvider(Map<String, ? extends SearchCluster> clusterIndexByName) { for (LocalProvider provider : localProviders()) { SearchCluster cluster = clusterIndexByName.get(provider.getClusterName()); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java index 77c6f8f99c4..8824112c118 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java @@ -249,9 +249,6 @@ public class IndexedSearchCluster extends SearchCluster } @Override - public int getRowBits() { return 8; } - - @Override public String toString() { return "Indexing cluster '" + getClusterName() + "'"; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java index 2f20c5009ae..c4f1069e0aa 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchCluster.java @@ -76,7 +76,6 @@ public abstract class SearchCluster extends TreeConfigProducer<AnyConfigProducer protected abstract IndexingMode getIndexingMode(); public final Double getVisibilityDelay() { return visibilityDelay; } public final Double getQueryTimeout() { return queryTimeout; } - public abstract int getRowBits(); public final void setClusterIndex(int index) { this.index = index; } public final int getClusterIndex() { return index; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java index 44551965a8c..7a4dd935acf 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java @@ -67,9 +67,6 @@ public class StreamingSearchCluster extends SearchCluster implements public DerivedConfiguration derived() { return derivedConfig; } @Override - public int getRowBits() { return 0; } - - @Override public void getConfig(DocumentdbInfoConfig.Builder builder) { DocumentdbInfoConfig.Documentdb.Builder docDb = new DocumentdbInfoConfig.Documentdb.Builder(); docDb.name(derivedConfig.getSchema().getName()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java index 3bc6d54c0af..75884c298fb 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java @@ -35,11 +35,6 @@ public class MockSearchClusters { } @Override - public int getRowBits() { - return 0; - } - - @Override public void defaultDocumentsConfig() {} @Override |