further sonarcloud updates

oracle · Oct 11, 2023 · b10aa82 · b10aa82
1 parent cabd937
commit b10aa82
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 106 deletions.
diff --git a/...nce-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java b/...nce-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java
@@ -468,60 +468,57 @@ public List<Entry<Object, Data>> getData(RequestSender requestSender, Class<?> c
 
                     // if we have not yet evaluated if the reporter is available, e.g. value of null,
                     // then do it. Also check for the version as well.
-                    if (isReporterAvailable() == null || is1213AndAbove() == null)
+                    if ((isReporterAvailable() == null || is1213AndAbove() == null) && clusterData != null)
                         {
                         // get the Coherence version. Easier to do if we are connected to a cluster,
                         // but we have JMX connection as we have to look in data we collected.
 
-                        if (clusterData != null)
+                        for (Entry<Object, Data> entry : clusterData)
                             {
-                            for (Entry<Object, Data> entry : clusterData)
+                            // there will only be one cluster entry
+
+                            String sCoherenceVersion =
+                                entry.getValue().getColumn(ClusterData.VERSION).toString().replaceFirst(" .*$", "")
+                                                .replaceFirst("[\\.-]SNAPSHOT.*$","").replaceAll("-",".");
+                            m_sClusterVersion = sCoherenceVersion;
+
+                            int nVersion = 0;
+
+                            if (sCoherenceVersion.startsWith("3.5"))
+                                {
+                                // manual check as version numbering changed after 35
+                                nVersion = 353;
+                                }
+                            else if (sCoherenceVersion.startsWith("2"))
+                                {
+                                // check for versions such as 20.06 or 20.06.01 and convert them to an ever-increasing number
+                                // 20.06    -> 2006000
+                                // 20.06.1  -> 2006100
+                                // 20.06.10 -> 2006100
+                                String sStrippedVersion = sCoherenceVersion.replaceAll("\\.", "");
+                                nVersion = Integer.parseInt(sStrippedVersion) * (int) Math.pow(10, 7 - (double) sStrippedVersion.length());
+                                }
+                            else
+                                {
+                                nVersion = Integer.parseInt(sCoherenceVersion.replaceAll("\\.", ""));
+                                }
+
+                            LOGGER.log(Level.INFO, "Raw Coherence version identified as {0}", m_sClusterVersion);
+                            LOGGER.log(Level.INFO, "Numeric Coherence version identified as {0}", String.format("%d", nVersion));
+
+                            if (nVersion >= 121300)
+                                {
+                                // only set if the reporter available is it is not already set as we may have
+                                // got to this code path because is1213AndAbove() is still null
+                                setReporterAvailable(isReporterAvailable() == null || isReporterAvailable());
+                                m_fis1213AndAbove = true;
+                                }
+                            else
                                 {
-                                // there will only be one cluster entry
-
-                                String sCoherenceVersion =
-                                    entry.getValue().getColumn(ClusterData.VERSION).toString().replaceFirst(" .*$", "")
-                                                    .replaceFirst("[\\.-]SNAPSHOT.*$","").replaceAll("-",".");
-                                m_sClusterVersion = sCoherenceVersion;
-
-                                int nVersion = 0;
-
-                                if (sCoherenceVersion.startsWith("3.5"))
-                                    {
-                                    // manual check as version numbering changed after 35
-                                    nVersion = 353;
-                                    }
-                                else if (sCoherenceVersion.startsWith("2"))
-                                    {
-                                    // check for versions such as 20.06 or 20.06.01 and convert them to an ever-increasing number
-                                    // 20.06    -> 2006000
-                                    // 20.06.1  -> 2006100
-                                    // 20.06.10 -> 2006100
-                                    String sStrippedVersion = sCoherenceVersion.replaceAll("\\.", "");
-                                    nVersion = Integer.parseInt(sStrippedVersion) * (int) Math.pow(10, 7 - (double) sStrippedVersion.length());
-                                    }
-                                else
-                                    {
-                                    nVersion = Integer.parseInt(sCoherenceVersion.replaceAll("\\.", ""));
-                                    }
-
-                                LOGGER.log(Level.INFO, "Raw Coherence version identified as {0}", m_sClusterVersion);
-                                LOGGER.log(Level.INFO, "Numeric Coherence version identified as {0}", String.format("%d", nVersion));
-
-                                if (nVersion >= 121300)
-                                    {
-                                    // only set if the reporter available is it is not already set as we may have
-                                    // got to this code path because is1213AndAbove() is still null
-                                    setReporterAvailable(isReporterAvailable() == null || isReporterAvailable());
-                                    m_fis1213AndAbove = true;
-                                    }
-                                else
-                                    {
-                                    setReporterAvailable(isReporterAvailable() != null && isReporterAvailable());
-                                    m_fis1213AndAbove = false;
-                                    }
-                                m_nClusterVersion = nVersion;
+                                setReporterAvailable(isReporterAvailable() != null && isReporterAvailable());
+                                m_fis1213AndAbove = false;
                                 }
+                            m_nClusterVersion = nVersion;
                             }
                         }
 

diff --git a/...le/coherence/plugin/visualvm/datasource/CoherenceClusterDataSourceDescriptorProvider.java b/...le/coherence/plugin/visualvm/datasource/CoherenceClusterDataSourceDescriptorProvider.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,5 +75,5 @@ public static void unregister()
     /**
      * The static singleton instance of {@link CoherenceClusterDataSourceDescriptorProvider}.
      */
-    final private static CoherenceClusterDataSourceDescriptorProvider INSTANCE = new CoherenceClusterDataSourceDescriptorProvider();
+    private final static CoherenceClusterDataSourceDescriptorProvider INSTANCE = new CoherenceClusterDataSourceDescriptorProvider();
     }
