From ee5e69980d1d02f021e7ec9d3ab88f22c9fd408d Mon Sep 17 00:00:00 2001 From: Aditya Jindal Date: Fri, 30 Oct 2020 13:45:18 -0700 Subject: [PATCH 1/3] Since AES is on JDK 8 adding custom classes --- .../actions/CacheClearAction.java | 2 +- .../util/SuppressFBWarnings.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/SuppressFBWarnings.java diff --git a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java index f037feeb5..94c1bfa2c 100644 --- a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java +++ b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java @@ -19,6 +19,7 @@ import com.amazon.opendistro.elasticsearch.performanceanalyzer.AppContext; import com.amazon.opendistro.elasticsearch.performanceanalyzer.rca.store.rca.cluster.NodeKey; +import com.amazon.opendistro.elasticsearch.performanceanalyzer.util.SuppressFBWarnings; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.annotations.SerializedName; @@ -27,7 +28,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import org.graalvm.compiler.options.SuppressFBWarnings; public class CacheClearAction extends SuppressibleAction { public static final String NAME = "CacheClear"; diff --git a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/SuppressFBWarnings.java b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/SuppressFBWarnings.java new file mode 100644 index 000000000..f7c310e0d --- /dev/null +++ b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/SuppressFBWarnings.java @@ -0,0 +1,19 @@ +package com.amazon.opendistro.elasticsearch.performanceanalyzer.util; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.CLASS) +public @interface SuppressFBWarnings { + /** + * The set of FindBugs warnings that are to be suppressed in + * annotated element. The value can be a bug category, kind or pattern. + * + */ + String[] value() default {}; + + /** + * Optional documentation of the reason why the warning is suppressed + */ + String justification() default ""; +} \ No newline at end of file From 8214dc85599f546c48fbd4555476fb85c7ab445e Mon Sep 17 00:00:00 2001 From: Aditya Jindal Date: Fri, 30 Oct 2020 14:02:31 -0700 Subject: [PATCH 2/3] Adding New Line --- .../performanceanalyzer/util/SuppressFBWarnings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/SuppressFBWarnings.java b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/SuppressFBWarnings.java index f7c310e0d..e49d6d332 100644 --- a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/SuppressFBWarnings.java +++ b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/util/SuppressFBWarnings.java @@ -16,4 +16,4 @@ * Optional documentation of the reason why the warning is suppressed */ String justification() default ""; -} \ No newline at end of file +} From 6097ac15f46e700d1f369a80480c93e725c52328 Mon Sep 17 00:00:00 2001 From: Aditya Jindal Date: Mon, 2 Nov 2020 12:28:44 -0800 Subject: [PATCH 3/3] Adding Getter for the CanUpdate and the CoolOffPeriodInMillis --- .../decisionmaker/actions/CacheClearAction.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java index 94c1bfa2c..92495dee4 100644 --- a/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java +++ b/src/main/java/com/amazon/opendistro/elasticsearch/performanceanalyzer/decisionmaker/actions/CacheClearAction.java @@ -131,10 +131,8 @@ public static class Summary { @SerializedName(value = IP) private String[] ip; @SerializedName(value = COOL_OFF_PERIOD) - @SuppressFBWarnings(value = "URF_UNREAD_FIELD", justification = "Used in Summary Serializing") private long coolOffPeriodInMillis; @SerializedName(value = CAN_UPDATE) - @SuppressFBWarnings(value = "URF_UNREAD_FIELD", justification = "Used in Summary Serializing") private boolean canUpdate; public Summary(final List impactedNodes, @@ -155,5 +153,13 @@ public String toJson() { Gson gson = new GsonBuilder().disableHtmlEscaping().create(); return gson.toJson(this); } + + public boolean getCanUpdate() { + return this.canUpdate; + } + + public long getCoolOffPeriodInMillis() { + return this.coolOffPeriodInMillis; + } } }