From 318526b01e45698cd1fa2c930a97f8c2aa84fb2d Mon Sep 17 00:00:00 2001
From: Erik Gahlin <egahlin@openjdk.org>
Date: Tue, 20 Dec 2022 12:22:01 +0000
Subject: [PATCH] 8299031: JFR: Clean up jdk.management.jfr

Reviewed-by: mgronlun
---
 .../classes/jdk/management/jfr/ConfigurationInfo.java  | 10 ++++------
 .../classes/jdk/management/jfr/EventTypeInfo.java      |  9 ++++-----
 .../classes/jdk/management/jfr/RecordingInfo.java      |  7 +++----
 .../jdk/management/jfr/RemoteRecordingStream.java      |  8 --------
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/ConfigurationInfo.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/ConfigurationInfo.java
index 42960860d6f..c2a4c2dcdca 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/ConfigurationInfo.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/ConfigurationInfo.java
@@ -70,17 +70,15 @@ public final class ConfigurationInfo {
     }
 
     private static Map<String, String> createMap(Object o) {
-        if (o instanceof TabularData) {
-            TabularData td = (TabularData) o;
+        if (o instanceof TabularData td) {
             Collection<?> values = td.values();
             Map<String, String> map = HashMap.newHashMap(values.size());
             for (Object value : td.values()) {
-                if (value instanceof CompositeData) {
-                    CompositeData cdRow = (CompositeData) value;
+                if (value instanceof CompositeData cdRow) {
                     Object k = cdRow.get("key");
                     Object v = cdRow.get("value");
-                    if (k instanceof String && v instanceof String) {
-                        map.put((String) k, (String) v);
+                    if (k instanceof String sk && v instanceof String sv) {
+                        map.put(sk, sv);
                     }
                 }
             }
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/EventTypeInfo.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/EventTypeInfo.java
index f1797254719..d2b43fd874b 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/EventTypeInfo.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/EventTypeInfo.java
@@ -88,12 +88,11 @@ public final class EventTypeInfo {
     }
 
     private static List<SettingDescriptorInfo> createSettings(Object settings) {
-        if (settings != null && settings.getClass().isArray()) {
-            Object[] settingsArray = (Object[]) settings;
+        if (settings instanceof Object[] settingsArray) {
             List<SettingDescriptorInfo> list = new ArrayList<>(settingsArray.length);
-            for (Object cd : settingsArray) {
-                if (cd instanceof CompositeData) {
-                    list.add(SettingDescriptorInfo.from((CompositeData) cd));
+            for (Object element : settingsArray) {
+                if (element instanceof CompositeData cd) {
+                    list.add(SettingDescriptorInfo.from(cd));
                 }
             }
             return Collections.unmodifiableList(list);
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RecordingInfo.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RecordingInfo.java
index 8d2f1e061cc..420cbcddcbf 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RecordingInfo.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RecordingInfo.java
@@ -106,8 +106,7 @@ public final class RecordingInfo {
         durationInSeconds = (long) cd.get("duration");
         settings = new LinkedHashMap<>();
         Object map = cd.get("settings");
-        if (map instanceof TabularData) {
-            TabularData td = (TabularData) map;
+        if (map instanceof TabularData td) {
             List<String> keyNames = td.getTabularType().getIndexNames();
             int size = keyNames.size();
             for (Object keys : td.keySet()) {
@@ -115,8 +114,8 @@ public final class RecordingInfo {
                 for (int i = 0; i < size; i++) {
                     String key = keyNames.get(i);
                     Object value = keyValues[i];
-                    if (value instanceof String) {
-                        settings.put(key, (String) value);
+                    if (value instanceof String s) {
+                        settings.put(key, s);
                     }
                 }
             }
diff --git a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java
index 34776a01bed..1b21191f3ad 100644
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java
@@ -295,14 +295,6 @@ public final class RemoteRecordingStream implements EventStream {
         }
     }
 
-    private Map<String, String> getRecordingOptions() throws IOException {
-        try {
-            return mbean.getRecordingOptions(recordingId);
-        } catch (Exception e) {
-            throw new IOException("Could not get recording options: " + e.getMessage(), e);
-        }
-    }
-
     /**
      * Replaces all settings for this recording stream.
      * <p>