You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2016/10/27 14:01:32 UTC
svn commit: r1766825 - in /db/jdo/trunk/api/src/java/javax/jdo/annotations: Column.java Convert.java Converts.java Extension.java FetchGroup.java FetchPlan.java ForeignKey.java Index.java Join.java Query.java Unique.java

Author: andyj
Date: Thu Oct 27 14:01:32 2016
New Revision: 1766825

URL: http://svn.apache.org/viewvc?rev=1766825&view=rev
Log:
JDO-757 Add @Repeatable to all annotations with a plural option

Modified:
    db/jdo/trunk/api/src/java/javax/jdo/annotations/Column.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/Convert.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/Converts.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/Extension.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchGroup.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchPlan.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/ForeignKey.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/Index.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/Join.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/Query.java
    db/jdo/trunk/api/src/java/javax/jdo/annotations/Unique.java

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/Column.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/Column.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/Column.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/Column.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -28,8 +29,9 @@ import java.lang.annotation.Target;
  * @version 2.1
  * @since 2.1
  */
-@Target({ElementType.FIELD, ElementType.METHOD}) 
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.TYPE}) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Columns.class)
 public @interface Column
 {
     /**

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/Convert.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/Convert.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/Convert.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/Convert.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -35,7 +36,8 @@ import javax.jdo.AttributeConverter;
  * assignment-compatible with the {@link AttributeConverter}'s entity type argument.
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Repeatable(Converts.class)
 public @interface Convert {
 
 	/**

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/Converts.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/Converts.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/Converts.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/Converts.java Thu Oct 27 14:01:32 2016
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
  * Container annotation to allow for multiple {@link Convert} annotations.
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.PACKAGE, ElementType.TYPE })
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
 public @interface Converts {
 
 	/**

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/Extension.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/Extension.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/Extension.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/Extension.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -30,6 +31,7 @@ import java.lang.annotation.Target;
  */
 @Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD}) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Extensions.class)
 public @interface Extension
 {
     /** Vendor that the extension applies to (required).

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchGroup.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchGroup.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchGroup.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchGroup.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -30,6 +31,7 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.TYPE) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(FetchGroups.class)
 public @interface FetchGroup
 {
     /**

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchPlan.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchPlan.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchPlan.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/FetchPlan.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -30,6 +31,7 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.TYPE) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(FetchPlans.class)
 public @interface FetchPlan
 {
     /**

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/ForeignKey.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/ForeignKey.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/ForeignKey.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/ForeignKey.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -30,6 +31,7 @@ import java.lang.annotation.Target;
  */
 @Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD}) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(ForeignKeys.class)
 public @interface ForeignKey
 {
     /** Name of the foreign key.

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/Index.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/Index.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/Index.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/Index.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -31,6 +32,7 @@ import java.lang.annotation.Target;
  */
 @Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD}) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Indices.class)
 public @interface Index
 {
     /** Name of the index

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/Join.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/Join.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/Join.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/Join.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -30,6 +31,7 @@ import java.lang.annotation.Target;
  */
 @Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD}) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Joins.class)
 public @interface Join
 {
     /** Table to join to (used when joining to secondary tables). 

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/Query.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/Query.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/Query.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/Query.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -30,6 +31,7 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.TYPE) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Queries.class)
 public @interface Query
 {
     /** Name of the query (mandatory)

Modified: db/jdo/trunk/api/src/java/javax/jdo/annotations/Unique.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/src/java/javax/jdo/annotations/Unique.java?rev=1766825&r1=1766824&r2=1766825&view=diff
==============================================================================
--- db/jdo/trunk/api/src/java/javax/jdo/annotations/Unique.java (original)
+++ db/jdo/trunk/api/src/java/javax/jdo/annotations/Unique.java Thu Oct 27 14:01:32 2016
@@ -17,6 +17,7 @@
 package javax.jdo.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;
@@ -32,6 +33,7 @@ import java.lang.annotation.Target;
  */
 @Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD}) 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Uniques.class)
 public @interface Unique
 {
     /** Name of the unique constraint.