summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2018-09-20 13:52:45 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2018-09-20 13:53:37 +0900
commit976934fc1481b3c85cea676196da6cb07004970e (patch)
treecb8525c13192a0f49e86bc3a0ae46eefc34e8b33
parent0b3affa4e2f464a9213f79abbd3181636e7b9b2d (diff)
Revert "Suppress "unlikely argument type" warnings for IdString"
Change I9d79b9064 was backported to stable-2.14 and fixes these warnings, so we no longer need the suppressions. This reverts commit 89ab8f45874954f6a3b74b29aa8f42cc010f814a. Change-Id: Ie2e38c12e908809df104e7ebe74921ac9902e42d
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java1
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java1
2 files changed, 0 insertions, 2 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java
index 5c7ae78ebd..ad55fd34a4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java
@@ -67,7 +67,6 @@ public class Revisions implements ChildCollection<ChangeResource, RevisionResour
throw new ResourceNotFoundException();
}
- @SuppressWarnings("unlikely-arg-type")
@Override
public RevisionResource parse(ChangeResource change, IdString id)
throws ResourceNotFoundException, AuthException, OrmException, IOException {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java
index c469463339..f268110e02 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java
@@ -42,7 +42,6 @@ public class ConfigCollection implements RestCollection<TopLevelResource, Config
return views;
}
- @SuppressWarnings("unlikely-arg-type")
@Override
public ConfigResource parse(TopLevelResource root, IdString id) throws ResourceNotFoundException {
if (id.get().equals("server")) {