return user defined type from functionexpression in core, fix handling of XmlEnum in moxy

foundation/eclipselink.core.test/pom.xml

@@ -234,7 +234,7 @@
                         </goals>
                         <configuration>
                             <skipTests>${skipTests}</skipTests>
-                            <argValue>-Dignore</argValue>
+                            <argLine>-Dignore</argLine>
                             <includes>
                                 <include>org.eclipse.persistence.testing.tests.ClearDatabaseSchemaTest</include>
                             </includes>

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/Location.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -160,7 +160,7 @@ public static org.eclipse.persistence.tools.schemaframework.TableDefinition tabl
      */
     public String toString() {
         StringBuffer buf = new StringBuffer();
-        buf.append(org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()));
+        buf.append(getClass().getSimpleName());
         buf.append("(");
         if (getArea() != null) {
             buf.append(getArea());

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/Menu.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -223,10 +223,10 @@ public static org.eclipse.persistence.tools.schemaframework.TableDefinition tabl
      */
     public String toString() {
         StringBuffer buf = new StringBuffer();
-        buf.append(org.eclipse.persistence.internal.helper.Helper.getShortClassName(this.getClass()) + ": " + this.getType());
+        buf.append(getClass().getSimpleName() + ": " + this.getType());
         buf.append(org.eclipse.persistence.internal.helper.Helper.cr());
         if (getItems() != null) {
-            buf.append("MenuItems: " + org.eclipse.persistence.internal.helper.Helper.getShortClassName(getItems().getClass()));
+            buf.append("MenuItems: " + getItems().getClass().getSimpleName());
             buf.append(getItems().toString());
             buf.append(org.eclipse.persistence.internal.helper.Helper.cr());
         }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/MenuItem.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -272,7 +272,7 @@ public static org.eclipse.persistence.tools.schemaframework.TableDefinition tabl
      */
     public String toString() {
         StringBuffer buf = new StringBuffer();
-        buf.append(org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()));
+        buf.append(getClass().getSimpleName());
         buf.append("(");
         if (getName() != null) {
             buf.append(getName().substring(0, Math.min(10, getName().length())));

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/Person.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -115,6 +115,6 @@ public static org.eclipse.persistence.tools.schemaframework.TableDefinition tabl
      * @return a string representation of the receiver
      */
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(this.getClass()) + ": " + this.getFirstName() + " " + this.getLastName();
+        return getClass().getSimpleName() + ": " + this.getFirstName() + " " + this.getLastName();
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/collections/Restaurant.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -121,27 +121,27 @@ public String allToString() {
         buf.append("Restaurant: " + this.getName());
         buf.append(org.eclipse.persistence.internal.helper.Helper.cr());
         if (getMenus() != null) {
-            buf.append("Menus: " + org.eclipse.persistence.internal.helper.Helper.getShortClassName(getMenus().getClass()));
+            buf.append("Menus: " + getMenus().getClass().getSimpleName());
             buf.append(getMenus().toString());
             buf.append(org.eclipse.persistence.internal.helper.Helper.cr());
         }
         if (getWaiters() != null) {
-            buf.append("Waiters: " + org.eclipse.persistence.internal.helper.Helper.getShortClassName(getWaiters().getClass()));
+            buf.append("Waiters: " + getWaiters().getClass().getSimpleName());
             buf.append(getWaiters().toString());
             buf.append(org.eclipse.persistence.internal.helper.Helper.cr());
         }
         if (getPreferredCustomers() != null) {
-            buf.append("PreferredCustomers: " + org.eclipse.persistence.internal.helper.Helper.getShortClassName(getPreferredCustomers().getClass()));
+            buf.append("PreferredCustomers: " + getPreferredCustomers().getClass().getSimpleName());
             buf.append(getPreferredCustomers().toString());
             buf.append(org.eclipse.persistence.internal.helper.Helper.cr());
         }
         if (getLocations() != null) {
-            buf.append("Locations: " + org.eclipse.persistence.internal.helper.Helper.getShortClassName(getLocations().getClass()));
+            buf.append("Locations: " + getLocations().getClass().getSimpleName());
             buf.append(getLocations().toString());
             buf.append(org.eclipse.persistence.internal.helper.Helper.cr());
         }
         if (getSlogans() != null) {
-            buf.append("Slogan: " + org.eclipse.persistence.internal.helper.Helper.getShortClassName(getSlogans().getClass()));
+            buf.append("Slogan: " + getSlogans().getClass().getSimpleName());
             buf.append(getSlogans().toString());
             buf.append(org.eclipse.persistence.internal.helper.Helper.cr());
         }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/inheritance/Vehicle.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -87,6 +87,6 @@ public static ViewDefinition mySQLView() {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + "(" + id + ")";
+        return getClass().getSimpleName() + "(" + id + ")";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/insurance/Claim.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,6 +56,6 @@ public void setPolicy(Policy policy) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + ": " + getAmount();
+        return getClass().getSimpleName() + ": " + getAmount();
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/insurance/Policy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -97,6 +97,6 @@ public void setPolicyNumber(long policyNumber) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + ": " + getPolicyNumber();
+        return getClass().getSimpleName() + ": " + getPolicyNumber();
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/orderedlist/Project.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -132,7 +132,7 @@ public void setEmployees(List<Employee> employees) {
     public String toString() {
         StringWriter writer = new StringWriter();
 
-        writer.write(Helper.getShortClassName(this) + ": ");
+        writer.write(getClass().getSimpleName() + ": ");
         writer.write(getName());
         return writer.toString();
     }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/readonly/Address.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -173,7 +173,7 @@ public static TableDefinition tableDefinition() {
     public String toString() {
         java.io.StringWriter stringWriter = new java.io.StringWriter();
         java.io.PrintWriter writer = new java.io.PrintWriter(stringWriter);
-        writer.print(org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()));
+        writer.print(getClass().getSimpleName());
         writer.print("(");
         if (streetAddress == null) {
             writer.print("null");

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/readonly/Charity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -111,6 +111,6 @@ public static TableDefinition tableDefinition() {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + "(" + getName() + ") ";
+        return getClass().getSimpleName() + "(" + getName() + ") ";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/readonly/Country.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -114,7 +114,7 @@ public static TableDefinition tableDefinition() {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + "(" + getName() + ") ";
+        return getClass().getSimpleName() + "(" + getName() + ") ";
 
     }
 

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/readonly/HollywoodAgent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -114,6 +114,6 @@ public static TableDefinition tableDefinition() {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + "(" + getName() + ") ";
+        return getClass().getSimpleName() + "(" + getName() + ") ";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/readonly/Promoter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -117,6 +117,6 @@ public static TableDefinition tableDefinition() {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + "(" + getName() + ") ";
+        return getClass().getSimpleName() + "(" + getName() + ") ";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/readonly/ReadOnlyCharity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,6 +70,6 @@ public void setName(String newValue) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + "(" + getName() + ") ";
+        return getClass().getSimpleName() + "(" + getName() + ") ";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/readonly/ReadOnlyHollywoodAgent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -72,6 +72,6 @@ public void setName(String newValue) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(getClass()) + "(" + getName() + ") ";
+        return getClass().getSimpleName() + "(" + getName() + ") ";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/Customer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -109,6 +109,6 @@ public void setSalespeople(Collection collection) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(this) + "(" + id + ", " + System.identityHashCode(this) + ")";
+        return getClass().getSimpleName() + "(" + id + ", " + System.identityHashCode(this) + ")";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/FieldLocation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -74,6 +74,6 @@ public void setId(int newId) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(this) + "(" + id + ", " + System.identityHashCode(this) + ")";
+        return getClass().getSimpleName() + "(" + id + ", " + System.identityHashCode(this) + ")";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/FieldManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -67,6 +67,6 @@ public void setOffice(FieldOffice newOffice) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(this) + "(" + id + ", " + System.identityHashCode(this) + ")";
+        return getClass().getSimpleName() + "(" + id + ", " + System.identityHashCode(this) + ")";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/FieldOffice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -76,7 +76,7 @@ public void setSalespeople(Collection newSalespeople) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(this) + "(" + id + ", " + System.identityHashCode(this) + ")";
+        return getClass().getSimpleName() + "(" + id + ", " + System.identityHashCode(this) + ")";
     }
 
     /**

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/Resource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -70,7 +70,7 @@ public void setName(String newName) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(this) + "(" + id + ", " + System.identityHashCode(this) + ")";
+        return getClass().getSimpleName() + "(" + id + ", " + System.identityHashCode(this) + ")";
     }
 
     /**

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/models/relationshipmaintenance/SalesPerson.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -116,6 +116,6 @@ public void setName(java.lang.String newName) {
     }
 
     public String toString() {
-        return org.eclipse.persistence.internal.helper.Helper.getShortClassName(this) + "(" + id + ", " + System.identityHashCode(this) + ")";
+        return getClass().getSimpleName() + "(" + id + ", " + System.identityHashCode(this) + ")";
     }
 }

foundation/eclipselink.core.test/src/it/java/org/eclipse/persistence/testing/tests/aggregate/AgentBuilderTablesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -81,7 +81,7 @@ String verifyDescriptor(ClassDescriptor desc, boolean tableNameShouldStartWithBu
             }
         }
         if(localErrorMsg.length() > 0) {
-            localErrorMsg = "Ref.descriptor class: " + Helper.getShortClassName(desc.getJavaClass()) +"; mapping: "+ attributeName + ": " + localErrorMsg + "\n";
+            localErrorMsg = "Ref.descriptor class: " + desc.getJavaClass().getSimpleName() +"; mapping: "+ attributeName + ": " + localErrorMsg + "\n";
         }
         return localErrorMsg;
     }