From bfd5bcd897c04630a7feb6dbe59f53268cb40f3b Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 23 Aug 2019 11:10:19 +0200 Subject: Revert "Upgrade to zookeeper 3.4.14, take 3" --- .../java/com/yahoo/vespa/serviceview/Cluster.java | 8 ++++++-- .../java/com/yahoo/vespa/serviceview/Service.java | 21 ++++++++++++++------- .../com/yahoo/vespa/serviceview/ServiceModel.java | 15 +++++++++------ parent/pom.xml | 4 ++-- zkfacade/pom.xml | 4 ---- 5 files changed, 31 insertions(+), 21 deletions(-) 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..3b39a85c6b1 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java @@ -6,18 +6,22 @@ import java.util.List; import com.google.common.collect.ImmutableList; +import edu.umd.cs.findbugs.annotations.NonNull; + /** * Model a single cluster of services in the Vespa model. * - * @author Steinar Knutsen + * @author Steinar Knutsen */ public final class Cluster implements Comparable { - + @NonNull public final String name; + @NonNull public final String type; /** * An ordered list of the service instances in this cluster. */ + @NonNull public final ImmutableList services; public Cluster(String name, String type, List services) { 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..b5d18bdbb1f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java @@ -1,31 +1,37 @@ // 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; + +import edu.umd.cs.findbugs.annotations.NonNull; + /** * Model a single service instance as a sortable object. * - * @author Steinar Knutsen + * @author Steinar Knutsen */ public final class Service implements Comparable { - + @NonNull public final String serviceType; + @NonNull public final String host; public final int statePort; + @NonNull public final String configId; + @NonNull public final List ports; + @NonNull public final String name; public Service(String serviceType, String host, int statePort, String clusterName, String clusterType, - String configId, List ports, String name) { + String configId, List ports, String name) { this.serviceType = serviceType; this.host = host.toLowerCase(); this.statePort = statePort; @@ -53,7 +59,8 @@ public final class Service implements Comparable { * 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..c9574ffaa7e 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,11 +19,7 @@ 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 edu.umd.cs.findbugs.annotations.NonNull; import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; @@ -35,6 +37,7 @@ public final class ServiceModel { /** * An ordered list of the clusters in this config model. */ + @NonNull public final ImmutableList clusters; ServiceModel(ModelResponse modelConfig) { @@ -152,7 +155,7 @@ public final class ServiceModel { } } - private Service getFirstServiceInstanceByType(String typeName) { + private Service getFirstServiceInstanceByType(@NonNull String typeName) { for (Cluster c : clusters) { for (Service s : c.services) { if (typeName.equals(s.serviceType)) { diff --git a/parent/pom.xml b/parent/pom.xml index c89d53e5160..a81f64d1725 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -495,14 +495,14 @@ commons-pool 1.5.6 - org.apache.zookeeper zookeeper - 3.4.14 + 3.4.13 org.apache.curator diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 2e016e71132..c57ab45e6c6 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -65,10 +65,6 @@ ${project.version} provided - - org.apache.zookeeper - zookeeper - -- cgit v1.2.3