You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by aw...@apache.org on 2006/08/23 23:50:03 UTC
svn commit: r434203 - in
/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence:
AnnotationPersistenceMetaDataParser.java FetchGroup.java
Author: awhite
Date: Wed Aug 23 14:50:02 2006
New Revision: 434203
URL: http://svn.apache.org/viewvc?rev=434203&view=rev
Log:
Add ability to include one fetch group in another to FetchGroup annotation.
Modified:
incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=434203&r1=434202&r2=434203&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java Wed Aug 23 14:50:02 2006
@@ -869,6 +869,8 @@
fg = meta.addDeclaredFetchGroup(group.name());
if (group.postLoad())
fg.setPostLoad(true);
+ for (String s : group.fetchGroups())
+ fg.addDeclaredInclude(s);
for (FetchAttribute attr : group.attributes())
parseFetchAttribute(meta, fg, attr);
}
Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java?rev=434203&r1=434202&r2=434203&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java (original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/FetchGroup.java Wed Aug 23 14:50:02 2006
@@ -44,4 +44,9 @@
* Included attributes.
*/
FetchAttribute[] attributes() default {};
+
+ /**
+ * Included fetch groups.
+ */
+ String[] fetchGroups() default {};
}