Minor code updates

Author: Tim Middleton

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/CoherenceApplicationType.java

@@ -55,7 +55,7 @@ public CoherenceApplicationType(Application app, Jvm jvm, String sMainClass)
         this.f_description = sDescription
                              + " (" + sMainClass + ")"
                              + "\nCommand Line:"  + jvm.getJvmArgs();
-        this.iconPath      = IMAGE_PATH;
+        this.f_sIconPath = IMAGE_PATH;
         }
 
     // ----- accessors ------------------------------------------------------
@@ -81,7 +81,7 @@ public String getDescription()
     @Override
     public Image getIcon()
         {
-        return ImageUtilities.loadImage(iconPath, true);
+        return ImageUtilities.loadImage(f_sIconPath, true);
         }
 
     // ----- data members ----------------------------------------------------
@@ -99,16 +99,18 @@ public Image getIcon()
     /**
      * Icon path.
      */
-    private final String  iconPath;
+    private final String f_sIconPath;
 
     /**
      * {@link Map} of possible classes to detect.
      */
-    static final Map<String, String> f_mapClasses = new HashMap<String, String>()
-        {{
-        put("com.tangosol.net.DefaultCacheServer", "Default Cache Server");
-        put("com.tangosol.net.CacheFactory", "CacheFactory");
-        put("com.tangosol.net.Coherence", "Coherence Bootstrap");
-        put("com.tangosol.coherence.dslquery", "CohQL Client");
-        }};
+    static final Map<String, String> f_mapClasses = new HashMap<String, String>();
+
+    static
+        {
+        f_mapClasses.put("com.tangosol.net.DefaultCacheServer", "Default Cache Server");
+        f_mapClasses.put("com.tangosol.net.CacheFactory", "CacheFactory");
+        f_mapClasses.put("com.tangosol.net.Coherence", "Coherence Bootstrap");
+        f_mapClasses.put("com.tangosol.coherence.dslquery", "CohQL Client");
+        }
     }

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/CoherenceApplicationTypeFactory.java

@@ -75,5 +75,5 @@ public ApplicationType createApplicationTypeFor(Application app, Jvm jvm, String
     /**
      * Factory instance.
      */
-    private final static CoherenceApplicationTypeFactory INSTANCE = new CoherenceApplicationTypeFactory();
+    private static final CoherenceApplicationTypeFactory INSTANCE = new CoherenceApplicationTypeFactory();
     }

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/CoherenceOptionsPanel.java

@@ -89,7 +89,7 @@ public class CoherenceOptionsPanel
 
     // ----- CoherenceOptionsPanel methods ---------------------------------
 
-    private final ChangeListener changeListener = new ChangeListener()
+    private final transient ChangeListener f_changeListener = new ChangeListener()
         {
         public void stateChanged(ChangeEvent e)
             {
@@ -146,8 +146,8 @@ boolean valid()
             }
         catch (Exception e)
             {
+            return false;
             }
-        return false;
         }
 
     /**
@@ -365,16 +365,16 @@ private void addHeader(int y, String sLabel)
      */
     private void startTrackingChanges()
         {
-        m_refreshTime.getModel().addChangeListener(changeListener);
-        m_logQueryTimes.getModel().addChangeListener(changeListener);
-        m_disableMBeanCheck.getModel().addChangeListener(changeListener);
-        m_enableRestDebug.getModel().addChangeListener(changeListener);
-        m_restRequestTimout.getModel().addChangeListener(changeListener);
-        m_enableZoom.getModel().addChangeListener(changeListener);
-        m_enablePersistenceList.getModel().addChangeListener(changeListener);
-        m_enableClusterSnapshot.getModel().addChangeListener(changeListener);
-        m_adminFunctionsEnabled.getModel().addChangeListener(changeListener);
-        m_disableSSLCertValidation.getModel().addChangeListener(changeListener);
+        m_refreshTime.getModel().addChangeListener(f_changeListener);
+        m_logQueryTimes.getModel().addChangeListener(f_changeListener);
+        m_disableMBeanCheck.getModel().addChangeListener(f_changeListener);
+        m_enableRestDebug.getModel().addChangeListener(f_changeListener);
+        m_restRequestTimout.getModel().addChangeListener(f_changeListener);
+        m_enableZoom.getModel().addChangeListener(f_changeListener);
+        m_enablePersistenceList.getModel().addChangeListener(f_changeListener);
+        m_enableClusterSnapshot.getModel().addChangeListener(f_changeListener);
+        m_adminFunctionsEnabled.getModel().addChangeListener(f_changeListener);
+        m_disableSSLCertValidation.getModel().addChangeListener(f_changeListener);
         }
 
     //----- inner classes ---------------------------------------------------
@@ -441,20 +441,20 @@ public String analyze(boolean fVerbose)
                                      long nLineId = lineId.incrementAndGet();
                                      mapLines.put(nLineId, s);
                                      return  nLineId + " " +
