Add @SuppressWarnings("removal") to not fail the build with -Werror f…

…or some JDKs Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Jan 18, 2024 · c17acba · c17acba
1 parent 904c9a9
commit c17acba
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 2 deletions.
diff --git a/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java b/client/sniffer/src/main/java/org/opensearch/client/sniff/Sniffer.java
@@ -305,6 +305,7 @@ public void shutdown() {
         }
     }
 
+    @SuppressWarnings("removal")
     static class SnifferThreadFactory implements ThreadFactory {
         private final AtomicInteger threadNumber = new AtomicInteger(1);
         private final String namePrefix;

diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java
@@ -218,6 +218,7 @@ Set<Property> getProperties() {
         return properties;
     }
 
+    @SuppressWarnings("removal")
     private Map<String, Object> retrieveCityGeoData(InetAddress ipAddress) {
         SpecialPermission.check();
         CityResponse response = AccessController.doPrivileged(
@@ -305,6 +306,7 @@ private Map<String, Object> retrieveCityGeoData(InetAddress ipAddress) {
         return geoData;
     }
 
+    @SuppressWarnings("removal")
     private Map<String, Object> retrieveCountryGeoData(InetAddress ipAddress) {
         SpecialPermission.check();
         CountryResponse response = AccessController.doPrivileged(
@@ -351,6 +353,7 @@ private Map<String, Object> retrieveCountryGeoData(InetAddress ipAddress) {
         return geoData;
     }
 
+    @SuppressWarnings("removal")
     private Map<String, Object> retrieveAsnGeoData(InetAddress ipAddress) {
         SpecialPermission.check();
         AsnResponse response = AccessController.doPrivileged(

diff --git a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java
@@ -84,6 +84,7 @@
  * The idea is to mimic as much as possible what happens with ES in production
  * mode (e.g. assign permissions and install security manager the same way)
  */
+@SuppressWarnings("removal")
 public class BootstrapForTesting {
 
     // TODO: can we share more code with the non-test side here

diff --git a/test/framework/src/main/java/org/opensearch/mockito/plugin/PriviledgedMockMaker.java b/test/framework/src/main/java/org/opensearch/mockito/plugin/PriviledgedMockMaker.java
@@ -31,6 +31,7 @@
  * Mockito plugin which wraps the Mockito calls into priviledged execution blocks and respects
  * SecurityManager presence.
  */
+@SuppressWarnings("removal")
 @SuppressForbidden(reason = "allow URL#getFile() to be used in tests")
 public class PriviledgedMockMaker implements MockMaker {
     private static AccessControlContext context;

diff --git a/test/framework/src/main/java/org/opensearch/test/FeatureFlagSetter.java b/test/framework/src/main/java/org/opensearch/test/FeatureFlagSetter.java
@@ -46,13 +46,15 @@ public static synchronized void clear() {
     private static final Logger LOGGER = LogManager.getLogger(FeatureFlagSetter.class);
     private final Set<String> flags = ConcurrentCollections.newConcurrentSet();
 
+    @SuppressWarnings("removal")
     @SuppressForbidden(reason = "Enables setting of feature flags")
     private void setFlag(String flag) {
         flags.add(flag);
         AccessController.doPrivileged((PrivilegedAction<String>) () -> System.setProperty(flag, "true"));
         LOGGER.info("set feature_flag={}", flag);
     }
 
+    @SuppressWarnings("removal")
     @SuppressForbidden(reason = "Clears the set feature flags")
     private void clearAll() {
         for (String flag : flags) {

diff --git a/test/framework/src/main/java/org/opensearch/test/disruption/LongGCDisruption.java b/test/framework/src/main/java/org/opensearch/test/disruption/LongGCDisruption.java
@@ -252,7 +252,7 @@ public TimeValue expectedTimeToHeal() {
      * returns true if some live threads were found. The caller is expected to call this method
      * until no more "live" are found.
      */
-    @SuppressWarnings("deprecation") // suspends/resumes threads intentionally
+    @SuppressWarnings({ "deprecation", "removal" }) // suspends/resumes threads intentionally
     @SuppressForbidden(reason = "suspends/resumes threads intentionally")
     protected boolean suspendThreads(Set<Thread> nodeThreads) {
         Thread[] allThreads = null;
@@ -360,7 +360,7 @@ protected void onBlockDetected(ThreadInfo blockedThread, @Nullable ThreadInfo bl
         );
     }
 
-    @SuppressWarnings("deprecation") // suspends/resumes threads intentionally
+    @SuppressWarnings({ "deprecation", "removal" }) // suspends/resumes threads intentionally
     @SuppressForbidden(reason = "suspends/resumes threads intentionally")
     protected void resumeThreads(Set<Thread> threads) {
         for (Thread thread : threads) {