diff options
Diffstat (limited to 'configserver')
5 files changed, 14 insertions, 23 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index b0fdc87c244..2b36f3496fe 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -136,7 +136,6 @@ public class ModelContextImpl implements ModelContext { private final boolean useAdaptiveDispatch; private final boolean dispatchWithProtobuf; private final Optional<TlsSecrets> tlsSecrets; - private final boolean enableGroupingSessionCache; private final double defaultTermwiseLimit; public Properties(ApplicationId applicationId, @@ -174,8 +173,6 @@ public class ModelContextImpl implements ModelContext { this.useAdaptiveDispatch = Flags.USE_ADAPTIVE_DISPATCH.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.tlsSecrets = tlsSecrets; - this.enableGroupingSessionCache = Flags.ENABLE_GROUPING_SESSION_CACHE.bindTo(flagSource) - .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); defaultTermwiseLimit = Flags.DEFAULT_TERM_WISE_LIMIT.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @@ -236,11 +233,6 @@ public class ModelContextImpl implements ModelContext { public Optional<TlsSecrets> tlsSecrets() { return tlsSecrets; } @Override - public boolean enableGroupingSessionCache() { - return enableGroupingSessionCache; - } - - @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java index 6ba788aced3..33914face61 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpConfigRequest.java @@ -5,8 +5,6 @@ import java.util.Collections; import java.util.Optional; import java.util.Set; -import javax.annotation.Nullable; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.yahoo.collections.Tuple2; @@ -154,7 +152,7 @@ public class HttpConfigRequest implements GetConfigRequest, TenantRequest { private static boolean configNameNotFound(final ConfigKey<?> requestKey, Set<ConfigKey<?>> allConfigsProduced) { return !Iterables.any(allConfigsProduced, new Predicate<ConfigKey<?>>() { @Override - public boolean apply(@Nullable ConfigKey<?> k) { + public boolean apply(ConfigKey<?> k) { return k.getName().equals(requestKey.getName()) && k.getNamespace().equals(requestKey.getNamespace()); } }); diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java index d7005de5b07..3251ba6c382 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java @@ -9,7 +9,7 @@ import com.google.common.collect.ImmutableList; /** * Model a single cluster of services in the Vespa model. * - * @author Steinar Knutsen + * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public final class Cluster implements Comparable<Cluster> { diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java index f10e2afa046..16a65b965e2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java @@ -1,15 +1,15 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.serviceview; -import com.google.common.collect.ImmutableList; -import com.yahoo.text.Utf8; - import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; +import com.yahoo.text.Utf8; + /** * Model a single service instance as a sortable object. * @@ -25,7 +25,7 @@ public final class Service implements Comparable<Service> { public final String name; public Service(String serviceType, String host, int statePort, String clusterName, String clusterType, - String configId, List<Integer> ports, String name) { + String configId, List<Integer> ports, String name) { this.serviceType = serviceType; this.host = host.toLowerCase(); this.statePort = statePort; @@ -53,7 +53,8 @@ public final class Service implements Comparable<Service> { * Generate an identifier string for one of the ports of this service * suitable for using in an URL. * - * @param port port which this identifier pertains to + * @param port + * port which this identifier pertains to * @return an opaque identifier string for this service */ public String getIdentifier(int port) { diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java index dc6fbb7ebd3..a155090b79c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java @@ -1,6 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.serviceview; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -13,12 +19,6 @@ import com.yahoo.vespa.serviceview.bindings.ModelResponse; import com.yahoo.vespa.serviceview.bindings.ServicePort; import com.yahoo.vespa.serviceview.bindings.ServiceView; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; /** |