diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-12-17 15:02:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-17 15:02:05 +0100 |
commit | f36411d1fe46c7c78cae0772869407f9a38a94e8 (patch) | |
tree | 46a345f75181b53f6928d8544f423ae84a83d7fe /controller-server | |
parent | 50596b5624ca0a7483c2f2347d72e250db6dbf5c (diff) | |
parent | 0857927dc1699955be09c414f12bca599e047829 (diff) |
Merge pull request #20569 from vespa-engine/bratseth/no-notnull
Avoid org.jetbrains annotations
Diffstat (limited to 'controller-server')
6 files changed, 5 insertions, 14 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointId.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointId.java index 70b011feb88..de1429d88af 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointId.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointId.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.application; -import org.jetbrains.annotations.NotNull; - import java.util.Objects; /** @@ -54,7 +52,7 @@ public class EndpointId implements Comparable<EndpointId> { public static EndpointId of(String id) { return new EndpointId(id); } @Override - public int compareTo(@NotNull EndpointId o) { + public int compareTo(EndpointId o) { return id.compareTo(o.id); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLog.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLog.java index ef7b72632d8..19fb1b7e1bb 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLog.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/auditlog/AuditLog.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.auditlog; import com.google.common.base.CharMatcher; import com.google.common.collect.Ordering; -import org.jetbrains.annotations.NotNull; import java.time.Instant; import java.util.ArrayList; @@ -101,7 +100,7 @@ public class AuditLog { } @Override - public int compareTo(@NotNull Entry that) { + public int compareTo(Entry that) { return comparator.compare(this, that); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java index ba891cdddd8..85d750d267c 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java @@ -10,7 +10,6 @@ import com.yahoo.vespa.hosted.controller.deployment.Run; import com.yahoo.vespa.hosted.controller.deployment.Step; import com.yahoo.vespa.hosted.controller.deployment.StepInfo; import com.yahoo.vespa.hosted.controller.deployment.StepRunner; -import org.jetbrains.annotations.TestOnly; import java.time.Duration; import java.util.concurrent.ExecutorService; @@ -39,7 +38,6 @@ public class JobRunner extends ControllerMaintainer { this(controller, duration, Executors.newFixedThreadPool(32, new DaemonThreadFactory("job-runner-")), new InternalStepRunner(controller)); } - @TestOnly public JobRunner(Controller controller, Duration duration, ExecutorService executors, StepRunner runner) { super(controller, duration); this.jobs = controller.jobController(); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/ControllerVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/ControllerVersion.java index 1d1b4ce7ba0..5b293081dc2 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/ControllerVersion.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/ControllerVersion.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.versions; import com.yahoo.component.Version; import com.yahoo.component.Vtag; -import org.jetbrains.annotations.NotNull; import java.time.Instant; import java.util.Objects; @@ -50,7 +49,7 @@ public class ControllerVersion implements Comparable<ControllerVersion> { } @Override - public int compareTo(@NotNull ControllerVersion o) { + public int compareTo(ControllerVersion o) { return version.compareTo(o.version); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersion.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersion.java index dadca43c5a0..c240a7ddf35 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersion.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersion.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.controller.versions; import com.yahoo.component.Version; import com.yahoo.config.provision.CloudName; -import org.jetbrains.annotations.NotNull; import java.util.Comparator; import java.util.Objects; @@ -56,7 +55,7 @@ public class OsVersion implements Comparable<OsVersion> { } @Override - public int compareTo(@NotNull OsVersion that) { + public int compareTo(OsVersion that) { return comparator.compare(this, that); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionTarget.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionTarget.java index badb3014ddf..a8fcb6c78fc 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionTarget.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionTarget.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.versions; -import org.jetbrains.annotations.NotNull; - import java.time.Duration; import java.time.Instant; import java.util.Objects; @@ -61,7 +59,7 @@ public class OsVersionTarget implements Comparable<OsVersionTarget> { } @Override - public int compareTo(@NotNull OsVersionTarget o) { + public int compareTo(OsVersionTarget o) { return osVersion.compareTo(o.osVersion); } |