Bug 37228588 - [37193699->14.1.2.0.1] Unable to change backing map for an existing caching scheme using cache config override (14.1.2.0 cl 112515 --> ce/14.1.2.0)

- redo CacheConfigOverrideProcessor integration
- integrate non elastic data related test changes

[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v14.1.2.0/": change = 113219]

Author: fryp

prj/coherence-core/src/main/java/com/tangosol/coherence/config/xml/processor/CacheConfigOverrideProcessor.java

@@ -11,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.oracle.coherence.common.base.Logger;
 import com.tangosol.config.xml.OverrideProcessor;
 import com.tangosol.run.xml.XmlElement;
 import com.tangosol.run.xml.XmlHelper;
@@ -76,9 +75,9 @@ else if ("interceptors".equals(xmlElement.getName()))
     private void processSchemeMappings(XmlElement xmlBase,
             XmlElement xmlOverrideSchemeMappings, String sMappingSubElementName)
         {
-        List<XmlElement> listElements = new ArrayList<>();
+        List<XmlElement> listElements      = new ArrayList<>();
+        XmlElement       xmlCurrentElement = xmlBase.getElement(xmlOverrideSchemeMappings.getName());
 
-        XmlElement xmlCurrentElement = xmlBase.getElement(xmlOverrideSchemeMappings.getName());
         if (xmlCurrentElement == null)
             {
             listElements.add(xmlOverrideSchemeMappings);
@@ -200,7 +199,8 @@ else if (!listElements.contains(xmlElementOverride))
      */
     private void processCachingSchemes(XmlElement xmlBase, XmlElement xmlOverrideCachingSchemes)
         {
-        List<XmlElement> listElements = new ArrayList<XmlElement>();
+        List<XmlElement> listElements      = new ArrayList<XmlElement>();
+        XmlElement       xmlCurrentElement = xmlBase.getElement(xmlOverrideCachingSchemes.getName());
 
         for (Object subElements : xmlOverrideCachingSchemes.getElementList())
             {
@@ -229,30 +229,20 @@ private void processCachingSchemes(XmlElement xmlBase, XmlElement xmlOverrideCac
 
                         if (sSchemeName.equals(sOverrideSchemeName))
                             {
-                            XmlElement xmlElementRemove = null;
-
-                            for (XmlElement xmlEl : listElements)
+                            if (!xmlElementName.equals(sSubElementName))
                                 {
-                                XmlElement xmlElSchemeName = xmlEl.getElement("scheme-name");
-                                if (xmlElSchemeName != null
-                                            && sOverrideSchemeName.equals(xmlElSchemeName.getValue().toString()))
-                                    {
-                                    xmlElementRemove = xmlEl;
-                                    break;
-                                    }
+                                xmlElementBase.setName(sSubElementName);
                                 }
 
-                            if (xmlElementRemove != null)
-                                {
-                                listElements.remove(xmlElementRemove);
-                                }
+                            xmlElementBase.getElementList().clear();
+                            xmlElementBase.getElementList().addAll(xmlOverride.getElementList());
 
-                            if (!xmlElementName.equals(sSubElementName))
+                            if (listElements.contains(xmlOverride))
                                 {
-                                xmlElementBase.setName(sSubElementName);
+                                listElements.remove(xmlOverride);
                                 }
 
-                            XmlHelper.overrideElement(xmlElementBase, xmlOverride);
+                            break;
                             }
                         else if (!listElements.contains(xmlOverride))
                             {
@@ -277,7 +267,7 @@ else if (!listElements.contains(xmlOverride))
 
         if (!listElements.isEmpty())
             {
-            XmlHelper.addElements(xmlBase.getElement(xmlOverrideCachingSchemes.getName()), listElements.iterator());
+            XmlHelper.addElements(xmlCurrentElement, listElements.iterator());
             listElements.clear();
             }
         }

prj/test/functional/cache/src/main/java/override/CacheConfigOverrideTests.java

@@ -1,15 +1,18 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
  */
 package override;
 
-import com.oracle.coherence.testing.AbstractFunctionalTest;
-
+import com.oracle.bedrock.runtime.coherence.options.LocalHost;
+import com.oracle.bedrock.runtime.coherence.options.WellKnownAddress;
+import com.oracle.bedrock.runtime.java.options.IPv4Preferred;
 import com.oracle.bedrock.testsupport.deferred.Eventually;
 
+import com.oracle.coherence.testing.AbstractFunctionalTest;
+
 import com.tangosol.net.CacheFactory;
 import com.tangosol.net.CacheService;
 import com.tangosol.net.Cluster;
@@ -67,6 +70,8 @@ public CacheConfigOverrideTests()
     public static void _startup()
         {
         // this test requires local storage to be enabled
+        System.setProperty(WellKnownAddress.PROPERTY, LocalHost.loopback().getAddress());
+        System.setProperty(IPv4Preferred.JAVA_NET_PREFER_IPV4_STACK, "true");
         System.setProperty("coherence.distributed.localstorage", "true");
         }
 
@@ -162,7 +167,7 @@ public void testCacheConfigOverrideSingleScheme()
             // Check for correct QuorumStatus for service "$SYS:MyCacheService2" with write
             objectName = "Coherence:type=Service,name=\"$SYS:MyCacheService2\",*";
             mbeanObj   = serverJMX.queryMBeans(new ObjectName(objectName), null);
-            assertTrue(mbeanObj.size() == 1);
+            assertEquals(mbeanObj.size(), 1);
 
             serviceON    = new ObjectName(mbeanObj.iterator().next().getObjectName().toString());
             quorumStatus = (String) serverJMX.getAttribute(serviceON, "QuorumStatus");

prj/test/functional/cache/src/main/resources/override/cache-config-override-two.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright (c) 2000, 2022, Oracle and/or its affiliates.
+  Copyright (c) 2000, 2025, Oracle and/or its affiliates.
 
   Licensed under the Universal Permissive License v 1.0 as shown at
   https://oss.oracle.com/licenses/upl.
@@ -19,6 +19,7 @@
   <caching-schemes>
     <distributed-scheme>
       <scheme-name>my-cache-scheme-two</scheme-name>
+      <service-name>MyCacheService2</service-name>
       <partitioned-quorum-policy-scheme>
         <write-quorum>1</write-quorum>
       </partitioned-quorum-policy-scheme>