From e65dd8ab8c7dbe53c7892ae2c30f4ed864f5bfcd Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Wed, 14 Feb 2024 14:53:40 +0100
Subject: [PATCH] Apply @Repeatable to Oracle & OXM annotations

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .../org/eclipse/persistence/oxm/annotations/XmlJoinNode.java    | 2 ++
 .../org/eclipse/persistence/oxm/annotations/XmlJoinNodes.java   | 2 ++
 .../persistence/oxm/annotations/XmlNamedObjectGraph.java        | 2 ++
 .../java/org/eclipse/persistence/oxm/annotations/XmlPath.java   | 2 ++
 .../org/eclipse/persistence/oxm/annotations/XmlProperty.java    | 2 ++
 .../persistence/oxm/annotations/XmlWriteTransformer.java        | 2 ++
 .../oracle/annotations/NamedPLSQLStoredFunctionQuery.java       | 2 ++
 .../oracle/annotations/NamedPLSQLStoredProcedureQuery.java      | 2 ++
 .../platform/database/oracle/annotations/OracleArray.java       | 2 ++
 .../platform/database/oracle/annotations/OracleObject.java      | 2 ++
 .../platform/database/oracle/annotations/PLSQLRecord.java       | 2 ++
 .../platform/database/oracle/annotations/PLSQLTable.java        | 2 ++
 12 files changed, 24 insertions(+)

diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNode.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNode.java
index 9f3b3d6696f..c17759c64b1 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNode.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNode.java
@@ -14,6 +14,7 @@
 // dmccann - September 14/2010 - 2.2 - Initial implementation
 package org.eclipse.persistence.oxm.annotations;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -47,6 +48,7 @@
  */
 @Target({METHOD, FIELD})
 @Retention(RUNTIME)
+@Repeatable(XmlJoinNodes.class)
 public @interface XmlJoinNode {
     String xmlPath();
     String referencedXmlPath();
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNodes.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNodes.java
index 947f3360b23..a1dfb2ce00b 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNodes.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNodes.java
@@ -14,6 +14,7 @@
 // dmccann - September 14/2010 - 2.2 - Initial implementation
 package org.eclipse.persistence.oxm.annotations;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -52,6 +53,7 @@
  */
 @Target({METHOD, FIELD})
 @Retention(RUNTIME)
+@Repeatable(XmlElementsJoinNodes.class)
 public @interface XmlJoinNodes {
     /**
      * An array of XmlJoinNode annotations.
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlNamedObjectGraph.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlNamedObjectGraph.java
index 13e315ebe4b..35c63a1257b 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlNamedObjectGraph.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlNamedObjectGraph.java
@@ -14,6 +14,7 @@
 //     Matt MacIvor - 2.5 - initial implementation
 package org.eclipse.persistence.oxm.annotations;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -28,6 +29,7 @@
  */
 @Target({TYPE})
 @Retention(RUNTIME)
+@Repeatable(XmlNamedObjectGraphs.class)
 public @interface XmlNamedObjectGraph {
     /**
      * The name of this object graph. Defaults to the name of the class.
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlPath.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlPath.java
index e3a76b7e5fa..880bc1a7b42 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlPath.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlPath.java
@@ -15,6 +15,7 @@
 package org.eclipse.persistence.oxm.annotations;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -120,6 +121,7 @@
  */
 @Target({ElementType.FIELD, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(XmlPaths.class)
 public @interface XmlPath {
 
     /**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlProperty.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlProperty.java
index e30cd66f0ff..d249025c18c 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlProperty.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlProperty.java
@@ -14,6 +14,7 @@
 //     Oracle = 2.2 - Initial contribution
 package org.eclipse.persistence.oxm.annotations;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -29,6 +30,7 @@
  */
 @Target({METHOD, FIELD, TYPE})
 @Retention(RUNTIME)
+@Repeatable(XmlProperties.class)
 public @interface XmlProperty {
     /**
      * Property name.
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlWriteTransformer.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlWriteTransformer.java
index e8808d63ee8..fe46f62d0dd 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlWriteTransformer.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlWriteTransformer.java
@@ -16,6 +16,7 @@
 
 import org.eclipse.persistence.mappings.transformers.FieldTransformer;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -41,6 +42,7 @@
  */
 @Target({METHOD, FIELD})
 @Retention(RUNTIME)
+@Repeatable(XmlWriteTransformers.class)
 public @interface XmlWriteTransformer {
     /**
      * User-defined class that must implement the
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredFunctionQuery.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredFunctionQuery.java
index fdf38d26d1b..174ffbd22bf 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredFunctionQuery.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredFunctionQuery.java
@@ -16,6 +16,7 @@
 
 import jakarta.persistence.QueryHint;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -36,6 +37,7 @@
  */
 @Target({TYPE})
 @Retention(RUNTIME)
+@Repeatable(NamedPLSQLStoredFunctionQueries.class)
 public @interface NamedPLSQLStoredFunctionQuery {
     /**
      * Unique name that references this stored function query.
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredProcedureQuery.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredProcedureQuery.java
index f15e62ed05b..40755476806 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredProcedureQuery.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredProcedureQuery.java
@@ -16,6 +16,7 @@
 
 import jakarta.persistence.QueryHint;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -36,6 +37,7 @@
  */
 @Target({TYPE})
 @Retention(RUNTIME)
+@Repeatable(NamedPLSQLStoredProcedureQueries.class)
 public @interface NamedPLSQLStoredProcedureQuery {
     /**
      * Unique name that references this stored procedure query.
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleArray.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleArray.java
index fba3d2d296c..a72827c0231 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleArray.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleArray.java
@@ -14,6 +14,7 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.platform.database.oracle.annotations;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 import java.util.ArrayList;
@@ -31,6 +32,7 @@
  */
 @Target({TYPE})
 @Retention(RUNTIME)
+@Repeatable(OracleArrays.class)
 public @interface OracleArray {
 
     /**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleObject.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleObject.java
index 0c9cce1e9ec..ebfc471380c 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleObject.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleObject.java
@@ -14,6 +14,7 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.platform.database.oracle.annotations;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -30,6 +31,7 @@
  */
 @Target({TYPE})
 @Retention(RUNTIME)
+@Repeatable(OracleObjects.class)
 public @interface OracleObject {
 
     /**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLRecord.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLRecord.java
index 3d6a89d6e3b..44ee1d74f40 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLRecord.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLRecord.java
@@ -14,6 +14,7 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.platform.database.oracle.annotations;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -31,6 +32,7 @@
  */
 @Target({TYPE})
 @Retention(RUNTIME)
+@Repeatable(PLSQLRecords.class)
 public @interface PLSQLRecord {
 
     /**
diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLTable.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLTable.java
index 03f9f6eda86..d6af0f595c0 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLTable.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLTable.java
@@ -14,6 +14,7 @@
 //     Oracle - initial API and implementation
 package org.eclipse.persistence.platform.database.oracle.annotations;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 import java.util.ArrayList;
@@ -32,6 +33,7 @@
  */
 @Target({TYPE})
 @Retention(RUNTIME)
+@Repeatable(PLSQLTables.class)
 public @interface PLSQLTable {
 
     /**