Fixup http proxy details report / minor code cleanup (#58)

Tim Middleton · web-flow · commit ef3ab4c04963 · 2023-03-15T10:06:50.000+08:00
* Fix up http proxy details report / minor code cleanup
* minor fix to cache storage data
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/helper/HttpRequestSender.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/helper/HttpRequestSender.java
@@ -989,7 +989,8 @@ public JsonNode getDataForStorageManagerMembers(String sServiceName, String sDom
                 .addPathSegment(encodeServiceName(sServiceName)).addPathSegment(CACHES).addPathSegment(sCacheName)
                 .addPathSegment(MEMBERS).addQueryParameter(FIELDS,
                                                                    "nodeId,locksGranted,locksPending,listenerRegistrations,maxQueryDurationMillis,maxQueryDescription," +
-                                                                   "nonOptimizedQueryAverageMillis,optimizedQueryAverageMillis,indexTotalUnits,indexingTotalMillis")
+                                                                   "nonOptimizedQueryAverageMillis,optimizedQueryAverageMillis,indexTotalUnits,indexingTotalMillis," +
+                                                                   "listenerFilterCount,listenerKeyCount")
                 .addQueryParameter(LINKS, "");
 
         if (sDomainPartition != null)
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/AbstractElasticData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/AbstractElasticData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,7 +96,7 @@ public AbstractElasticData()
      */
     public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMModel model)
         {
-        SortedMap<Object, Data> mapData = new TreeMap<Object, Data>();
+        SortedMap<Object, Data> mapData = new TreeMap<>();
         Data                    data;
 
         // The following rules for compaction count
@@ -162,7 +162,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMMo
                 mapData.put(nodeId, data);
                 }
 
-            return new ArrayList<Map.Entry<Object, Data>>(mapData.entrySet());
+            return new ArrayList<>(mapData.entrySet());
             }
         catch (Exception e)
             {
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/CacheData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/CacheData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,7 +74,7 @@ public CacheData()
     @Override
     public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMModel model)
         {
-        SortedMap<Object, Data> mapData = new TreeMap<Object, Data>();
+        SortedMap<Object, Data> mapData = new TreeMap<>();
         Data                    data;
 
         try
@@ -183,7 +183,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMMo
                     }
 
                 // update the cache entry averages
-                data = (CacheData) mapData.get(key);
+                data = mapData.get(key);
 
                 // for FIXED unit calculator make the memory bytes and MB and avg object size null
                 if ("FIXED".equals(data.getColumn(CacheData.UNIT_CALCULATOR)))
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/CacheDetailData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/CacheDetailData.java
@@ -85,7 +85,7 @@ public CacheDetailData(CacheType type, int columns)
     @Override
     public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, VisualVMModel model)
         {
-        SortedMap<Object, Data> cacheMap = new TreeMap<Object, Data>();
+        SortedMap<Object, Data> cacheMap = new TreeMap<>();
         Data                    data;
         Pair<String, String> selectedCache = model.getSelectedCache();
 
@@ -103,7 +103,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
 
                 for (Iterator<ObjectName> iter = resultSet.iterator(); iter.hasNext(); )
                     {
-                    ObjectName objName = (ObjectName) iter.next();
+                    ObjectName objName = iter.next();
 
                     // check which cache tier data we should extract.
                     if (objName.getKeyProperty("tier").equals(m_type.getValue()))
@@ -113,7 +113,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
                         }
                     }
 
-                return new ArrayList<Map.Entry<Object, Data>>(cacheMap.entrySet());
+                return new ArrayList<>(cacheMap.entrySet());
                 }
             catch (Exception e)
                 {
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/CacheStorageManagerData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/CacheStorageManagerData.java
@@ -71,7 +71,7 @@ public CacheStorageManagerData()
     @Override
     public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, VisualVMModel model)
         {
-        SortedMap<Object, Data> mapData = new TreeMap<Object, Data>();
+        SortedMap<Object, Data> mapData = new TreeMap<>();
         Data                    data;
         Pair<String, String> selectedCache = model.getSelectedCache();
 
@@ -140,7 +140,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
                     mapData.put(data.getColumn(0), data);
                     }
 
