diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java b/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java index 8fd717be64..d388c68548 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; + import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -35,16 +36,22 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author Emmanuel Bernard */ -@Target({TYPE, METHOD, FIELD}) +@Target({ TYPE, METHOD, FIELD }) @Retention(RUNTIME) public @interface Cache { - /** concurrency strategy chosen */ - CacheConcurrencyStrategy usage(); - /** cache region name */ - String region() default ""; /** - * whether or not lazy-properties are included in the second level cache - * default all, other value: non-lazy + * @return Returns the concurrency strategy chosen + */ + CacheConcurrencyStrategy usage(); + + /** + * @return Returns the cache region name + */ + String region() default ""; + + /** + * @return Returns whether or not lazy-properties are included in the second level cache. + * Default is all, other value: non-lazy. */ String include() default "all"; } diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Check.java b/hibernate-core/src/main/java/org/hibernate/annotations/Check.java index ee14d715df..068722cada 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Check.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Check.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; + import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -36,7 +37,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author Emmanuel Bernard */ -@Target({TYPE, METHOD, FIELD}) +@Target({ TYPE, METHOD, FIELD }) @Retention(RUNTIME) public @interface Check { String constraints(); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/package.html b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/package.html new file mode 100755 index 0000000000..6f41661c51 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/attribute/package.html @@ -0,0 +1,34 @@ + + + + + +

+ This package contains classes related to mapped attributes and associations of a mapped entity. It also contains the + attribute related source implementations. +

+ + diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/package.html b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/package.html new file mode 100755 index 0000000000..2d0629a274 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/package.html @@ -0,0 +1,33 @@ + + + + + +

+ This package contains classes related to mapped entities and their hierarchy structure. +

+ + diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/ManyToManyPluralAttributeElementSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/ManyToManyPluralAttributeElementSource.java index 0f117e709a..5deb199238 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/ManyToManyPluralAttributeElementSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/ManyToManyPluralAttributeElementSource.java @@ -29,8 +29,7 @@ import java.util.List; /** * @author Steve Ebersole */ -public interface ManyToManyPluralAttributeElementSource - extends PluralAttributeElementSource, CascadeStyleSource { +public interface ManyToManyPluralAttributeElementSource extends PluralAttributeElementSource, CascadeStyleSource { public String getReferencedEntityName(); public String getReferencedEntityAttributeName(); diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/OneToManyPluralAttributeElementSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/OneToManyPluralAttributeElementSource.java index e9ad3fc7b2..705ab02cc9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/OneToManyPluralAttributeElementSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/source/OneToManyPluralAttributeElementSource.java @@ -26,8 +26,8 @@ package org.hibernate.metamodel.spi.source; /** * @author Steve Ebersole */ -public interface OneToManyPluralAttributeElementSource - extends PluralAttributeElementSource, CascadeStyleSource { +public interface OneToManyPluralAttributeElementSource extends PluralAttributeElementSource, CascadeStyleSource { public String getReferencedEntityName(); + public boolean isNotFoundAnException(); }