Apply @repeatable to Oracle & OXM annotations

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Feb 14, 2024 · e65dd8a · e65dd8a
1 parent ffe27c4
commit e65dd8a
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 0 deletions.
diff --git a/...e.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNode.java b/...e.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/....persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlJoinNodes.java b/....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/...tence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlNamedObjectGraph.java b/...tence.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/...lipse.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlPath.java b/...lipse.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/...e.persistence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlProperty.java b/...e.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/...tence.core/src/main/java/org/eclipse/persistence/oxm/annotations/XmlWriteTransformer.java b/...tence.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/...lipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredFunctionQuery.java b/...lipse/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/...ipse/persistence/platform/database/oracle/annotations/NamedPLSQLStoredProcedureQuery.java b/...ipse/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/...c/main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleArray.java b/...c/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/.../main/java/org/eclipse/persistence/platform/database/oracle/annotations/OracleObject.java b/.../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/...c/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLRecord.java b/...c/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/...rc/main/java/org/eclipse/persistence/platform/database/oracle/annotations/PLSQLTable.java b/...rc/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 {
 
     /**