-                return new ArrayList<Map.Entry<Object, Data>>(mapData.entrySet());
+                return new ArrayList<>(mapData.entrySet());
                 }
             catch (Exception e)
                 {
@@ -288,8 +288,9 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel
                 data.setColumn(CacheStorageManagerData.NODE_ID, nodeCacheStorage.get("nodeId").asInt());
                 data.setColumn(CacheStorageManagerData.LOCKS_GRANTED, locksGranted.asInt());
                 data.setColumn(CacheStorageManagerData.LOCKS_PENDING, nodeCacheStorage.get("locksPending").asInt());
-                data.setColumn(CacheStorageManagerData.LISTENER_KEY_COUNT,nodeCacheStorage.get("listenerKeyCount").asInt());
-                data.setColumn(CacheStorageManagerData.LISTENER_FILTER_COUNT,nodeCacheStorage.get("listenerFilterCount").asInt());
+                JsonNode listenerKeyCount = nodeCacheStorage.get("listenerKeyCount");
+                data.setColumn(CacheStorageManagerData.LISTENER_KEY_COUNT, listenerKeyCount == null ? 0 : listenerKeyCount.asInt());
+                data.setColumn(CacheStorageManagerData.LISTENER_FILTER_COUNT, nodeCacheStorage.get("listenerFilterCount").asInt());
                 data.setColumn(CacheStorageManagerData.MAX_QUERY_DURATION, nodeCacheStorage.get("maxQueryDurationMillis").asLong());
                 data.setColumn(CacheStorageManagerData.MAX_QUERY_DESCRIPTION, nodeCacheStorage.get("maxQueryDescription").asText());
                 data.setColumn(CacheStorageManagerData.NON_OPTIMIZED_QUERY_AVG, nodeCacheStorage.get("nonOptimizedQueryAverageMillis").asLong());
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ClusterData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ClusterData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,7 +117,7 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel
      */
     protected SortedMap<Object, Data> getJMXDataMap(RequestSender requestSender, VisualVMModel model)
         {
-        SortedMap<Object, Data> mapData = new TreeMap<Object, Data>();
+        SortedMap<Object, Data> mapData = new TreeMap<>();
         HttpRequestSender httpRequestSender = null;
 
         try
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/HttpSessionData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/HttpSessionData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ public HttpSessionData()
     @Override
     public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, VisualVMModel model)
         {
-        SortedMap<Object, Data> mapData          = new TreeMap<Object, Data>();
+        SortedMap<Object, Data> mapData          = new TreeMap<>();
         boolean                 isWebLogicServer = false;
         Data                    data;
 
@@ -177,7 +177,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
                     }
                 }
 
-            return new ArrayList<Map.Entry<Object, Data>>(mapData.entrySet());
+            return new ArrayList<>(mapData.entrySet());
             }
         catch (Exception e)
             {
@@ -188,24 +188,23 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
         }
 
     @Override
-    public String getReporterReport()
+    public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel     model,
+                                                                     HttpRequestSender requestSender)
+            throws Exception
         {
-        return null;    // see comment below
+        // no reports being used, hence using default functionality provided in getJMXData
+        return null;
         }
 
     @Override
-    public Data processReporterData(Object[] aoColumns, VisualVMModel model)
+    public String getReporterReport()
         {
-        // difficult to implement using reporter
-        return null;
+        return null;    // see comment below
         }
 
     @Override
-    public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel     model,
-                                                                     HttpRequestSender requestSender)
-            throws Exception
+    public Data processReporterData(Object[] aoColumns, VisualVMModel model)
         {
-        // no reports being used, hence using default functionality provided in getJMXData
         return null;
         }
 
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/MemberData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/MemberData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -81,8 +81,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
 
             for (Iterator<ObjectName> nodIter = setNodeNames.iterator(); nodIter.hasNext(); )
                 {
-                ObjectName nodeNameObjName = (ObjectName) nodIter.next();
-
+                ObjectName nodeNameObjName = nodIter.next();
                 Integer    nodeId          = Integer.valueOf(nodeNameObjName.getKeyProperty("nodeId"));
 
                 data = new MemberData();
@@ -112,7 +111,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
 
                 mapData.put(nodeId, data);
                 }
-            return new ArrayList<Map.Entry<Object, Data>>(mapData.entrySet());
+            return new ArrayList<>(mapData.entrySet());
 
             }
         catch (Exception e)
@@ -216,7 +215,7 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel m
     public static int ADDRESS = 1;
 
     /**
-     * Array index for machine name.
+     * Array index for port.
      */
     public static int PORT = 2;
 
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/PersistenceData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/PersistenceData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,7 +212,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
                 mapData.put(sServiceNameKey, data);
                 }
 
-            return new ArrayList<Map.Entry<Object, Data>>(mapData.entrySet());
+            return new ArrayList<>(mapData.entrySet());
             }
         catch (Exception e)
             {
@@ -222,12 +222,6 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
             }
         }
 
-    @Override
-    public String getReporterReport()
-        {
-        return null;    // see comment below
-        }
-
     @Override
     public Data processReporterData(Object[] aoColumns, VisualVMModel model)
         {
@@ -238,6 +232,12 @@ public Data processReporterData(Object[] aoColumns, VisualVMModel model)
         return null;
         }
 