diff --git a/...m/oracle/coherence/plugin/visualvm/datasource/CoherenceClusterDataSourceViewProvider.java b/...m/oracle/coherence/plugin/visualvm/datasource/CoherenceClusterDataSourceViewProvider.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
@@ -80,5 +80,5 @@ public static void unregister()
     /**
      * The singleton instance of {@link CoherenceClusterDataSourceViewProvider}.
      */
-    final protected static CoherenceClusterDataSourceViewProvider INSTANCE = new CoherenceClusterDataSourceViewProvider();
+    protected final static CoherenceClusterDataSourceViewProvider INSTANCE = new CoherenceClusterDataSourceViewProvider();
     }
diff --git a/...n/java/com/oracle/coherence/plugin/visualvm/discovery/DiscoverCoherenceClusterAction.java b/...n/java/com/oracle/coherence/plugin/visualvm/discovery/DiscoverCoherenceClusterAction.java
@@ -163,7 +163,7 @@ protected boolean isEnabled(Host host) {
     @Override
     protected void updateState(Set<Host> selectedHosts)
         {
-        if (tracksSelection)
+        if (m_fTracksSelection)
             {
             super.updateState(selectedHosts);
             }
@@ -187,7 +187,7 @@ public static synchronized DiscoverCoherenceClusterAction selectionAware()
         if (selectionAware == null)
             {
             selectionAware = new DiscoverCoherenceClusterAction();
-            selectionAware.tracksSelection = true;
+            selectionAware.m_fTracksSelection = true;
             }
         return selectionAware;
         }
@@ -208,5 +208,5 @@ public static synchronized DiscoverCoherenceClusterAction selectionAware()
 
     private static DiscoverCoherenceClusterAction alwaysEnabled;
     private static DiscoverCoherenceClusterAction selectionAware;
-    private boolean tracksSelection = false;
+    private boolean                               m_fTracksSelection = false;
     }
diff --git a/...isualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/helper/GraphHelper.java b/...isualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/helper/GraphHelper.java
@@ -307,7 +307,7 @@ public static void addValuesToCompletedTasksGraph(SimpleXYChartSupport graph, lo
      */
     public static void addValuesToTotalProxyConnectionsGraph(SimpleXYChartSupport graph, int cTotalConnections)
         {
-        graph.addValues(System.currentTimeMillis(), new long[] {(long) cTotalConnections});
+        graph.addValues(System.currentTimeMillis(), new long[] {cTotalConnections});
         }
 
     /**