Update with new 2 step build for main

Author: Tim Middleton

.github/workflows/test-against-snapshot.yml

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2020, 2022 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
@@ -91,8 +91,12 @@ jobs:
         cd $CLONE_DIR
         if [ $COH_BRANCH != "main" ] ; then
            git checkout $COH_BRANCH
+           mvn --file prj/pom.xml --batch-mode -e -DskipTests clean install
+        else
+           # main requires updated 2 step build for coherence.jar and everything else
+           mvn --file prj/pom.xml --batch-mode -e -DskipTests clean install
+           mvn --file prj/pom.xml --batch-mode -e -P-coherence,modules -nsu -DskipTests clean install
         fi
-        mvn --file prj/pom.xml --batch-mode -e -DskipTests clean install
         cd $DIR
 
     - name: Build Plugin

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

@@ -368,7 +368,7 @@ public List<Entry<Object, Data>> getData(RequestSender requestSender, Class claz
         {
         boolean fFallBack = false;
 
-        // Re Bug 22132359 - When we are connecting to pre 12.2.1.1.0 cluster from 12.2.1.1.0 or above and we
+        // Re Bug 22132359 - When we are connecting to pre 12.2.1.1.0 cluster from 12.2.1.1.0 or above, and we
         // are collecting ProxyStats, we need to force to use JMX rather than report
         if (isReporterAvailable() != null && isReporterAvailable() &&
             !(clazz.equals(ProxyData.class) && getClusterVersionAsInt() < 122110))
@@ -462,7 +462,7 @@ public List<Entry<Object, Data>> getData(RequestSender requestSender, Class claz
                                     }
                                 else if (sCoherenceVersion.startsWith("2"))
                                     {
-                                    // check for versions such as 20.06 or 20.06.01 and convert them to an ever increasing number
+                                    // 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
@@ -474,16 +474,19 @@ 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);
+
                                 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 ? true : isReporterAvailable());
+                                    setReporterAvailable(isReporterAvailable() == null || isReporterAvailable());
                                     m_fis1213AndAbove = true;
                                     }
                                 else
                                     {
-                                    setReporterAvailable(isReporterAvailable() == null ? false : isReporterAvailable());
+                                    setReporterAvailable(isReporterAvailable() != null && isReporterAvailable());
                                     m_fis1213AndAbove = false;
                                     }
                                 m_nClusterVersion = nVersion;

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/NodeStorageData.java

@@ -49,7 +49,7 @@
 
 
 /**
- * A class to hold basic member data.
+ * A class to hold storage enabled node data
  *
  * @author tam  2020.02.13
  * @since  14.1.1.0
@@ -122,7 +122,7 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel m
         }
 
     /**
-     * Check if a node is storage enabled or not byt checking if the owned
+     * Check if a node is storage enabled or not by checking if the owned
      * partitions > 0 on at least one for the services.
      *
      * @param mapNodes      {@link Map} of nodes
@@ -139,7 +139,7 @@ private void checkNode(Map<Integer, Integer> mapNodes, int nNodeId, int nOwnedPr
             if (ownedPrimaryPartitions <= 0 && nOwnedPrimary > 0)
                 {
                 // currently the node we are working with has no-storage enabled partitions
-                // and the the current service and node does, so lets update it
+                // and the current service and node does, so lets update it
                 mapNodes.put(nNodeId, nOwnedPrimary);
                 }
             // else fallthrough as we leave any node with > 0 with that value

coherence-visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties

@@ -225,8 +225,8 @@ LBL_outgoing_msg_result_menu=Are you sure you want to retrieve Pending Outgoing
 LBL_result_is=Result: {0}
 
 # CoherenceElasticDataPanel
-LBL_ram_journal_files=RAM Journal Usage (Committed)
-LBL_flash_journal_files=Flash Journal Usage (Committed)
+LBL_ram_journal_files=RAM Journal File Usage (Committed)
+LBL_flash_journal_files=Flash Journal File Usage (Committed)
 LBL_ram_journal_detail=RAM Journal Detail
 LBL_flash_journal_detail=Flash Journal Detail
 LBL_click_for_detail=Click for more detail...