+    @Override
+    public String getReporterReport()
+        {
+        return null;    // see comment below
+        }
+
     @Override
     public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel model, HttpRequestSender requestSender)
             throws Exception
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ProxyData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ProxyData.java
@@ -74,7 +74,7 @@ public ProxyData()
     @Override
     public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, VisualVMModel model)
         {
-        SortedMap<Object, Data> mapData = new TreeMap<Object, Data>();
+        SortedMap<Object, Data> mapData = new TreeMap<>();
         Data                    data;
 
         try
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ServiceData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ServiceData.java
@@ -74,8 +74,8 @@ public ServiceData()
     @SuppressWarnings("rawtypes")
     public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMModel model)
         {
-        SortedMap<Object, Data> mapData              = new TreeMap<Object, Data>();
-        Set<String>             setDistributedCaches = new HashSet<String>();
+        SortedMap<Object, Data> mapData              = new TreeMap<>();
+        Set<String>             setDistributedCaches = new HashSet<>();
         Data                    data;
 
         try
@@ -101,7 +101,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMMo
 
                 mapData.put(sServiceName, data);
 
-                // if its dist cache or federated then save so we don't, double count size for repl
+                // if its dist cache or federated then save, so we don't, double count size for repl
                 // caches
                 String sServiceType = (String) sender.getAttribute(cacheNameObjName, "Type");
                 if (isDistributed(sServiceType))
@@ -121,7 +121,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMMo
                 String[] asServiceDetails = getDomainAndService(sRawServiceName);
                 String   sDomainPartition = asServiceDetails[0];
                 String   sServiceName     = asServiceDetails[1];
-                // select only the current service so we can determine the number of storage-enabled
+                // select only the current service, so we can determine the number of storage-enabled
                 // members.
                 Set resultSet = sender.getMembersOfService(sServiceName, sDomainPartition);
 
diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ServiceMemberData.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/ServiceMemberData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMMo
 
         if (sSelectedService != null)
             {
-            SortedMap<Object, Data> mapData = new TreeMap<Object, Data>();
+            SortedMap<Object, Data> mapData = new TreeMap<>();
             String[] asParts                = getServiceParts(sSelectedService);
             String   sDomainPartition       = asParts.length == 1 ? null : asParts[0];
 
@@ -124,7 +124,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMMo
                     mapData.put(nodeId, data);
                     }
 
-                return new ArrayList<Map.Entry<Object, Data>>(mapData.entrySet());
+                return new ArrayList<>(mapData.entrySet());
 
                 }
             catch (Exception e)
diff --git a/coherence-visualvm-plugin/src/main/resources/reports/visualvm/http-proxy-stats-detail.xml b/coherence-visualvm-plugin/src/main/resources/reports/visualvm/http-proxy-stats-detail.xml
@@ -65,7 +65,6 @@
 
             <column id="HostIp">
                 <name>HostIP</name>
-                <group-by>true</group-by>
             </column>
 
             <column id="AverageRequestTime">

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -96,7 +96,7 @@ public AbstractElasticData()`
`96`	`96`	`*/`
`97`	`97`	`public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMModel model)`
`98`	`98`	`{`
`99`		`- SortedMap<Object, Data> mapData = new TreeMap<Object, Data>();`
	`99`	`+ SortedMap<Object, Data> mapData = new TreeMap<>();`
`100`	`100`	`Data data;`
`101`	`101`
`102`	`102`	`// The following rules for compaction count`
`@@ -162,7 +162,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender sender, VisualVMMo`
`162`	`162`	`mapData.put(nodeId, data);`
`163`	`163`	`}`
`164`	`164`
`165`		`- return new ArrayList<Map.Entry<Object, Data>>(mapData.entrySet());`
	`165`	`+ return new ArrayList<>(mapData.entrySet());`
`166`	`166`	`}`
`167`	`167`	`catch (Exception e)`
`168`	`168`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public CacheDetailData(CacheType type, int columns)`
`85`	`85`	`@Override`
`86`	`86`	`public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, VisualVMModel model)`
`87`	`87`	`{`
`88`		`- SortedMap<Object, Data> cacheMap = new TreeMap<Object, Data>();`
	`88`	`+ SortedMap<Object, Data> cacheMap = new TreeMap<>();`
`89`	`89`	`Data data;`
`90`	`90`	`Pair<String, String> selectedCache = model.getSelectedCache();`
`91`	`91`
`@@ -103,7 +103,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis`
`103`	`103`
`104`	`104`	`for (Iterator<ObjectName> iter = resultSet.iterator(); iter.hasNext(); )`
`105`	`105`	`{`
`106`		`- ObjectName objName = (ObjectName) iter.next();`
	`106`	`+ ObjectName objName = iter.next();`
`107`	`107`
`108`	`108`	`// check which cache tier data we should extract.`
`109`	`109`	`if (objName.getKeyProperty("tier").equals(m_type.getValue()))`
`@@ -113,7 +113,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- return new ArrayList<Map.Entry<Object, Data>>(cacheMap.entrySet());`
	`116`	`+ return new ArrayList<>(cacheMap.entrySet());`
`117`	`117`	`}`
`118`	`118`	`catch (Exception e)`
`119`	`119`	`{`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public ProxyData()`
`74`	`74`	`@Override`
`75`	`75`	`public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, VisualVMModel model)`
`76`	`76`	`{`
`77`		`- SortedMap<Object, Data> mapData = new TreeMap<Object, Data>();`
	`77`	`+ SortedMap<Object, Data> mapData = new TreeMap<>();`
`78`	`78`	`Data data;`
`79`	`79`
`80`	`80`	`try`