Remove @SuppressWarnings annotations with non-standard values
Change-Id: I469f809fa3187577e460d692af260837d641a55a
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
index 03ea22d..623dc97 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
@@ -252,8 +252,6 @@
Optional<EditInfo> originalEdit = getEdit(changeId2);
assertThat(originalEdit).value().baseRevision()
.isEqualTo(previousPatchSet.getRevision().get());
- // The previous check ensures that a value is present in the Optional.
- @SuppressWarnings("OptionalGetWithoutIsPresent")
Timestamp beforeRebase = originalEdit.get().commit.committer.date;
gApi.changes()
.id(changeId2)
@@ -282,8 +280,6 @@
Optional<EditInfo> originalEdit = getEdit(changeId2);
assertThat(originalEdit).value().baseRevision()
.isEqualTo(previousPatchSet.getRevision().get());
- // The previous check ensures that a value is present in the Optional.
- @SuppressWarnings("OptionalGetWithoutIsPresent")
Timestamp beforeRebase = originalEdit.get().commit.committer.date;
adminRestSession.post(urlRebase(changeId2)).assertNoContent();
ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_NEW);
@@ -787,7 +783,6 @@
.modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW));
Optional<EditInfo> edit = getEdit(changeId);
assertThat(edit).isPresent();
- @SuppressWarnings("OptionalGetWithoutIsPresent")
String editCommitId = edit.get().commit.commit;
RestResponse r = adminRestSession.getJsonAccept(urlRevisionFiles(changeId,
@@ -810,7 +805,6 @@
.modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW));
Optional<EditInfo> edit = getEdit(changeId);
assertThat(edit).isPresent();
- @SuppressWarnings("OptionalGetWithoutIsPresent")
String editCommitId = edit.get().commit.commit;
RestResponse r = adminRestSession.getJsonAccept(urlDiff(changeId,
@@ -902,7 +896,6 @@
.currentPatchSet();
}
- @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
private void ensureSameBytes(Optional<BinaryResult> fileContent,
byte[] expectedFileBytes) throws IOException {
assertThat(fileContent).value().bytes().isEqualTo(expectedFileBytes);
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index f1af305..1e0e948 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -386,7 +386,6 @@
r.assertOkStatus();
edit = getEdit(r.getChangeId());
assertThat(edit).isPresent();
- @SuppressWarnings("OptionalGetWithoutIsPresent")
EditInfo editInfo = edit.get();
r.assertMessage("Updated Changes:\n "
+ canonicalWebUrl.get()
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
index 66200d7..c577f65 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java
@@ -585,7 +585,6 @@
.modifyFile("a.txt", RawInputUtil.create(new byte[] {'a'}));
Optional<EditInfo> edit = getEdit(changeId2);
assertThat(edit).isPresent();
- @SuppressWarnings("OptionalGetWithoutIsPresent")
ObjectId editRev = ObjectId.fromString(edit.get().commit.commit);
PatchSet.Id ps1_1 = getPatchSetId(c1_1);
diff --git a/gerrit-test-util/src/main/java/com/google/gerrit/extensions/common/EditInfoSubject.java b/gerrit-test-util/src/main/java/com/google/gerrit/extensions/common/EditInfoSubject.java
index cf71ca1..1471411 100644
--- a/gerrit-test-util/src/main/java/com/google/gerrit/extensions/common/EditInfoSubject.java
+++ b/gerrit-test-util/src/main/java/com/google/gerrit/extensions/common/EditInfoSubject.java
@@ -42,7 +42,6 @@
.that(editInfo);
}
- @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
public static OptionalSubject<EditInfoSubject, EditInfo> assertThat(
Optional<EditInfo> editInfoOptional) {
return OptionalSubject.assertThat(editInfoOptional,
diff --git a/gerrit-test-util/src/main/java/com/google/gerrit/extensions/restapi/BinaryResultSubject.java b/gerrit-test-util/src/main/java/com/google/gerrit/extensions/restapi/BinaryResultSubject.java
index 15cd16c..bf6bea2 100644
--- a/gerrit-test-util/src/main/java/com/google/gerrit/extensions/restapi/BinaryResultSubject.java
+++ b/gerrit-test-util/src/main/java/com/google/gerrit/extensions/restapi/BinaryResultSubject.java
@@ -46,7 +46,6 @@
.that(binaryResult);
}
- @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
public static OptionalSubject<BinaryResultSubject, BinaryResult> assertThat(
Optional<BinaryResult> binaryResultOptional) {
return OptionalSubject.assertThat(binaryResultOptional,
diff --git a/gerrit-test-util/src/main/java/com/google/gerrit/truth/OptionalSubject.java b/gerrit-test-util/src/main/java/com/google/gerrit/truth/OptionalSubject.java
index 68a73fb..daece87 100644
--- a/gerrit-test-util/src/main/java/com/google/gerrit/truth/OptionalSubject.java
+++ b/gerrit-test-util/src/main/java/com/google/gerrit/truth/OptionalSubject.java
@@ -25,7 +25,6 @@
import java.util.Optional;
import java.util.function.Function;
-@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
public class OptionalSubject<S extends Subject<S, ? super T>, T>
extends Subject<OptionalSubject<S, T>, Optional<T>> {
@@ -76,7 +75,6 @@
isAbsent();
}
- @SuppressWarnings("OptionalGetWithoutIsPresent")
public S value() {
isNotNull();
isPresent();
