integrate 15.1.1.0 cl 121345 --> 15.1.1.0 CE

[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v15.1.1.0/": change = 122067]

Author: fryp

prj/coherence-core/src/main/java/com/tangosol/internal/management/resources/AbstractManagementResource.java

@@ -20,6 +20,9 @@
 import com.tangosol.internal.management.Converter;
 import com.tangosol.internal.management.EntityMBeanResponse;
 import com.tangosol.internal.management.MBeanResponse;
+
+import com.tangosol.internal.net.management.DiagnosticCommandPolicy;
+
 import com.tangosol.net.management.MapJsonBodyHandler;
 import com.tangosol.net.CacheFactory;
 
@@ -1345,21 +1348,7 @@ protected Response response(EntityMBeanResponse responseEntity)
      */
     protected static boolean isJfrDiagnosticCommand(String sCmd)
         {
-        if (sCmd == null)
-            {
-            return false;
-            }
-
-        switch (sCmd)
-            {
-            case "jfrStart":
-            case "jfrStop":
-            case "jfrDump":
-            case "jfrCheck":
-                return true;
-            default:
-                return false;
-            }
+        return DiagnosticCommandPolicy.isRestOperationAllowed(sCmd);
         }
 
     /**

prj/coherence-core/src/main/java/com/tangosol/internal/net/management/DiagnosticCommandPolicy.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2000, 2026, Oracle and/or its affiliates.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * https://oss.oracle.com/licenses/upl.
+ */
+package com.tangosol.internal.net.management;
+
+/**
+ * Policy for DiagnosticCommand operations exposed by Coherence management
+ * surfaces.
+ *
+ * @author Aleks Seovic  2026.07.15
+ * @since 26.04
+ */
+public final class DiagnosticCommandPolicy
+    {
+    /**
+     * Return whether an operation is part of the documented management REST
+     * JFR command set.
+     *
+     * @param sOperation  the DiagnosticCommand operation name
+     *
+     * @return {@code true} if the REST management route may invoke the operation
+     */
+    public static boolean isRestOperationAllowed(String sOperation)
+        {
+        if (sOperation == null)
+            {
+            return false;
+            }
+
+        switch (sOperation)
+            {
+            case "jfrStart":
+            case "jfrStop":
+            case "jfrDump":
+            case "jfrCheck":
+                return true;
+            default:
+                return false;
+            }
+        }
+
+    /**
+     * Return whether an operation is allowed through a wrapped JMX
+     * DiagnosticCommand MBean.
+     * <p>
+     * Wrapped JMX retains {@code vmUnlockCommercialFeatures} for supported
+     * pre-JDK-11 Oracle JFR workflows. The management REST route intentionally
+     * does not expose that compatibility operation.
+     *
+     * @param sOperation  the DiagnosticCommand operation name
+     *
+     * @return {@code true} if wrapped JMX may invoke the operation
+     */
+    public static boolean isWrappedJmxOperationAllowed(String sOperation)
+        {
+        return isRestOperationAllowed(sOperation) || UNLOCK_COMMERCIAL_FEATURES.equals(sOperation);
+        }
+
+    // ----- constants ------------------------------------------------------
+
+    private static final String UNLOCK_COMMERCIAL_FEATURES = "vmUnlockCommercialFeatures";
+
+    private DiagnosticCommandPolicy()
+        {
+        }
+    }

prj/coherence-core/src/main/java/com/tangosol/net/management/ManagementInvocationPolicy.java

@@ -8,6 +8,7 @@
 
 import com.oracle.coherence.common.base.Logger;
 
+import com.tangosol.internal.net.management.DiagnosticCommandPolicy;
 import com.tangosol.internal.net.management.MBeanCollectorFunction;
 import com.tangosol.internal.util.CoherenceMode;
 
@@ -291,7 +292,7 @@ public static void validateWrapperInvoke(MBeanServer server, ObjectName name, St
         validateIdentifier(sOperation, "wrapper-jmx", "operation", "invalid-operation");
         validateArguments(aoParam, asSignature, "wrapper-jmx");
 
-        if (isDiagnosticCommand(name) && ALLOWED_DIAGNOSTIC_OPERATIONS.contains(sOperation))
+        if (isDiagnosticCommand(name) && DiagnosticCommandPolicy.isWrappedJmxOperationAllowed(sOperation))
             {
             validateOperationDescriptor(server, name, sOperation, asSignature, "wrapper-jmx");
             return;
@@ -589,6 +590,10 @@ private static ObjectName validateReadObjectName(ObjectName name, String sScope)
 
     private static ObjectName validateQueryObjectName(ObjectName name, String sScope)
         {
+        // Query patterns remain broad for inventory compatibility. Every
+        // matched name must be passed through validateQueryResult(),
+        // validateReadQueryResult(), or equivalent concrete-name validation
+        // before it is used as an MBeanServer target.
         if (name == null)
             {
             return null;
@@ -1158,13 +1163,6 @@ private static String sanitize(String sValue)
             MBeanAccessor.Invoke.class,
             MBeanCollectorFunction.class));
 
-    private static final Set<String> ALLOWED_DIAGNOSTIC_OPERATIONS = new HashSet<>(Arrays.asList(
-            "jfrStart",
-            "jfrDump",
-            "jfrCheck",
-            "jfrStop",
-            "vmUnlockCommercialFeatures"));
-
     private static final int REMOTE_MODEL_OP_GET = 1;
 
     private static final int REMOTE_MODEL_OP_INVOKE = 2;

prj/test/unit/coherence-core-tests/src/test/java/com/tangosol/net/management/ManagementInvocationPolicyTest.java

@@ -6,6 +6,7 @@
  */
 package com.tangosol.net.management;
 
+import com.tangosol.internal.net.management.DiagnosticCommandPolicy;
 import com.tangosol.internal.net.management.MBeanCollectorFunction;
 
 import com.tangosol.util.Filter;
@@ -36,6 +37,8 @@
 import javax.management.StandardMBean;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
@@ -224,6 +227,29 @@ public void shouldValidateAttributeAndOperationDescriptors()
                 null, null, "test"));
         }
 
+    @Test
+    public void shouldPreserveIntentionalDiagnosticCommandSurfaceRelationship()
+        {
+        String[] asJfrOperation = {"jfrStart", "jfrStop", "jfrDump", "jfrCheck"};
+        for (String sOperation : asJfrOperation)
+            {
+            assertTrue(DiagnosticCommandPolicy.isRestOperationAllowed(sOperation));
+            assertTrue(DiagnosticCommandPolicy.isWrappedJmxOperationAllowed(sOperation));
+            }
+
+        assertFalse(DiagnosticCommandPolicy.isRestOperationAllowed("vmUnlockCommercialFeatures"));
+        assertTrue(DiagnosticCommandPolicy.isWrappedJmxOperationAllowed("vmUnlockCommercialFeatures"));
+
+        for (String sOperation : new String[] {"vmSystemProperties", "jvmtiAgentLoad", "managementAgentStart"})
+            {
+            assertFalse(DiagnosticCommandPolicy.isRestOperationAllowed(sOperation));
+            assertFalse(DiagnosticCommandPolicy.isWrappedJmxOperationAllowed(sOperation));
+            }
+
+        assertFalse(DiagnosticCommandPolicy.isRestOperationAllowed(null));
+        assertFalse(DiagnosticCommandPolicy.isWrappedJmxOperationAllowed(null));
+        }
+
     @Test
     public void shouldShadowNonWritableAttributeInCompatibilityMode()
             throws Exception