diff --git a/hibernate-core/src/main/antlr/order-by.g b/hibernate-core/src/main/antlr/order-by.g
index aababad481..8d7a4a5e26 100644
--- a/hibernate-core/src/main/antlr/order-by.g
+++ b/hibernate-core/src/main/antlr/order-by.g
@@ -127,7 +127,7 @@ tokens
/**
* Process the given node as a function.
*
- * @param The node representing the function invocation (including parameters as subtree components).
+ * @param ast The node representing the function invocation (including parameters as subtree components).
*
* @return The processed node.
*/
@@ -149,7 +149,7 @@ tokens
/**
* Allow post processing of each sort specification
*
- * @param The grammar-built sort specification subtree.
+ * @param sortSpec The grammar-built sort specification subtree.
*
* @return The processed sort specification subtree.
*/
diff --git a/hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java b/hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java
index a9ddcf9b79..3ee645c21d 100644
--- a/hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java
@@ -41,7 +41,7 @@ public interface CustomEntityDirtinessStrategy {
* @param persister The persister corresponding to the given entity
* @param session The session from which this check originates.
*
- * @return {@code true} indicates the entity is dirty; {@link false} indicates the entity is not dirty.
+ * @return {@code true} indicates the entity is dirty; {@code false} indicates the entity is not dirty.
*/
public boolean isDirty(Object entity, EntityPersister persister, Session session);
diff --git a/hibernate-core/src/main/java/org/hibernate/SQLQuery.java b/hibernate-core/src/main/java/org/hibernate/SQLQuery.java
index a4e0a868a6..8b7cd59dfa 100755
--- a/hibernate-core/src/main/java/org/hibernate/SQLQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/SQLQuery.java
@@ -49,7 +49,7 @@ import org.hibernate.type.Type;
* {@link #addFetch} and {@link #addScalar} methods
*
*
- *
+ *
* @author Gavin King
* @author Steve Ebersole
*
@@ -105,7 +105,7 @@ public interface SQLQuery extends Query, SynchronizeableQuery {
SQLQuery addScalar(String columnAlias, Type type);
/**
- * Add a new root return mapping, returning a {@link NativeQuery.RootReturn} to allow further definition.
+ * Add a new root return mapping, returning a {@link SQLQuery.RootReturn} to allow further definition.
*
* @param tableAlias The SQL table alias to map to this entity
* @param entityName The name of the entity.
@@ -117,7 +117,7 @@ public interface SQLQuery extends Query, SynchronizeableQuery {
RootReturn addRoot(String tableAlias, String entityName);
/**
- * Add a new root return mapping, returning a {@link NativeQuery.RootReturn} to allow further definition.
+ * Add a new root return mapping, returning a {@link SQLQuery.RootReturn} to allow further definition.
*
* @param tableAlias The SQL table alias to map to this entity
* @param entityType The java type of the entity.
diff --git a/hibernate-core/src/main/java/org/hibernate/action/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/action/spi/package-info.java
index b5cdf1fb62..7af5a2aab4 100644
--- a/hibernate-core/src/main/java/org/hibernate/action/spi/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/action/spi/package-info.java
@@ -7,6 +7,6 @@
/**
* Defines SPI hooks into the {@link org.hibernate.engine.spi.ActionQueue}. Mainly for registering custom
- * {@link AfterTransactionCompletionProcess} and {@link BeforeTransactionCompletionProcess} hooks.
+ * {@link org.hibernate.action.spi.AfterTransactionCompletionProcess} and {@link org.hibernate.action.spi.BeforeTransactionCompletionProcess} hooks.
*/
package org.hibernate.action.spi;
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java b/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java
index 1e20bf8f5a..811d53db19 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java
@@ -40,7 +40,7 @@ public @interface Filter {
/**
* If true, automatically determine all points within the condition fragment that an alias should be injected.
* Otherwise, injection will only replace instances of explicit "{alias}" instances or
- * @SqlFragmentAlias descriptors.
+ * {@link SqlFragmentAlias} descriptors.
*/
boolean deduceAliasInjectionPoints() default true;
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java
index 0f092abdde..ae39fb2f7f 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java
@@ -25,8 +25,6 @@ public enum FlushModeType {
*/
COMMIT,
/**
- * Corresponds to {@link org.hibernate.FlushMode#NEVER}.
- *
* @deprecated use MANUAL, will be removed in a subsequent release
*/
@Deprecated
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java
index 111c6ad804..ec54db3dbd 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java
@@ -98,7 +98,7 @@ public interface MetadataBuilder {
* Specify the second-level cache mode to be used. This is the cache mode in terms of whether or
* not to cache.
*
- * Its default is defined by the {@coce javax.persistence.sharedCache.mode} setting if using
+ * Its default is defined by the {@code javax.persistence.sharedCache.mode} setting if using
* property-based configuration.
*
* @param cacheMode The cache mode.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/AbstractScannerImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/AbstractScannerImpl.java
index eab823a51e..8d7423c180 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/AbstractScannerImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/AbstractScannerImpl.java
@@ -79,7 +79,7 @@ public abstract class AbstractScannerImpl implements Scanner {
*
* JPA allows for to be specific
* @param url
- * @return
+ * @return The resolved non-root URL
*/
protected URL resolveNonRootUrl(URL url) {
return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
index fafcd35635..35c925eeb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/Identifier.java
@@ -88,7 +88,7 @@ public class Identifier implements Comparable {
*
* @param name
*
- * @return
+ * @return {@code true} if the given identifier text is considered quoted; {@code false} otherwise.
*/
public static boolean isQuoted(String name) {
return ( name.startsWith( "`" ) && name.endsWith( "`" ) )
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FilterSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FilterSource.java
index 77d2316477..459b002c1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FilterSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/FilterSource.java
@@ -9,7 +9,7 @@ package org.hibernate.boot.model.source.spi;
import java.util.Map;
/**
- * Defines the source of filter information. May have an associated {@link FilterDefinitionSource}.
+ * Defines the source of filter information. May have an associated {@link org.hibernate.engine.spi.FilterDefinition}.
* Relates to both {@code } and {@link org.hibernate.annotations.Filter @Filter}
*
* @author Steve Ebersole
@@ -28,7 +28,7 @@ public interface FilterSource {
*
* @return The condition defined on the filter.
*
- * @see {@link FilterDefinitionSource#getCondition()}
+ * @see org.hibernate.boot.model.source.internal.hbm.FilterSourceImpl#getCondition()
*/
public String getCondition();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java
index a5c96851e0..67c1333a07 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java
@@ -26,7 +26,7 @@ public interface Orderable {
* If the ordering element is not specified, ordering by
* the primary key of the associated entity is assumed
*
- * {@see javax.persistence.OrderBy#value()}
+ * @see javax.persistence.OrderBy#value()
*
* @return The {@code ORDER BY} fragment used during loading this plural attribute from DB.
*/
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/package-info.java
index aca854db51..75c16fbce2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/package-info.java
@@ -13,14 +13,14 @@
* "override" services from parent registries. It also allows granular building of registries as services
* become available.
*
- * {@link BootstrapServiceRegistry} is the base service registry, intended to be built via
- * {@link BootstrapServiceRegistryBuilder} if you need customization. For non-customized
- * {@link BootstrapServiceRegistry} usage, the {@link BootstrapServiceRegistryBuilder} and
- * {@link BootstrapServiceRegistry} can be bypassed altogether.
+ * {@link org.hibernate.boot.registry.BootstrapServiceRegistry} is the base service registry, intended to be built via
+ * {@link org.hibernate.boot.registry.BootstrapServiceRegistryBuilder} if you need customization. For non-customized
+ * {@link org.hibernate.boot.registry.BootstrapServiceRegistry} usage, the {@link org.hibernate.boot.registry.BootstrapServiceRegistryBuilder} and
+ * {@link org.hibernate.boot.registry.BootstrapServiceRegistry} can be bypassed altogether.
*
- * Usually the next level in a standard registry set up is the {@link StandardServiceRegistry}, intended to be built
- * by the {@link StandardServiceRegistryBuilder} if you need customization. The builder optionally takes the
- * {@link BootstrapServiceRegistry} to use as a base; if none is provided a default one is generated assuming sensible
+ * Usually the next level in a standard registry set up is the {@link org.hibernate.boot.registry.StandardServiceRegistry}, intended to be built
+ * by the {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder} if you need customization. The builder optionally takes the
+ * {@link org.hibernate.boot.registry.BootstrapServiceRegistry} to use as a base; if none is provided a default one is generated assuming sensible
* defaults in Java SE and EE environments, particularly in respect to Class loading.
*/
package org.hibernate.boot.registry;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/package-info.java
index 1c464c32f1..587349b009 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/package-info.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/selector/spi/package-info.java
@@ -6,6 +6,6 @@
*/
/**
- * Defines actual contract used for strategy selection : {@link StrategySelector}.
+ * Defines actual contract used for strategy selection : {@link org.hibernate.boot.registry.selector.spi.StrategySelector}.
*/
package org.hibernate.boot.registry.selector.spi;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
index 12fcc57d93..e9f23eea5b 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java
@@ -54,7 +54,7 @@ public interface MetadataBuildingContext {
/**
* Not sure how I feel about this exposed here
*
- * @return
+ * @return The ObjectNameNormalizer
*/
ObjectNameNormalizer getObjectNameNormalizer();
}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java
index 0bd1a400c3..ddc6af6fab 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataImplementor.java
@@ -33,7 +33,7 @@ public interface MetadataImplementor extends Metadata, Mapping {
/**
* Access to the options used to build this Metadata
*
- * @return
+ * @return Access to the MetadataBuildingOptions
*/
MetadataBuildingOptions getMetadataBuildingOptions();
diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java
index bec175ad1c..b63e09c4d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java
+++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/NaturalIdDataAccess.java
@@ -16,7 +16,7 @@ import org.hibernate.persister.entity.EntityPersister;
*
*
* Note the special case of UPDATES above. Because the cache key itself has changed here we need to remove the
* old entry as well as
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java
index 2c17069bd2..21bb287dbc 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java
@@ -21,7 +21,7 @@ package org.hibernate.cfg;
* @author Gavin King
* @author Emmanuel Bernard
*
- * @deprecated A {@link org.hibernate.cfg.naming.NamingStrategyDelegator} should be used instead.
+ * @deprecated {@link org.hibernate.boot.model.naming.ImplicitNamingStrategy} and {@link org.hibernate.boot.model.naming.PhysicalNamingStrategy} should be used instead.
*/
@Deprecated
public interface NamingStrategy {
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolder.java
index e01aba7b7d..b0a530a3a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolder.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolder.java
@@ -104,7 +104,7 @@ public interface PropertyHolder {
* Determine the AttributeConverter to use for the given property.
*
* @param property
- * @return
+ * @return The ConverterDescriptor
*/
ConverterDescriptor resolveAttributeConverterDescriptor(XProperty property);
}
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java
index fe429ccfcf..1383767eaf 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java
@@ -250,7 +250,7 @@ public class JPAOverriddenAnnotationReader implements AnnotationReader {
private AccessibleObject mirroredAttribute;
/**
- * @deprecated Use {@link JPAMetadataProvider(AnnotatedElement, XMLContext, BootstrapContext)} instead.
+ * @deprecated Use {@link #JPAOverriddenAnnotationReader(AnnotatedElement, XMLContext, BootstrapContext)} instead.
*/
public JPAOverriddenAnnotationReader(
AnnotatedElement el,
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
index 49e7abf9f7..3ff66a3812 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
@@ -545,7 +545,7 @@ public class DB2Dialect extends Dialect {
* if expression has not been explicitly specified.
* @param nullPrecedence Nulls precedence. Default value: {@link NullPrecedence#NONE}.
*
- * @return
+ * @return SQL string.
*/
@Override
public String renderOrderByElement(String expression, String collation, String order, NullPrecedence nullPrecedence) {
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 0c9563775b..996cbfce22 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -1674,7 +1674,7 @@ public abstract class Dialect implements ConversionContext {
* @return The Dialect's preferred SQLExceptionConverter, or null to
* indicate that the default {@link SQLExceptionConverter} should be used.
*
- * @see {@link #buildSQLExceptionConversionDelegate()}
+ * @see #buildSQLExceptionConversionDelegate()
* @deprecated {@link #buildSQLExceptionConversionDelegate()} should be
* overridden instead.
*/
@@ -1687,11 +1687,11 @@ public abstract class Dialect implements ConversionContext {
* Build an instance of a {@link SQLExceptionConversionDelegate} for
* interpreting dialect-specific error or SQLState codes.
*
- * When {@link #buildSQLExceptionConverter} returns null, the default
+ * When {@link #buildSQLExceptionConverter} returns null, the default
* {@link SQLExceptionConverter} is used to interpret SQLState and
* error codes. If this method is overridden to return a non-null value,
* the default {@link SQLExceptionConverter} will use the returned
- * {@link SQLExceptionConversionDelegate} in addition to the following
+ * {@link SQLExceptionConversionDelegate} in addition to the following
* standard delegates:
*
*
a "static" delegate based on the JDBC 4 defined SQLException hierarchy;
@@ -2877,7 +2877,7 @@ public abstract class Dialect implements ConversionContext {
/**
* By default interpret this based on DatabaseMetaData.
*
- * @return
+ * @return The NameQualifierSupport.
*/
public NameQualifierSupport getNameQualifierSupport() {
return null;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
index e304bb6a68..b6580d5feb 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java
@@ -653,7 +653,7 @@ public class Oracle8iDialect extends Dialect {
public boolean supportsEmptyInList() {
return false;
}
-
+
@Override
public boolean supportsExistsInSelect() {
return false;
@@ -663,7 +663,7 @@ public class Oracle8iDialect extends Dialect {
public int getInExpressionCountLimit() {
return PARAM_LIST_SIZE_LIMIT;
}
-
+
@Override
public boolean forceLobAsLastValue() {
return true;
@@ -672,7 +672,8 @@ public class Oracle8iDialect extends Dialect {
/**
* For Oracle, the FOR UPDATE clause cannot be applied when using ORDER BY, DISTINCT or views.
* @param parameters
- * @return
+ * @return {@code true} indicates that the dialect requests that locking be applied by subsequent select;
+ * {@code false} (the default) indicates that locking should be applied to the main SQL statement..
@see Oracle FOR UPDATE restrictions
*/
@Override
@@ -697,12 +698,12 @@ public class Oracle8iDialect extends Dialect {
return true;
}
}
-
+
@Override
public String getNotExpression( String expression ) {
return "not (" + expression + ")";
}
-
+
@Override
public String getQueryHintString(String sql, String hints) {
String statementType = statementType(sql);
@@ -724,7 +725,7 @@ public class Oracle8iDialect extends Dialect {
return sql;
}
-
+
@Override
public int getMaxAliasLength() {
// Oracle's max identifier length is 30, but Hibernate needs to add "uniqueing info" so we account for that,
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java
index 465a9ffa78..748b2e753b 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java
@@ -31,7 +31,7 @@ public class SerializableBlobProxy implements InvocationHandler, Serializable {
* Builds a serializable {@link Blob} wrapper around the given {@link Blob}.
*
* @param blob The {@link Blob} to be wrapped.
- * @see
+ * @see #generateProxy(java.sql.Blob)
*/
private SerializableBlobProxy(Blob blob) {
this.blob = blob;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java
index b918ffcf8c..ec94471af1 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java
@@ -71,7 +71,7 @@ public interface JdbcEnvironment extends Service {
/**
* Obtain the level of support for qualified names.
*
- * @return
+ * @return The NameQualifierSupport.
*/
NameQualifierSupport getNameQualifierSupport();
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 6272656aff..435a6aa952 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
@@ -1102,11 +1102,11 @@ public class ActionQueue {
/**
* Check if the this {@link BatchIdentifier} has a parent or grand parent
- * matching the given {@link BatchIdentifier reference.
+ * matching the given {@link BatchIdentifier} reference.
*
* @param batchIdentifier {@link BatchIdentifier} reference
*
- * @return This {@link BatchIdentifier} has a parent matching the given {@link BatchIdentifier reference
+ * @return This {@link BatchIdentifier} has a parent matching the given {@link BatchIdentifier} reference
*/
boolean hasParent(BatchIdentifier batchIdentifier) {
return (
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 5b4e287617..cbc596796e 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
@@ -40,7 +40,7 @@ public class BatchFetchQueue {
/**
* A map of {@link SubselectFetch subselect-fetch descriptors} keyed by the
- * {@link EntityKey) against which the descriptor is registered.
+ * {@link EntityKey} against which the descriptor is registered.
*/
private Map subselectsByEntityKey;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
index b90ff597b3..07b70b6e06 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/PersistenceContext.java
@@ -33,7 +33,7 @@ import org.hibernate.persister.entity.EntityPersister;
*
*
* Often referred to as the "first level cache".
- *
+ *
* @author Gavin King
* @author Steve Ebersole
*/
@@ -250,7 +250,7 @@ public interface PersistenceContext {
final boolean disableVersionIncrement);
/**
- * Generates an appropriate EntityEntry instance and adds it
+ * Generates an appropriate EntityEntry instance and adds it
* to the event source's internal caches.
*/
EntityEntry addEntry(
@@ -286,7 +286,7 @@ public interface PersistenceContext {
/**
* If a deleted entity instance is re-saved, and it has a proxy, we need to
- * reset the identifier of the proxy
+ * reset the identifier of the proxy
*/
void reassociateProxy(Object value, Serializable id) throws MappingException;
@@ -478,7 +478,7 @@ public interface PersistenceContext {
*/
Object removeProxy(EntityKey key);
- /**
+ /**
* Retrieve the set of EntityKeys representing nullifiable references
* @deprecated Use {@link #containsNullifiableEntityKey(Supplier)} or {@link #registerNullifiableEntityKey(EntityKey)} or {@link #isNullifiableEntityKeysEmpty()}
*/
@@ -496,8 +496,6 @@ public interface PersistenceContext {
/**
* Provides access to the entity/EntityEntry combos associated with the persistence context in a manner that
* is safe from reentrant access. Specifically, it is safe from additions/removals while iterating.
- *
- * @return
*/
Map.Entry