-                                             s.replaceAll("^.*thread=","")
-                                              .replaceAll(", .*" + PARTITION_ID, "")
-                                              .replaceAll(", .*" + PARTITION_SET, " ")
-                                              .replaceAll(", " + OWNER, "")
-                                              .replaceAll(", " + ACTION, "")
-                                              .replaceAll(", " + UNAVAILABLE_TIME, "");
+                                             s.replace("^.*thread=","")
+                                              .replace(", .*" + PARTITION_ID, "")
+                                              .replace(", .*" + PARTITION_SET, " ")
+                                              .replace(", " + OWNER, "")
+                                              .replace(", " + ACTION, "")
+                                              .replace(", " + UNAVAILABLE_TIME, "");
                                      })
                                  .map(s -> s.split(" "))
                                  .filter(a -> a.length == 6)
                                  .map(a -> {
                                      // determine the service name from the thread as it is not always obvious
-                                     String sServiceName = a[1].replaceAll("Dedicated.*$", "")
-                                            .replaceAll("DistributedCache:", "")
-                                            .replaceAll("FederatedCache:", "");
+                                     String sServiceName = a[1].replace("Dedicated.*$", "")
+                                            .replace("DistributedCache:", "")
+                                            .replace("FederatedCache:", "");
 
                                      // check for initial PartitionSet ASSIGN and allocate a partition id of -1 meaning all partitions
                                      String sPartitionId = a[2];
@@ -470,12 +470,12 @@ public String analyze(boolean fVerbose)
                     Set<String> setServices = setMetrics.stream()
                                                      .map(UnavailabilityMetrics::getServiceName)
                                                      .collect(Collectors.toSet());
-                    if (setServices.size() == 0) {
+                    if (setServices.isEmpty()) {
                         sb.append("No services found. This may not be a Coherence log file.");
                         return sb.toString();
                     }
 
-                    sb.append(String.format("Total lines in file: %,d, total matching lines processed: %,d\n", listLines.size(), lineId.get()));
+                    sb.append(String.format("Total lines in file: %,d, total matching lines processed: %,d%n", listLines.size(), lineId.get()));
 
                     int nMaxLength = Math.max(setServices.stream().mapToInt(String::length).max().getAsInt(), 23);
                     long nTotalMillis = setMetrics.stream().mapToLong(UnavailabilityMetrics::getMillis).sum();
@@ -546,11 +546,11 @@ public String analyze(boolean fVerbose)
                                   .forEach((e) ->
                                       {
                                       int nPartitionId = e.getKey();
-                                      sb.append(String.format("- Partition: %d, total millis: %,d\n", nPartitionId,
+                                      sb.append(String.format("- Partition: %d, total millis: %,d%n", nPartitionId,
                                               e.getValue()));
                                       setMetrics.stream()
                                                 .filter(m->m.getServiceName().equals(s) && m.getPartitionId() == nPartitionId)
-                                                .forEach(m->sb.append(String.format("  %s\n", mapLines.get(m.getLineId()))));
+                                                .forEach(m->sb.append(String.format("  %s%n", mapLines.get(m.getLineId()))));
                                       });
 
                             sb.append("\nOutput by partition and event for ").append(s).append('\n');
@@ -565,10 +565,10 @@ public String analyze(boolean fVerbose)
                                 sb.append("- Partition ").append(p).append('\n');
                                 // retrieve the initial partition assign which has been marked with partition of -1
                                 setMetrics.stream().filter(m -> m.getServiceName().equals(s) && m.getPartitionId() == -1)
-                                       .forEach(m -> sb.append(String.format("  %s\n", mapLines.get(m.getLineId()))));
+                                       .forEach(m -> sb.append(String.format("  %s%n", mapLines.get(m.getLineId()))));
                                 setMetrics.stream()
                                        .filter(m -> m.getServiceName().equals(s) && m.getPartitionId() == p)
-                                       .forEach(m -> sb.append(String.format("  %s\n", mapLines.get(m.getLineId()))));
+                                       .forEach(m -> sb.append(String.format("  %s%n", mapLines.get(m.getLineId()))));
                                 });
                             }
                         });

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java

@@ -474,8 +474,8 @@ else if (sCoherenceVersion.startsWith("2"))
                                     nVersion = Integer.parseInt(sCoherenceVersion.replaceAll("\\.", ""));
                                     }
 
-                                LOGGER.info("RAW Coherence version identified as " + m_sClusterVersion);
-                                LOGGER.info("Numeric Coherence version identified as " + nVersion);
+                                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)
                                     {

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/impl/CoherenceClusterConfigurator.java

@@ -119,7 +119,8 @@ private static boolean isValid(String sClusterName, String sUrl)
         // Valid URL's are
         // Standard Coherence:  http://host:management-port/management/coherence/cluster
         // Managed Coherence Servers: http://<admin-host>:<admin-port>/management/coherence/<version>/clusters
-        if (!sender.isValidUrl() || !sUrl.contains("/management/coherence"))
+        // No trailing slash should be present
+        if (!sender.isValidUrl() || !sUrl.contains("/management/coherence") || sUrl.endsWith("/"))
             {
             DialogDisplayer.getDefault().notify(
                     new NotifyDescriptor.Message(Localization.getLocalText("ERR_Invalid_URL", sUrl)));

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceClusterOverviewPanel.java

@@ -245,7 +245,7 @@ public void updateGUI()
                 f_txtClusterName.setText(entry.getValue().getColumn(ClusterData.CLUSTER_NAME).toString());
                 f_txtRefreshDate.setText(new Date(f_model.getLastUpdate()).toString());
                 f_txtVersion.setText(entry.getValue().getColumn(ClusterData.VERSION).toString().replaceFirst(" .*$", ""));
-                f_txtClusterSize.setText(String.format("%d", entry.getValue().getColumn(ClusterData.CLUSTER_SIZE)));
+                f_txtClusterSize.setText(String.format("%d", (Integer) entry.getValue().getColumn(ClusterData.CLUSTER_SIZE)));
                 }
             }