summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-05-23 11:35:04 +0200
committergjoranv <gv@verizonmedia.com>2022-05-23 11:35:04 +0200
commit72210d64d32feb63b68bb3bbf7af7a550d558392 (patch)
treec7fc946b5a54cfbf7cb2425f6b0ca34656a9d39d /node-admin
parentf7a5de86d148914c5bd5453a4c32418a6177b044 (diff)
Stop using findbugs:jsr305 annotations
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/pom.xml4
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminDebugHandler.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Mark.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Position.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Version.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/LineEdit.java2
7 files changed, 0 insertions, 16 deletions
diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index b58d20e8877..ff1e159de0d 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -56,10 +56,6 @@
<!-- Compile -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </dependency>
- <dependency>
<groupId>com.yahoo.vespa</groupId>
<artifactId>orchestrator-restapi</artifactId>
<version>${project.version}</version>
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java
index 275a99a4993..6e74297f2e7 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelper.java
@@ -2,7 +2,6 @@
package com.yahoo.vespa.hosted.node.admin.provider;
-import javax.annotation.concurrent.ThreadSafe;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -17,7 +16,6 @@ import java.util.stream.Collectors;
*
* @author hakonhall
*/
-@ThreadSafe
public class DebugHandlerHelper implements NodeAdminDebugHandler {
private final ConcurrentMap<String, Supplier<Object>> suppliers = new ConcurrentHashMap<>();
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminDebugHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminDebugHandler.java
index d2928891a53..f62f29b8b73 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminDebugHandler.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/provider/NodeAdminDebugHandler.java
@@ -2,7 +2,6 @@
package com.yahoo.vespa.hosted.node.admin.provider;
-import javax.annotation.concurrent.ThreadSafe;
import java.util.Map;
/**
@@ -10,7 +9,6 @@ import java.util.Map;
*
* @author hakonhall
*/
-@ThreadSafe
public interface NodeAdminDebugHandler {
/**
* The Object in the map values must be serializable with Jackson's ObjectMapper.
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Mark.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Mark.java
index 8058fecc631..9c6871010c8 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Mark.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Mark.java
@@ -2,13 +2,11 @@
package com.yahoo.vespa.hosted.node.admin.task.util.editor;
-import javax.annotation.concurrent.Immutable;
import java.util.Objects;
/**
* @author hakon
*/
-@Immutable
public class Mark {
private final Position position;
private final Version version;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Position.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Position.java
index ff6ebf32b06..8f892cf8650 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Position.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Position.java
@@ -1,7 +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.node.admin.task.util.editor;
-import javax.annotation.concurrent.Immutable;
import java.util.Comparator;
import java.util.Objects;
@@ -10,7 +9,6 @@ import java.util.Objects;
*
* @author hakon
*/
-@Immutable
public class Position implements Comparable<Position> {
private static final Position START_POSITION = new Position(0, 0);
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Version.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Version.java
index 375f6ae1d2c..137fb677e83 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Version.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/editor/Version.java
@@ -2,7 +2,6 @@
package com.yahoo.vespa.hosted.node.admin.task.util.editor;
-import javax.annotation.concurrent.Immutable;
import java.util.Objects;
/**
@@ -10,7 +9,6 @@ import java.util.Objects;
*
* @author hakon
*/
-@Immutable
public class Version {
private final int version;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/LineEdit.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/LineEdit.java
index 8015cc27fd4..a471d952dbc 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/LineEdit.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/LineEdit.java
@@ -1,7 +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.node.admin.task.util.file;
-import javax.annotation.concurrent.Immutable;
import java.util.List;
import static com.yahoo.vespa.hosted.node.admin.task.util.file.LineEdit.Type.REPLACE;
@@ -10,7 +9,6 @@ import static com.yahoo.vespa.hosted.node.admin.task.util.file.LineEdit.Type.NON
/**
* @author hakonhall
*/
-@Immutable
public class LineEdit {
enum Type { NONE, REPLACE }