Enh 37059890 - Port UniversalExtractor and UniversalUpdater to C++ and .NET

- minor modifications to bring more in line with the .NET implementation
#nobug80

[git-p4: depot-paths = "//dev/main.cpp/": change = 111478]

Author: fryp

include/public/coherence/util/extractor/UniversalExtractor.hpp

@@ -78,16 +78,6 @@ class COH_EXPORT UniversalExtractor
     // ----- Object interface -----------------------------------------------
 
     public:
-        /**
-         * {@inheritDoc}
-         */
-        virtual bool equals(Object::View v) const;
-
-        /**
-         * {@inheritDoc}
-         */
-        virtual size32_t hashCode() const;
-
         /**
          * {@inheritDoc}
          */
@@ -122,6 +112,14 @@ class COH_EXPORT UniversalExtractor
          * The parameter array. Must be null or zero length for a property based extractor.
          */
         FinalView<ObjectArray> f_vaParam;
+
+    // ----- constants ------------------------------------------------------
+
+    public:
+        /**
+         * If f_vsName ends with this suffix, it represents a method name.
+         */
+        static String::View getMethodSuffix();
     };
 
 COH_CLOSE_NAMESPACE3

src/coherence/util/extractor/UniversalExtractor.cpp

@@ -23,6 +23,12 @@ UniversalExtractor::UniversalExtractor(String::View vsName,
     : f_vsName(self(), vsName), f_vaParam(self(), vaParam)
     {
     COH_ENSURE_PARAM(vsName);
+    if (vaParam != NULL && vaParam->length > 0 && !vsName->endsWith(getMethodSuffix()))
+        {
+        COH_THROW_STREAM(IllegalArgumentException, "UniversalExtractor constructor: parameter vsName[value:"
+            << vsName << "] must end with method suffix \"" << getMethodSuffix()
+            << "\" when optional parameters provided");
+        }
     m_nTarget = nTarget;
     }
 
@@ -53,29 +59,6 @@ void UniversalExtractor::writeExternal(PofWriter::Handle hOut) const
 
 // ----- Object interface ---------------------------------------------------
 
-bool UniversalExtractor::equals(Object::View v) const
-    {
-    if (this == v)
-        {
-        return true;
-        }
-
-    UniversalExtractor::View that = cast<UniversalExtractor::View>(v, false);
-    if (that != NULL)
-        {
-        return this->m_nTarget == that->m_nTarget &&
-            Object::equals(f_vsName, that->f_vsName) &&
-            Object::equals(f_vaParam, that->f_vaParam);
-        }
-
-    return false;
-    }
-
-size32_t UniversalExtractor::hashCode() const
-    {
-    return f_vsName->hashCode();
-    }
-
 TypedHandle<const String> UniversalExtractor::toString() const
     {
     String::View vs = "";
@@ -100,4 +83,14 @@ ObjectArray::View UniversalExtractor::getParameters() const
     return f_vaParam;
     }
 
+// ----- constants ----------------------------------------------------------
+
+String::View UniversalExtractor::getMethodSuffix()
+    {
+    static FinalView<String> vsMethodSuffix(System::common(), String::create("()"));
+
+    return vsMethodSuffix;
+    }
+COH_STATIC_INIT(UniversalExtractor::getMethodSuffix());
+
 COH_CLOSE_NAMESPACE3

tests/unit/coherence/util/extractor/UniversalExtractorTest.hpp

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+ *
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * https://oss.oracle.com/licenses/upl.
+ */
+#include "cxxtest/TestSuite.h"
+
+#include "coherence/lang.ns"
+
+#include "coherence/util/extractor/UniversalExtractor.hpp"
+
+#include "coherence/util/filter/EqualsFilter.hpp"
+
+#include "common/TestPerson.hpp"
+
+using namespace coherence::lang;
+
+using coherence::util::extractor::UniversalExtractor;
+using coherence::util::filter::EqualsFilter;
+
+using namespace common::test;
+
+/**
+ * Test Suite for UniversalExtractor.
+ */
+class UniversalExtractorTest : public CxxTest::TestSuite
+    {
+    public:
+        /**
+         * Test method suffix validation - required suffix is not present
+         */
+        void testIllegalConstructor()
+            {
+            ObjectArray::View vaParams = ObjectArray::create(1);
+
+            TS_ASSERT_THROWS(UniversalExtractor::create(String::create("age"), vaParams),
+                IllegalArgumentException::View);
+            }
+
+        /**
+         * Test method suffix validation - required suffix is present
+         */
+        void testLegalConstructor()
+            {
+            ObjectArray::View vaParams = ObjectArray::create(1);
+
+            UniversalExtractor::create(String::create("getAge()"), vaParams);
+            }
+
+        /**
+         * Test method suffix validation - suffix is not required
+         */
+        void testLegalConstructorNoSuffix()
+            {
+            UniversalExtractor::create(String::create("age"));
+            }
+    };