diff --git a/documentation/src/main/asciidoc/topical/bootstrap/NativeBootstrapping.adoc b/documentation/src/main/asciidoc/topical/bootstrap/NativeBootstrapping.adoc index 0429beb725..c6312902b7 100644 --- a/documentation/src/main/asciidoc/topical/bootstrap/NativeBootstrapping.adoc +++ b/documentation/src/main/asciidoc/topical/bootstrap/NativeBootstrapping.adoc @@ -215,7 +215,7 @@ over the `SessionFactory` building process. ---- SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder(); - // Supply an SessionFactory-level Interceptor + // Supply a SessionFactory-level Interceptor sessionFactoryBuilder.applyInterceptor( new MySessionFactoryInterceptor() ); // Add a custom observer diff --git a/documentation/src/main/asciidoc/userguide/appendices/BestPractices.adoc b/documentation/src/main/asciidoc/userguide/appendices/BestPractices.adoc index 21e577da2d..0caf4486fb 100644 --- a/documentation/src/main/asciidoc/userguide/appendices/BestPractices.adoc +++ b/documentation/src/main/asciidoc/userguide/appendices/BestPractices.adoc @@ -164,8 +164,8 @@ JPA offers `SINGLE_TABLE`, `JOINED`, and `TABLE_PER_CLASS` to deal with inherita - `SINGLE_TABLE` performs the best in terms of executed SQL statements. However, you cannot use `NOT NULL` constraints on the column-level. You can still use triggers and rules to enforce such constraints, but it's not as straightforward. - `JOINED` addresses the data integrity concerns because every subclass is associated with a different table. - Polymorphic queries or ``@OneToMany` base class associations don't perform very well with this strategy. - However, polymorphic @ManyToOne` associations are fine, and they can provide a lot of value. + Polymorphic queries or `@OneToMany` base class associations don't perform very well with this strategy. + However, polymorphic `@ManyToOne` associations are fine, and they can provide a lot of value. - `TABLE_PER_CLASS` should be avoided since it does not render efficient SQL statements. [[best-practices-fetching]] diff --git a/documentation/src/main/asciidoc/userguide/chapters/batch/Batching.adoc b/documentation/src/main/asciidoc/userguide/chapters/batch/Batching.adoc index 7d24b40aa4..7dfee33a73 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/batch/Batching.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/batch/Batching.adoc @@ -245,7 +245,7 @@ include::{sourcedir}/BatchTest.java[tags=batch-bulk-hql-delete-example] Method `Query.executeUpdate()` returns an `int` value, which indicates the number of entities effected by the operation. This may or may not correlate to the number of rows effected in the database. -An JPQL/HQL bulk operation might result in multiple SQL statements being executed, such as for joined-subclass. +A JPQL/HQL bulk operation might result in multiple SQL statements being executed, such as for joined-subclass. In the example of joined-subclass, a `DELETE` against one of the subclasses may actually result in deletes in the tables underlying the join, or further down the inheritance hierarchy. ==== HQL syntax for INSERT diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/access.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/access.adoc index a7f2b9c4f2..0643a78791 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/access.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/access.adoc @@ -6,7 +6,7 @@ As a JPA provider, Hibernate can introspect both the entity attributes (instance fields) or the accessors (instance properties). By default, the placement of the `@Id` annotation gives the default access strategy. When placed on a field, Hibernate will assume field-based access. -Place on the identifier getter, Hibernate will use property-based access. +When placed on the identifier getter, Hibernate will use property-based access. [IMPORTANT] ==== diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc index 82fbbc8ae7..2aba8bb229 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/basic_types.adoc @@ -439,7 +439,7 @@ include::{modeldir}/PhoneType.java[tags=hql-examples-domain-model-example] ---- ==== -In the ORDINAL example, the `phone_type` column is defined as an (nullable) INTEGER type and would hold: +In the ORDINAL example, the `phone_type` column is defined as a (nullable) INTEGER type and would hold: `NULL`:: For null values `0`:: For the `LAND_LINE` enum @@ -1610,7 +1610,7 @@ include::{sourcedir}/basic/WhereTest.java[tags=mapping-where-example] If the database contains the following entities: [[mapping-where-persistence-example]] -.Persisting an fetching entities with a `@Where` mapping +.Persisting and fetching entities with a `@Where` mapping ==== [source, JAVA, indent=0] ---- @@ -1717,7 +1717,7 @@ include::{sourcedir}/basic/FilterTest.java[tags=mapping-filter-example] If the database contains the following entities: [[mapping-filter-persistence-example]] -.Persisting an fetching entities with a `@Filter` mapping +.Persisting and fetching entities with a `@Filter` mapping ==== [source, JAVA, indent=0] ---- @@ -1821,7 +1821,7 @@ include::{sourcedir}/basic/FilterJoinTableTest.java[tags=mapping-filter-join-tab If the database contains the following entities: [[mapping-filter-join-table-persistence-example]] -.Persisting an fetching entities with a `@FilterJoinTable` mapping +.Persisting and fetching entities with a `@FilterJoinTable` mapping ==== [source, JAVA, indent=0] ---- diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc index e78cd070b5..9e675d4d32 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/collections.adoc @@ -4,7 +4,7 @@ :extrasdir: extras/collections Naturally Hibernate also allows to persist collections. -These persistent collections can contain almost any other Hibernate type, including: basic types, custom types, components and references to other entities. +These persistent collections can contain almost any other Hibernate type, including: basic types, custom types, embeddables and references to other entities. In this context, the distinction between value and reference semantics is very important. An object in a collection might be handled with _value_ semantics (its life cycle being fully depends on the collection owner), or it might be a reference to another entity with its own life cycle. @@ -465,7 +465,7 @@ include::{sourcedir}/UnidirectionalSetTest.java[tags=collections-unidirectional- ==== The unidirectional set lifecycle is similar to that of the <>, so it can be omitted. -The only difference is that `Set` doesn't allow duplicates, but this constraint is enforced by the Java object contract rather then the database mapping. +The only difference is that `Set` doesn't allow duplicates, but this constraint is enforced by the Java object contract rather than the database mapping. [NOTE] ==== @@ -540,7 +540,7 @@ include::{sourcedir}/UnidirectionalComparatorSortedSetTest.java[lines=75..77,ind [[collections-map]] ==== Maps -A `java.util.Map` is ternary association because it required a parent entity a map key and a value. +A `java.util.Map` is a ternary association because it requires a parent entity, a map key and a value. An entity can either be a map key or a map value, depending on the mapping. Hibernate allows using the following map keys: diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc index 121c4b85ab..8c6810a538 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc @@ -376,7 +376,7 @@ include::{sourcedir-proxy}/ProxyInterfaceTest.java[tag=entity-proxy-interface-ma The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/Proxy.html[`@Proxy`] annotation is used to specify a custom Proxy implementation for the current annotated entity. -When loading the `Book` entity proxy, Hibernate is going to proxy the `Identifiable` interface instead as illustarted by the following example: +When loading the `Book` entity proxy, Hibernate is going to proxy the `Identifiable` interface instead as illustrated by the following example: [[entity-proxy-persist-mapping]] .Proxying the final entity class implementing the `Identifiable` interface @@ -420,7 +420,7 @@ include::{sourcedir-proxy}/tuplizer/Country.java[tag=entity-tuplizer-entity-mapp The `@Tuplizer` instructs Hibernate to use the `DynamicEntityTuplizer` and `DynamicEmbeddableTuplizer` to handle the associated entity and embeddable object types. -Both the `Cuising` entity and the `Country` embeddable types are going to be instantiated as Java dynamic proxies, +Both the `Cuisine` entity and the `Country` embeddable types are going to be instantiated as Java dynamic proxies, as you can see in the following `DynamicInstantiator` example: [[entity-tuplizer-instantiator]] @@ -486,5 +486,5 @@ include::{sourcedir-persister}/Book.java[tag=entity-persister-mapping,indent=0] ---- ==== -By providing you own `EntityPersister` and `CollectionPersister` implementations, +By providing your own `EntityPersister` and `CollectionPersister` implementations, you can control how entities and collections are persisted in to the database. \ No newline at end of file diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/extras/associations/associations-one-to-many-unidirectional-lifecycle-example.sql b/documentation/src/main/asciidoc/userguide/chapters/domain/extras/associations/associations-one-to-many-unidirectional-lifecycle-example.sql index 52d45dba6e..3ea0b8c09b 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/extras/associations/associations-one-to-many-unidirectional-lifecycle-example.sql +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/extras/associations/associations-one-to-many-unidirectional-lifecycle-example.sql @@ -4,11 +4,11 @@ VALUES ( 1 ) INSERT INTO Phone ( number, id ) -VALUES ( '123 - 456 - 7890', 2 ) +VALUES ( '123-456-7890', 2 ) INSERT INTO Phone ( number, id ) -VALUES ( '321 - 654 - 0987', 3 ) +VALUES ( '321-654-0987', 3 ) INSERT INTO Person_Phone ( Person_id, phones_id ) diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/extras/associations/associations-one-to-one-bidirectional-lifecycle-example.sql b/documentation/src/main/asciidoc/userguide/chapters/domain/extras/associations/associations-one-to-one-bidirectional-lifecycle-example.sql index 901a6e7069..e91f5ff44f 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/extras/associations/associations-one-to-one-bidirectional-lifecycle-example.sql +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/extras/associations/associations-one-to-one-bidirectional-lifecycle-example.sql @@ -1,5 +1,5 @@ INSERT INTO Phone ( number, id ) -VALUES ( '123 - 456 - 7890', 1 ) +VALUES ( '123-456-7890', 1 ) INSERT INTO PhoneDetails ( phone_id, provider, technology, id ) -VALUES ( 1, 'T - Mobile, GSM', 2 ) \ No newline at end of file +VALUES ( 1, 'T-Mobile', 'GSM', 2 ) \ No newline at end of file diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/extras/entity/entity-proxy-persist-mapping.sql b/documentation/src/main/asciidoc/userguide/chapters/domain/extras/entity/entity-proxy-persist-mapping.sql index 949d24e8e6..0da513b3f6 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/extras/entity/entity-proxy-persist-mapping.sql +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/extras/entity/entity-proxy-persist-mapping.sql @@ -1,3 +1,4 @@ +insert into Book (author, title, id) diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc index 5764d01216..352c9c249c 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/identifiers.adoc @@ -117,7 +117,7 @@ include::{sourcedir}/EmbeddedIdTest.java[tag=identifiers-basic-embeddedid-mappin ---- ==== -As mentioned before, EmbeddedIds can even contain `@ManyToOne` attributes. +As mentioned before, EmbeddedIds can even contain `@ManyToOne` attributes: [[identifiers-basic-embeddedid-manytoone-mapping-example]] .`@EmbeddedId` with `@ManyToOne` @@ -200,7 +200,7 @@ Although the mapping is much simpler than using an `@EmbeddedId` or an `@IdClass To query this entity, an instance of the entity itself must be supplied to the persistence context. [[identifiers-composite-id-fetching-example]] -.Fetchcing with composite identifiers +.Fetching with composite identifiers ==== [source,java] ---- @@ -243,7 +243,7 @@ How a persistence provider interprets the AUTO generation type is left up to the The default behavior is to look at the java type of the identifier attribute. -If the identifier type is UUID, Hibernate is going to use an <>. +If the identifier type is UUID, Hibernate is going to use a <>. If the identifier type is numerical (e.g. `Long`, `Integer`), then Hibernate is going to use the `IdGeneratorStrategyInterpreter` to resolve the identifier generator strategy. The `IdGeneratorStrategyInterpreter` has two implementations: diff --git a/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc b/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc index 1407719e36..04a2d8e67b 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc @@ -109,7 +109,7 @@ For this reason, you should prefer LAZY associations. [[fetching-strategies]] === Applying fetch strategies -Let's consider these topics as it relates to an simple domain model and a few use cases. +Let's consider these topics as it relates to a simple domain model and a few use cases. [[fetching-strategies-domain-model-example]] .Sample domain model diff --git a/documentation/src/main/asciidoc/userguide/chapters/osgi/OSGi.adoc b/documentation/src/main/asciidoc/userguide/chapters/osgi/OSGi.adoc index 51f23e5dee..e56095d989 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/osgi/OSGi.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/osgi/OSGi.adoc @@ -162,7 +162,7 @@ Your bundle's manifest will need to import, at a minimum, * `org.osgi.framework`, necessary to discover the `SessionFactory` (described below) * `org.hibernate.*` packages, as necessary (ex: cfg, criterion, service, etc.) -=== Obtaining an SessionFactory +=== Obtaining a SessionFactory `hibernate-osgi` registers an OSGi service, using the `SessionFactory` interface name, that bootstraps and creates a `SessionFactory` specific for OSGi environments. diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc index ba01c0968a..7a1a903aa6 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc @@ -310,9 +310,9 @@ Please note that the alias names in the result are simply examples, each alias w |A collection key |`{[aliasname].key}` |`ORGID as {coll.key}` -|The id of an collection |`{[aliasname].id}` |`EMPID as {coll.id}` +|The id of a collection |`{[aliasname].id}` |`EMPID as {coll.id}` -|The element of an collection |`{[aliasname].element}` +|The element of a collection |`{[aliasname].element}` |`XID as {coll.element}` |property of the element in the collection diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc index a4224d1c46..d5317e7738 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/query/spatial/Spatial.adoc @@ -206,7 +206,7 @@ jts_geometry:: geolatte_geometry:: Handled by `org.hibernate.spatial.GeolatteGeometryType`, it maps a database geometry column type to an `org.geolatte.geom.Geometry` entity property type. -It suffices to declare a property as either a JTS or an Geolatte-geom `Geometry` and Hibernate Spatial will map it using the +It suffices to declare a property as either a JTS or a Geolatte-geom `Geometry` and Hibernate Spatial will map it using the relevant type. Here is an example using JTS: diff --git a/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java b/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java index fc6a974030..d59e2daf7f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java @@ -263,7 +263,7 @@ public class BootstrapTest { SessionFactoryBuilder sessionFactoryBuilder = metadata.getSessionFactoryBuilder(); - // Supply an SessionFactory-level Interceptor + // Supply a SessionFactory-level Interceptor sessionFactoryBuilder.applyInterceptor( new CustomSessionFactoryInterceptor() ); // Add a custom observer diff --git a/hibernate-core/src/main/antlr/hql-sql.g b/hibernate-core/src/main/antlr/hql-sql.g index 03e6ecc676..dec52209fb 100644 --- a/hibernate-core/src/main/antlr/hql-sql.g +++ b/hibernate-core/src/main/antlr/hql-sql.g @@ -505,7 +505,7 @@ joinElement! { } ; -// Returns an node type integer that represents the join type +// Returns a node type integer that represents the join type // tokens. joinType returns [int j] { j = INNER; diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java index aa6167248b..da7a42c073 100644 --- a/hibernate-core/src/main/java/org/hibernate/Session.java +++ b/hibernate-core/src/main/java/org/hibernate/Session.java @@ -837,7 +837,7 @@ public interface Session extends SharedSessionContract, EntityManager, Hibernate IdentifierLoadAccess byId(Class entityClass); /** - * Create an {@link NaturalIdLoadAccess} instance to retrieve the specified entity by + * Create a {@link NaturalIdLoadAccess} instance to retrieve the specified entity by * its natural id. * * @param entityName The entity name of the entity type to be retrieved @@ -849,7 +849,7 @@ public interface Session extends SharedSessionContract, EntityManager, Hibernate NaturalIdLoadAccess byNaturalId(String entityName); /** - * Create an {@link NaturalIdLoadAccess} instance to retrieve the specified entity by + * Create a {@link NaturalIdLoadAccess} instance to retrieve the specified entity by * its natural id. * * @param entityClass The entity type to be retrieved @@ -861,7 +861,7 @@ public interface Session extends SharedSessionContract, EntityManager, Hibernate NaturalIdLoadAccess byNaturalId(Class entityClass); /** - * Create an {@link SimpleNaturalIdLoadAccess} instance to retrieve the specified entity by + * Create a {@link SimpleNaturalIdLoadAccess} instance to retrieve the specified entity by * its natural id. * * @param entityName The entity name of the entity type to be retrieved @@ -874,7 +874,7 @@ public interface Session extends SharedSessionContract, EntityManager, Hibernate SimpleNaturalIdLoadAccess bySimpleNaturalId(String entityName); /** - * Create an {@link SimpleNaturalIdLoadAccess} instance to retrieve the specified entity by + * Create a {@link SimpleNaturalIdLoadAccess} instance to retrieve the specified entity by * its simple (single attribute) natural id. * * @param entityClass The entity type to be retrieved diff --git a/hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java b/hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java index 9b94274c4c..d269bed198 100644 --- a/hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java +++ b/hibernate-core/src/main/java/org/hibernate/TransientPropertyValueException.java @@ -20,7 +20,7 @@ public class TransientPropertyValueException extends TransientObjectException { private final String propertyName; /** - * Constructs an {@link TransientPropertyValueException} instance. + * Constructs a {@link TransientPropertyValueException} instance. * * @param message - the exception message; * @param transientEntityName - the entity name for the transient entity diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java index 5aaee80096..57eea2b2be 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java @@ -66,7 +66,7 @@ public interface ImplicitNamingStrategy { public Identifier determineJoinTableName(ImplicitJoinTableNameSource source); /** - * Determine the name of an collection join table given the source naming + * Determine the name of a collection join table given the source naming * information, when a name is not explicitly given. * * @param source The source information diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java index 63ba3d7da8..fc27ce7ee3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java @@ -156,7 +156,7 @@ public class BootstrapServiceRegistryBuilder { /** * Applies one or more strategy selectors announced as available by the passed announcer. * - * @param strategyRegistrationProvider An provider for one or more available selectors + * @param strategyRegistrationProvider A provider for one or more available selectors * * @return {@code this}, for method chaining * diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java index d90b92a9f3..1dc3bb46c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java @@ -49,11 +49,11 @@ public interface EnhancementContext { public boolean isCompositeClass(UnloadedClass classDescriptor); /** - * Does the given class name represent an MappedSuperclass class? + * Does the given class name represent a MappedSuperclass class? * * @param classDescriptor The descriptor of the class to check. * - * @return {@code true} if the class is an mapped super class; {@code false} otherwise. + * @return {@code true} if the class is a mapped super class; {@code false} otherwise. */ public boolean isMappedSuperclassClass(UnloadedClass classDescriptor); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java index 4dc3c70d14..9ae76c1a71 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java @@ -479,7 +479,7 @@ public final class AnnotationBinder { * @param clazzToProcess entity to bind as {@code XClass} instance * @param inheritanceStatePerClass Meta data about the inheritance relationships for all mapped classes * - * @throws MappingException in case there is an configuration error + * @throws MappingException in case there is a configuration error */ public static void bindClass( XClass clazzToProcess, diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java b/hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java index 1f166ae0d5..f81a5fcfec 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java @@ -274,7 +274,7 @@ public class DetachedCriteria implements CriteriaSpecification, Serializable { } /** - * Creates an nested DetachedCriteria representing the association path. + * Creates a nested DetachedCriteria representing the association path. * * @param associationPath The association path * @param alias The alias to apply to that association path @@ -286,7 +286,7 @@ public class DetachedCriteria implements CriteriaSpecification, Serializable { } /** - * Creates an nested DetachedCriteria representing the association path. + * Creates a nested DetachedCriteria representing the association path. * * @param associationPath The association path * @@ -297,7 +297,7 @@ public class DetachedCriteria implements CriteriaSpecification, Serializable { } /** - * Creates an nested DetachedCriteria representing the association path, specifying the type of join to use. + * Creates a nested DetachedCriteria representing the association path, specifying the type of join to use. * * @param associationPath The association path * @param joinType The type of join to use @@ -309,7 +309,7 @@ public class DetachedCriteria implements CriteriaSpecification, Serializable { } /** - * Creates an nested DetachedCriteria representing the association path, specifying the type of join to use. + * Creates a nested DetachedCriteria representing the association path, specifying the type of join to use. * * @param associationPath The association path * @param alias The alias to associate with this "join". @@ -322,7 +322,7 @@ public class DetachedCriteria implements CriteriaSpecification, Serializable { } /** - * Creates an nested DetachedCriteria representing the association path, specifying the type of join to use and + * Creates a nested DetachedCriteria representing the association path, specifying the type of join to use and * an additional join restriction. * * @param associationPath The association path diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/MatchMode.java b/hibernate-core/src/main/java/org/hibernate/criterion/MatchMode.java index 4dec81af0b..73caa7b4c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/MatchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/MatchMode.java @@ -7,7 +7,7 @@ package org.hibernate.criterion; /** - * Represents an strategy for matching strings using "like". + * Represents a strategy for matching strings using "like". * * @author Gavin King * @see Example#enableLike(MatchMode) diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Property.java b/hibernate-core/src/main/java/org/hibernate/criterion/Property.java index 33f5c8069f..9d1478fd40 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Property.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Property.java @@ -132,7 +132,7 @@ public class Property extends PropertyProjection { } /** - * Creates an non-equality restriction. + * Creates a non-equality restriction. * * @param value The value to check against * @@ -145,7 +145,7 @@ public class Property extends PropertyProjection { } /** - * Creates an non-equality restriction capable of also rendering as IS NOT NULL if the given value is {@code null} + * Creates a non-equality restriction capable of also rendering as IS NOT NULL if the given value is {@code null} * * @param value The value to check against * @@ -241,7 +241,7 @@ public class Property extends PropertyProjection { } /** - * Creates an non-equality restriction between 2 properties + * Creates a non-equality restriction between 2 properties * * @param other The other property to compare against * @@ -255,7 +255,7 @@ public class Property extends PropertyProjection { } /** - * Creates an non-equality restriction between 2 properties + * Creates a non-equality restriction between 2 properties * * @param other The other property to compare against * @@ -269,7 +269,7 @@ public class Property extends PropertyProjection { } /** - * Creates an less-than-or-equal-to restriction between 2 properties + * Creates a less-than-or-equal-to restriction between 2 properties * * @param other The other property to compare against * @@ -283,7 +283,7 @@ public class Property extends PropertyProjection { } /** - * Creates an less-than-or-equal-to restriction between 2 properties + * Creates a less-than-or-equal-to restriction between 2 properties * * @param other The other property to compare against * @@ -297,7 +297,7 @@ public class Property extends PropertyProjection { } /** - * Creates an greater-than-or-equal-to restriction between 2 properties + * Creates a greater-than-or-equal-to restriction between 2 properties * * @param other The other property to compare against * @@ -311,7 +311,7 @@ public class Property extends PropertyProjection { } /** - * Creates an greater-than-or-equal-to restriction between 2 properties + * Creates a greater-than-or-equal-to restriction between 2 properties * * @param other The other property to compare against * @@ -325,7 +325,7 @@ public class Property extends PropertyProjection { } /** - * Creates an less-than restriction between 2 properties + * Creates a less-than restriction between 2 properties * * @param other The other property to compare against * @@ -339,7 +339,7 @@ public class Property extends PropertyProjection { } /** - * Creates an less-than restriction between 2 properties + * Creates a less-than restriction between 2 properties * * @param other The other property to compare against * @@ -353,7 +353,7 @@ public class Property extends PropertyProjection { } /** - * Creates an greater-than restriction between 2 properties + * Creates a greater-than restriction between 2 properties * * @param other The other property to compare against * @@ -367,7 +367,7 @@ public class Property extends PropertyProjection { } /** - * Creates an greater-than restriction between 2 properties + * Creates a greater-than restriction between 2 properties * * @param other The other property to compare against * diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 464b24c4f3..cf33c6f745 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -2671,7 +2671,7 @@ public abstract class Dialect implements ConversionContext { } /** - * Return the limit that the underlying database places on the number elements in an {@code IN} predicate. + * Return the limit that the underlying database places on the number of elements in an {@code IN} predicate. * If the database defines no such limits, simply return zero or less-than-zero. * * @return int The limit, or zero-or-less to indicate no limit. @@ -2684,7 +2684,7 @@ public abstract class Dialect implements ConversionContext { * HHH-4635 * Oracle expects all Lob values to be last in inserts and updates. * - * @return boolean True of Lob values should be last, false if it + * @return boolean True if Lob values should be last, false if it * does not matter. */ public boolean forceLobAsLastValue() { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index 285ef74da9..9222c4dfcd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -844,7 +844,7 @@ public class StatefulPersistenceContext implements PersistenceContext { } /** - * Add an collection to the cache, with a given collection entry. + * Add a collection to the cache, with a given collection entry. * * @param coll The collection for which we are adding an entry. * @param entry The entry representing the collection. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterParser.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterParser.java index a393e41c10..a7c4f80e8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterParser.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterParser.java @@ -180,7 +180,7 @@ public class ParameterParser { else if ( c == '?' ) { // could be either an ordinal or JPA-positional parameter if ( indx < stringLength - 1 && Character.isDigit( sqlString.charAt( indx + 1 ) ) ) { - // a peek ahead showed this as an JPA-positional parameter + // a peek ahead showed this as a JPA-positional parameter final int right = StringHelper.firstIndexOfChar( sqlString, ParserHelper.HQL_SEPARATORS, indx + 1 ); final int chopLocation = right < 0 ? sqlString.length() : right; final String param = sqlString.substring( indx + 1, chopLocation ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java index 17fbc07567..a34d8cd1d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java @@ -101,7 +101,7 @@ public class ActionQueue { private BeforeTransactionCompletionProcessQueue beforeTransactionProcesses; /** - * An LinkedHashMap containing providers for all the ExecutableLists, inserted in execution order + * A LinkedHashMap containing providers for all the ExecutableLists, inserted in execution order */ private static final LinkedHashMap,ListProvider> EXECUTABLE_LISTS_MAP; static { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java index ea636c26b4..df20de24e0 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java @@ -232,7 +232,7 @@ public class BatchFetchQueue { // collection batch support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /** - * If an CollectionEntry represents a batch loadable collection, add + * If a CollectionEntry represents a batch loadable collection, add * it to the queue. */ public void addBatchLoadableCollection(PersistentCollection collection, CollectionEntry ce) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java index 597fb52431..0a719b7cac 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java @@ -13,7 +13,7 @@ import org.hibernate.internal.CoreLogging; import org.jboss.logging.Logger; /** - * A strategy for determining if a version value is an version of + * A strategy for determining if a version value is a version of * a new transient instance or a previously persistent transient instance. * The strategy is determined by the unsaved-value attribute in * the mapping file. diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java b/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java index 72b05c7a12..2b3dc1b03e 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java @@ -262,7 +262,7 @@ class MergeContext implements Map { } if ( oldOperatedOn != null ) { throw new IllegalStateException( - "MergeContext#mergeEntityToOperatedOnFlagMap contains an merge entity " + printEntity( mergeEntity ) + "MergeContext#mergeEntityToOperatedOnFlagMap contains a merge entity " + printEntity( mergeEntity ) + ", but MergeContext#mergeToManagedEntityXref does not." ); } @@ -278,7 +278,7 @@ class MergeContext implements Map { } if ( oldOperatedOn == null ) { throw new IllegalStateException( - "MergeContext#mergeToManagedEntityXref contained an mergeEntity " + printEntity( mergeEntity ) + "MergeContext#mergeToManagedEntityXref contained a merge entity " + printEntity( mergeEntity ) + ", but MergeContext#mergeEntityToOperatedOnFlagMap did not." ); } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementFactory.java index 7c8d886b44..4f24021cb9 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementFactory.java @@ -111,7 +111,7 @@ public class FromElementFactory implements SqlTokenTypes { String classAlias) throws SemanticException { LOG.debugf( "createFromElementInSubselect() : path = %s", path ); - // Create an DotNode AST for the path and resolve it. + // Create a DotNode AST for the path and resolve it. FromElement fromElement = evaluateFromElementPath( path, classAlias ); EntityPersister entityPersister = fromElement.getEntityPersister(); diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java index aa23ea3814..c41c910ad8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java @@ -261,7 +261,7 @@ public class SelectClause extends SelectExpressionList { } private void initializeColumnNames() { - // Generate an 2d array of column names, the first dimension is parallel with the + // Generate a 2d array of column names, the first dimension is parallel with the // return types array. The second dimension is the list of column names for each // type. diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java index 118e5c4dee..4d9f8dad75 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java @@ -29,7 +29,7 @@ import org.hibernate.type.Type; import org.jboss.logging.Logger; /** - * Generates identifier values based on an sequence-style database structure. + * Generates identifier values based on a sequence-style database structure. * Variations range from actually using a sequence to using a table to mimic * a sequence. These variations are encapsulated by the {@link DatabaseStructure} * interface internally. diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java index 6a7cfc7e94..e739cb90bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java @@ -17,7 +17,7 @@ import org.hibernate.pretty.MessageHelper; /** * Abstract InsertGeneratedIdentifierDelegate implementation where the - * underlying strategy requires an subsequent select after the insert + * underlying strategy requires a subsequent select after the insert * to determine the generated identifier. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index 6b38d8683b..e4c7950134 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -448,7 +448,7 @@ public interface CoreMessageLogger extends BasicLogger { void invalidOnDeleteAnnotation(String entityName); @LogMessage(level = WARN) - @Message(value = "Root entity should not hold an PrimaryKeyJoinColum(s), will be ignored: %s", id = 137) + @Message(value = "Root entity should not hold a PrimaryKeyJoinColum(s), will be ignored: %s", id = 137) void invalidPrimaryKeyJoinColumnAnnotation(String className); @LogMessage(level = WARN) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterable.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterable.java index 4518a67278..e9bfd9d664 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterable.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/JoinedIterable.java @@ -11,7 +11,7 @@ import java.util.List; /** - * An JoinedIterable is an Iterable that wraps a number of Iterables. + * A JoinedIterable is an Iterable that wraps a number of Iterables. * * This class makes multiple iterables look like one to the caller. * When any method from the Iterator interface is called on the diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java index fcc9844c7c..514f310c36 100644 --- a/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java @@ -173,7 +173,7 @@ public class JmxServiceImpl implements JmxService, Stoppable { } for ( MBeanServer mbeanServer : mbeanServers ) { - // they did specify a domain, so attempt to locate an MBEanServer with a matching default domain, returning it + // they did specify a domain, so attempt to locate an MBeanServer with a matching default domain, returning it // if we find it. if ( defaultDomain.equals( mbeanServer.getDefaultDomain() ) ) { return mbeanServer; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java index 4e6f3886ad..b2f09f1657 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java @@ -469,7 +469,7 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil // 1) additional JACC permissions // 2) additional cache region declarations // - // we will also clean up an references with null entries + // we will also clean up any references with null entries Iterator itr = mergedSettings.configurationValues.entrySet().iterator(); while ( itr.hasNext() ) { final Map.Entry entry = (Map.Entry) itr.next(); diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/AbstractEntityGraphVisitationStrategy.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/AbstractEntityGraphVisitationStrategy.java index 8c60516e7e..f5e2014dd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/AbstractEntityGraphVisitationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/AbstractEntityGraphVisitationStrategy.java @@ -132,15 +132,16 @@ public abstract class AbstractEntityGraphVisitationStrategy } /** - * I'm using NULL-OBJECT pattern here, for attributes that not existing in the EntityGraph, + * I'm using the NULL-OBJECT pattern here. + * For attributes that don't exist in the EntityGraph, * a predefined NULL-ATTRIBUTE-NODE is pushed to the stack. * - * and for an not existing sub graph, a predefined NULL-SUBGRAPH is pushed to the stack. + * And for a nonexistent subgraph, a predefined NULL-SUBGRAPH is pushed to the stack. * - * So, whenever we're start visiting an attribute, there will be a attribute node pushed to the attribute stack, + * So, whenever we start visiting an attribute, there will be an attribute node pushed to the attribute stack, * and a subgraph node pushed to the graph stack. * - * when we're finish visiting an attribute, these two will be poped from each stack. + * when we finish visiting an attribute, these two will be popped from each stack. */ @Override public boolean startingAttribute(AttributeDefinition attributeDefinition) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java index bfaaf5f511..43c0511f82 100755 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java @@ -318,7 +318,7 @@ class MetadataContext { ); } } - //an MappedSuperclass can have no identifier if the id is set below in the hierarchy + //a MappedSuperclass can have no identifier if the id is set below in the hierarchy else if ( mappingType.getIdentifierMapper() != null ) { @SuppressWarnings("unchecked") Iterator propertyIterator = mappingType.getIdentifierMapper().getPropertyIterator(); diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyConfiguration.java b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyConfiguration.java index 50c99dd5c0..18c3ebcbdf 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyConfiguration.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyConfiguration.java @@ -58,7 +58,7 @@ public interface ProxyConfiguration { } /** - * An static interceptor that guards against method calls before the interceptor is set. + * A static interceptor that guards against method calls before the interceptor is set. */ class InterceptorDispatcher { diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/InPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/InPredicate.java index 283767be4a..30e0a3a9cd 100755 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/InPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/InPredicate.java @@ -25,7 +25,7 @@ import org.hibernate.query.criteria.internal.expression.ParameterExpressionImpl; import org.hibernate.type.Type; /** - * Models an [NOT] IN restriction + * Models a [NOT] IN restriction * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/MemberOfPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/MemberOfPredicate.java index 9653f11119..099e9ca828 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/MemberOfPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/MemberOfPredicate.java @@ -18,7 +18,7 @@ import org.hibernate.query.criteria.internal.expression.LiteralExpression; import org.hibernate.query.criteria.internal.path.PluralAttributePath; /** - * Models an [NOT] MEMBER OF restriction + * Models a [NOT] MEMBER OF restriction * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/type/Type.java b/hibernate-core/src/main/java/org/hibernate/type/Type.java index 65ad6d3e1b..07d90ccf8c 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/Type.java +++ b/hibernate-core/src/main/java/org/hibernate/type/Type.java @@ -51,7 +51,7 @@ public interface Type extends Serializable { * A {@link CollectionType} is additionally an {@link AssociationType}; so if this method returns true, * {@link #isAssociationType()} should also return true. * - * @return True if this type is also an {@link CollectionType} implementor; false otherwise. + * @return True if this type is also a {@link CollectionType} implementor; false otherwise. */ boolean isCollectionType(); @@ -82,7 +82,7 @@ public interface Type extends Serializable { * version of {@code (type instanceof CompositeType.class)}. A component type may own collections or * associations and hence must provide certain extra functionality. * - * @return True if this type is also an {@link CompositeType} implementor; false otherwise. + * @return True if this type is also a {@link CompositeType} implementor; false otherwise. */ boolean isComponentType(); diff --git a/hibernate-core/src/main/resources/org/hibernate/jpa/orm_1_0.xsd b/hibernate-core/src/main/resources/org/hibernate/jpa/orm_1_0.xsd index fbde2656d4..17388ee716 100644 --- a/hibernate-core/src/main/resources/org/hibernate/jpa/orm_1_0.xsd +++ b/hibernate-core/src/main/resources/org/hibernate/jpa/orm_1_0.xsd @@ -46,7 +46,7 @@ - The entity-mappings element is the root element of an mapping + The entity-mappings element is the root element of a mapping file. It contains the following four types of elements: 1. The persistence-unit-metadata element contains metadata diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java index c869fd3fb3..c1ba41ed72 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java @@ -100,7 +100,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { @Test @TestForIssue(jiraKey = "HHH-8916") public void testPaginationWithCTEQueryWithOffsetAndOrderBy() { - // This used to throw an StringIndexOutOfBoundsException + // This used to throw a StringIndexOutOfBoundsException doInHibernate( this::sessionFactory, session -> { for ( int i = 0; i < 20; ++i ) { session.persist( new Product2( i, "Product" + i ) ); @@ -127,7 +127,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { @Test @TestForIssue(jiraKey = "HHH-8916") public void testPaginationWithCTEQueryWithOffset() { - // This used to throw an StringIndexOutOfBoundsException + // This used to throw a StringIndexOutOfBoundsException doInHibernate( this::sessionFactory, session -> { for ( int i = 0; i < 20; ++i ) { session.persist( new Product2( i, "Product" + i ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java index 75fda4886c..bc741e3cf7 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java @@ -72,7 +72,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { simple.setCount(2); s.save( simple ); - // Test to make sure allocating an specified object operates correctly. + // Test to make sure allocating a specified object operates correctly. assertTrue( s.createQuery( "select new org.hibernate.test.legacy.S(s.count, s.address) from Simple s" ).list().size() == 1 ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java index cbea94dfb1..dcba68dd22 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java @@ -1767,7 +1767,7 @@ public class FooBarTest extends LegacyTestCase { try { q.setParameterList("nameList", (Collection)null); - fail("Should throw an queryexception when passing a null!"); + fail("Should throw a QueryException when passing a null!"); } catch (IllegalArgumentException qe) { //should happen diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java index 481f57659e..20659998d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java @@ -69,7 +69,7 @@ public class SQLFunctionsTest extends LegacyTestCase { simple.setCount(2); s.save( simple ); - // Test to make sure allocating an specified object operates correctly. + // Test to make sure allocating a specified object operates correctly. assertTrue( s.createQuery( "select new org.hibernate.test.legacy.S(s.count, s.address) from Simple s" ).list().size() == 1 ); diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/regions/EhcacheTransactionalDataRegion.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/regions/EhcacheTransactionalDataRegion.java index 86837fc7d5..d24f6b90ee 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/regions/EhcacheTransactionalDataRegion.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/regions/EhcacheTransactionalDataRegion.java @@ -46,7 +46,7 @@ public class EhcacheTransactionalDataRegion extends EhcacheDataRegion implements private final CacheLockProvider lockProvider; /** - * Construct an transactional Hibernate cache region around the given Ehcache instance. + * Construct a transactional Hibernate cache region around the given Ehcache instance. */ EhcacheTransactionalDataRegion( EhcacheAccessStrategyFactory accessStrategyFactory, Ehcache cache, SessionFactoryOptions settings, diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/BeanUtils.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/BeanUtils.java index 2a7baf5c75..577d6fa356 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/BeanUtils.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/management/impl/BeanUtils.java @@ -113,7 +113,7 @@ public class BeanUtils { throw new NoSuchFieldException( propertyName ); } else if ( !(o instanceof Number) ) { - throw new IllegalArgumentException( propertyName + " not an Number" ); + throw new IllegalArgumentException( propertyName + " not a Number" ); } return ((Number) o).longValue(); } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity3.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity3.java index e6f7a6a2f8..89bb6e5724 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity3.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/collection/EmbeddableListEntity3.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; /** - * Entity with an List of Embeddable Components that have ManyToOne relationships + * Entity with a List of Embeddable Components that have ManyToOne relationships * * @author Cankut Guven */ diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialDialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialDialect.java index 12163a12f4..74a1f7e475 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialDialect.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/SpatialDialect.java @@ -62,11 +62,11 @@ public interface SpatialDialect extends Serializable { public String getDWithinSQL(String columnName); /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ public String getHavingSridSQL(String columnName); diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOSupport.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOSupport.java index ab8e8f15d1..3266f7ef0f 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOSupport.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/OracleSDOSupport.java @@ -277,11 +277,11 @@ class OracleSDOSupport implements SpatialDialect, Serializable { } /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ @Override public String getHavingSridSQL(String columnName) { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG91Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG91Dialect.java index cc02adb9fc..25eccc44e9 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG91Dialect.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG91Dialect.java @@ -107,11 +107,11 @@ public class PostgisPG91Dialect extends PostgreSQL91Dialect implements SpatialDi } /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ @Override public String getHavingSridSQL(String columnName) { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG92Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG92Dialect.java index 0f4b8897b3..0006fc2876 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG92Dialect.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG92Dialect.java @@ -107,11 +107,11 @@ public class PostgisPG92Dialect extends PostgreSQL92Dialect implements SpatialDi } /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ @Override public String getHavingSridSQL(String columnName) { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java index f4e109ebc1..30a8c2b8ee 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG93Dialect.java @@ -107,11 +107,11 @@ public class PostgisPG93Dialect extends PostgreSQL93Dialect implements SpatialDi } /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ @Override public String getHavingSridSQL(String columnName) { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java index 8d70859352..2fe8ff00cf 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG94Dialect.java @@ -107,11 +107,11 @@ public class PostgisPG94Dialect extends PostgreSQL94Dialect implements SpatialDi } /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ @Override public String getHavingSridSQL(String columnName) { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java index 3db378fd82..84f3c04fb0 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG95Dialect.java @@ -106,11 +106,11 @@ public class PostgisPG95Dialect extends PostgreSQL95Dialect implements SpatialDi } /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ @Override public String getHavingSridSQL(String columnName) { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG9Dialect.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG9Dialect.java index 5f22fcaf38..daceb78ecf 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG9Dialect.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisPG9Dialect.java @@ -107,11 +107,11 @@ public class PostgisPG9Dialect extends PostgreSQL9Dialect implements SpatialDial } /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ @Override public String getHavingSridSQL(String columnName) { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSupport.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSupport.java index 2ab8550998..2276eaf8a2 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSupport.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/postgis/PostgisSupport.java @@ -125,11 +125,11 @@ public class PostgisSupport implements SpatialDialect, Serializable { } /** - * Returns the SQL fragment when parsing an HavingSridExpression. + * Returns the SQL fragment when parsing a HavingSridExpression. * * @param columnName The geometry column to test against * - * @return The SQL fragment for an HavingSridExpression. + * @return The SQL fragment for a HavingSridExpression. */ @Override public String getHavingSridSQL(String columnName) {