aboutsummaryrefslogtreecommitdiffstats
path: root/serviceview
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-08-29 06:36:25 +0200
committerGitHub <noreply@github.com>2019-08-29 06:36:25 +0200
commit40320e4c1ac0cb2b6ae8c0dc09f76f85ddd5c506 (patch)
treefe9d158264b3b0a091cf330f6a072589ff23900a /serviceview
parentbc74e0b10794deccb2e13b748220d7e5604bd964 (diff)
parentf123f4095ceb696159c4753c25488874b3cb8fe3 (diff)
Merge pull request #10435 from vespa-engine/revert-10428-revert-10402-revert-10388-revert-10370-revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14
Revert "Revert " Upgrade to zookeeper 3.4.14, take 4""
Diffstat (limited to 'serviceview')
-rw-r--r--serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java b/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java
index a82069ea01d..98db96a902a 100644
--- a/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java
+++ b/serviceview/src/main/java/com/yahoo/vespa/serviceview/bindings/ServicePort.java
@@ -6,13 +6,11 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.google.common.base.Splitter;
-import edu.umd.cs.findbugs.annotations.NonNull;
-
/**
* View of {@link com.yahoo.cloud.config.ModelConfig.Hosts.Services.Ports}.
*
* @author mortent
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
@JsonIgnoreProperties(value = { "splitOnSpace" }, ignoreUnknown = true)
public class ServicePort {
@@ -28,7 +26,7 @@ public class ServicePort {
* @return true if all argument tags are present for this port, false
* otherwise
*/
- public boolean hasTags(@NonNull String... tag) {
+ public boolean hasTags(String... tag) {
if (tags == null) {
return false;
}