From aebf9d192f488e3023ec4d253ed313c495d50d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Thu, 2 Apr 2020 17:04:54 +0200 Subject: [PATCH] HHH-13925 Fix invalid javadoc syntax This wasn't detected by checkstyle in Gradle 5, but it is now, and that fails the build. --- .../internal/AbstractEntityInsertAction.java | 4 ++-- .../org/hibernate/annotations/BatchSize.java | 24 +++++++++---------- .../java/org/hibernate/annotations/Sort.java | 2 +- .../InFlightMetadataCollectorImpl.java | 2 +- .../spi/SingularAttributeSourceAny.java | 2 +- .../enhance/spi/CollectionTracker.java | 2 +- .../AbstractPersistentCollection.java | 2 +- .../org/hibernate/dialect/Cache71Dialect.java | 2 +- .../java/org/hibernate/dialect/Dialect.java | 2 +- .../hibernate/dialect/TeradataDialect.java | 2 +- .../event/internal/MergeContext.java | 10 ++++---- .../hibernate/hql/internal/ast/HqlToken.java | 2 +- .../hibernate/internal/CoreMessageLogger.java | 2 +- .../hibernate/internal/util/StringHelper.java | 2 +- .../org/hibernate/jpa/AvailableSettings.java | 4 ++-- .../collection/BasicCollectionLoader.java | 2 +- .../loader/collection/OneToManyLoader.java | 2 +- .../custom/ColumnCollectionAliases.java | 2 +- .../internal/AliasResolutionContextImpl.java | 2 +- .../spi/BidirectionalEntityReference.java | 2 +- .../loader/plan/spi/FetchSource.java | 2 +- .../metamodel/internal/AttributeFactory.java | 2 +- .../internal/predicate/ExistsPredicate.java | 2 +- .../ordering/antlr/TranslationContext.java | 2 +- .../stat/internal/QueryStatisticsImpl.java | 2 +- .../tool/enhance/EnhancementTask.java | 3 ++- .../org/hibernate/osgi/OsgiServiceUtil.java | 6 ++--- .../oracle/criterion/SDOParameterMap.java | 2 +- .../env/ConnectionProviderBuilder.java | 3 ++- .../jpamodelgen/ImportContextImpl.java | 4 ++-- .../jpamodelgen/model/ImportContext.java | 4 ++-- 31 files changed, 53 insertions(+), 53 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java index 02be2cb4d9..05e6d8df1a 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java @@ -68,7 +68,7 @@ public abstract class AbstractEntityInsertAction extends EntityAction { * entity state. * @return the entity state. * - * @see {@link #nullifyTransientReferencesIfNotAlready} + * @see #nullifyTransientReferencesIfNotAlready */ public Object[] getState() { return state; @@ -107,7 +107,7 @@ public abstract class AbstractEntityInsertAction extends EntityAction { * called for a this object, so it can safely be called both when * the entity is made "managed" and when this action is executed. * - * @see {@link #makeEntityManaged() } + * @see #makeEntityManaged() */ protected final void nullifyTransientReferencesIfNotAlready() { if ( ! areTransientReferencesNullified ) { diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java b/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java index 56683f7216..164ddc36ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java @@ -16,20 +16,20 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Defines size for batch loading of collections or lazy entities. For example... - *
- *     @Entity
- *     @BatchSize(size=100)
- *     class Product {
- *         ...
- *     }
- * 
+ *
{@code
+ * @Entity
+ * @BatchSize(size=100)
+ * class Product {
+ *     ...
+ * }
+ * }
* will initialize up to 100 lazy Product entity proxies at a time. * - *
- *     	@OneToMany
- *     	@BatchSize(size = 5) /
- *     	Set getProducts() { ... };
- * 
+ *
{@code
+ * @OneToMany
+ * @BatchSize(size = 5) /
+ * Set getProducts() { ... };
+ * }
* will initialize up to 5 lazy collections of products at a time * * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Sort.java b/hibernate-core/src/main/java/org/hibernate/annotations/Sort.java index 5e700d472a..71d908724a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Sort.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Sort.java @@ -34,7 +34,7 @@ public @interface Sort { /** * Specifies the comparator to use. Only valid when {@link #type} specifies {@link SortType#COMPARATOR}. * - * TODO find a way to use Class -> see HHH-8164 + * TODO find a way to use {@code Class} -> see HHH-8164 */ Class comparator() default void.class; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java index 4a39a48957..7a84f1131e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java @@ -1776,7 +1776,7 @@ public class InFlightMetadataCollectorImpl implements InFlightMetadataCollector *

* See ANN-722 and ANN-730 * - * @param orderedFkSecondPasses The list containing the FkSecondPass instances ready + * @param orderedFkSecondPasses The list containing the FkSecondPass instances ready * for processing. * @param isADependencyOf Our lookup data structure to determine dependencies between tables * @param startTable Table name to start recursive algorithm. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java index 02f0da7a44..c644b62c3a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/SingularAttributeSourceAny.java @@ -7,7 +7,7 @@ package org.hibernate.boot.model.source.spi; /** - * Describes an {@link } mapping + * Describes an {@code } mapping * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java index bf52c8bf07..879950da3d 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/CollectionTracker.java @@ -7,7 +7,7 @@ package org.hibernate.bytecode.enhance.spi; /** - * Interface to be implemented by collection trackers that hold the expected size od collections, a simplified Map. + * Interface to be implemented by collection trackers that hold the expected size od collections, a simplified {@code Map}. * * @author Luis Barreiro */ diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java index 636d9d62e1..56bb0b6c5b 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java @@ -89,7 +89,7 @@ public abstract class AbstractPersistentCollection implements Serializable, Pers } /** - * * @deprecated {@link #AbstractPersistentCollection(SharedSessionContractImplementor)} should be used instead. + * @deprecated {@link #AbstractPersistentCollection(SharedSessionContractImplementor)} should be used instead. */ @Deprecated protected AbstractPersistentCollection(SessionImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java index 1ff25b5c34..8f1dcc4c78 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java @@ -102,7 +102,7 @@ import org.hibernate.type.StandardBasicTypes; * For example, in Hibernate 3.2, typical entries in hibernate.properties would have the following * "name=value" pairs: *

- * + *
* * * 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 d0072caffb..a5dc4fb861 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -2538,7 +2538,7 @@ public abstract class Dialect implements ConversionContext { * Are subselects supported as the left-hand-side (LHS) of * IN-predicates. *

- * In other words, is syntax like "... IN (1, 2, 3) ..." supported? + * In other words, is syntax like {@code ... IN (1, 2, 3) ...} supported? * * @return True if subselects can appear as the LHS of an in-predicate; * false otherwise. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java index 8b485350fe..388436e0c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java @@ -103,7 +103,7 @@ public class TeradataDialect extends Dialect implements IdTableSupport { /** * Does this dialect support the FOR UPDATE syntax? * - * @return empty string ... Teradata does not support FOR UPDATE syntax + * @return empty string ... Teradata does not support FOR UPDATE syntax */ @Override public String getForUpdateString() { 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 dfbecc414e..10cc044b31 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 @@ -73,7 +73,7 @@ import org.jboss.logging.Logger; * The following method is intended to be used by a merge event listener (and other * classes) in the same package to indicate whether the merge operation is being * performed on a merge entity already in the MergeContext: - * {@link MergeContext#setOperatedOn(Object mergeEntity, boolean isOperatedOn) + * {@link MergeContext#setOperatedOn(Object mergeEntity, boolean isOperatedOn)} * * @author Gail Badner */ @@ -149,7 +149,7 @@ public class MergeContext implements Map { * Returns an unmodifiable set view of the merge-to-managed entity cross-references contained in this MergeContext. * @return an unmodifiable set view of the merge-to-managed entity cross-references contained in this MergeContext * - * @see {@link Collections#unmodifiableSet(java.util.Set)} + * @see Collections#unmodifiableSet(java.util.Set) */ public Set entrySet() { return Collections.unmodifiableSet( mergeToManagedEntityXref.entrySet() ); @@ -180,7 +180,7 @@ public class MergeContext implements Map { * Returns an unmodifiable set view of the merge entities contained in this MergeContext * @return an unmodifiable set view of the merge entities contained in this MergeContext * - * @see {@link Collections#unmodifiableSet(java.util.Set)} + * @see Collections#unmodifiableSet(java.util.Set) */ public Set keySet() { return Collections.unmodifiableSet( mergeToManagedEntityXref.keySet() ); @@ -319,7 +319,7 @@ public class MergeContext implements Map { * Returns an unmodifiable Set view of managed entities contained in this MergeContext. * @return an unmodifiable Set view of managed entities contained in this MergeContext * - * @see {@link Collections#unmodifiableSet(java.util.Set)} + * @see Collections#unmodifiableSet(java.util.Set) */ public Collection values() { return Collections.unmodifiableSet( managedToMergeEntityXref.keySet() ); @@ -367,7 +367,7 @@ public class MergeContext implements Map { * * @return an unmodifiable map view of the managed-to-merge entity cross-references. * - * @see {@link Collections#unmodifiableMap(java.util.Map)} + * @see Collections#unmodifiableMap(java.util.Map) */ public Map invertMap() { return Collections.unmodifiableMap( managedToMergeEntityXref ); diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlToken.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlToken.java index 9dd6986149..396f020502 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlToken.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlToken.java @@ -8,7 +8,7 @@ package org.hibernate.hql.internal.ast; /** * A custom token class for the HQL grammar. - *

NOTE: This class must be public because it is instantiated by the ANTLR library. Ignore any suggestions + *

NOTE: This class must be public because it is instantiated by the ANTLR library. Ignore any suggestions * by various code 'analyzers' about this class being package local.

*/ public class HqlToken extends antlr.CommonToken { 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 8b5d212d9a..66853ce218 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -1838,7 +1838,7 @@ public interface CoreMessageLogger extends BasicLogger { @Message(value = "Using @AttributeOverride or @AttributeOverrides in conjunction with entity inheritance is not supported: %s. The overriding definitions are ignored.", id = 499) void unsupportedAttributeOverrideWithEntityInheritance(String entityName); - /** 6.0 message loggers + /* 6.0 message loggers @LogMessage(level = WARN) @Message(value = "The bytecode provider class [%s] could not be loaded", id = 500) void bytecodeProviderClassNotFound(String className); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java index 6b390cd082..87813e414a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java @@ -304,7 +304,7 @@ public final class StringHelper { /** * Collapses a name. Mainly intended for use with classnames, where an example might serve best to explain. * Imagine you have a class named 'org.hibernate.internal.util.StringHelper'; calling collapse on that - * classname will result in 'o.h.u.StringHelper'. + * classname will result in 'o.h.u.StringHelper'. * * @param name The name to collapse. * diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java index a3282b11f3..1bff9be018 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java @@ -283,14 +283,14 @@ public interface AvailableSettings { /** * Caching configuration should follow the following pattern - * hibernate.ejb.classcache. usage[, region] + * {@code hibernate.ejb.classcache. usage[, region]} * where usage is the cache strategy used and region the cache region name */ String CLASS_CACHE_PREFIX = "hibernate.ejb.classcache"; /** * Caching configuration should follow the following pattern - * hibernate.ejb.collectioncache.. usage[, region] + * {@code hibernate.ejb.collectioncache.. usage[, region]} * where usage is the cache strategy used and region the cache region name */ String COLLECTION_CACHE_PREFIX = "hibernate.ejb.collectioncache"; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java index d035198e57..6a9c8fc471 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java @@ -18,7 +18,7 @@ import org.jboss.logging.Logger; /** * Loads a collection of values or a many-to-many association. *
- * The collection persister must implement QueryableCollection. For + * The collection persister must implement QueryableCollection. For * other collections, create a customized subclass of Loader. * * @see OneToManyLoader diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java index 90d1d0cf0f..c7dd991940 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java @@ -18,7 +18,7 @@ import org.jboss.logging.Logger; /** * Loads one-to-many associations
*
- * The collection persister must implement QueryableCollection. For + * The collection persister must implement QueryableCollection. For * other collections, create a customized subclass of Loader. * * @see BasicCollectionLoader diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java index aebaaed61d..f4f30e5902 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java @@ -13,7 +13,7 @@ import org.hibernate.persister.collection.SQLLoadableCollection; /** * CollectionAliases that uses column names instead of generated aliases. - * Aliases can still be overwritten via + * Aliases can still be overwritten via {@code } * * @author Max Rydahl Andersen */ diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AliasResolutionContextImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AliasResolutionContextImpl.java index 08137d3433..0e48b943d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AliasResolutionContextImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AliasResolutionContextImpl.java @@ -154,7 +154,7 @@ public class AliasResolutionContextImpl implements AliasResolutionContext { * query space UID: *
    *
  • - * {@link ##resolveCollectionReferenceAliases(String)} can be used to + * {@link #resolveCollectionReferenceAliases(String)} can be used to * look up the returned collection reference aliases; *
  • *
  • diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/spi/BidirectionalEntityReference.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/spi/BidirectionalEntityReference.java index 23f18d6bb8..ef3e4726cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/plan/spi/BidirectionalEntityReference.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/spi/BidirectionalEntityReference.java @@ -35,7 +35,7 @@ public interface BidirectionalEntityReference extends EntityReference { /** * The query space UID returned using {@link #getQuerySpaceUid()} must - * be the same as returned by {@link #getTargetEntityReference()#getQuerySpaceUid()} + * be the same as returned by {@link #getTargetEntityReference()} * * @return The query space UID. */ diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/spi/FetchSource.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/spi/FetchSource.java index bb4599e94b..235c6a2a06 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/plan/spi/FetchSource.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/spi/FetchSource.java @@ -55,7 +55,7 @@ public interface FetchSource { * * @return the "current" EntityReference or null if none. * . - * @see org.hibernate.loader.plan.spi.Fetch#getSource(). + * @see org.hibernate.loader.plan.spi.Fetch#getSource() */ public EntityReference resolveEntityReference(); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java index 9b4f67a69c..bb3f6b491c 100755 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java @@ -54,7 +54,7 @@ import org.hibernate.type.EntityType; *
  • {@link #buildAttribute normal attributes}
  • *
  • {@link #buildIdAttribute id attributes}
  • *
  • {@link #buildVersionAttribute version attributes}
  • - *
      + *
    * * @author Steve Ebersole * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/ExistsPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/ExistsPredicate.java index 26c7d61cad..bdc70aeac2 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/ExistsPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/predicate/ExistsPredicate.java @@ -15,7 +15,7 @@ import org.hibernate.query.criteria.internal.Renderable; import org.hibernate.query.criteria.internal.compile.RenderingContext; /** - * Models an EXISTS() predicate + * Models an {@code EXISTS()} predicate * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/TranslationContext.java b/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/TranslationContext.java index 15709fe190..9d14fcadf9 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/TranslationContext.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/TranslationContext.java @@ -31,7 +31,7 @@ public interface TranslationContext { public Dialect getDialect(); /** - * Retrieves the SQL function registry/tt> for this context. + * Retrieves the SQL function registry for this context. * * @return The SQL function registry. */ diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java index ea1967f486..fb78dd4975 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java @@ -73,7 +73,7 @@ public class QueryStatisticsImpl implements QueryStatistics { /** * Number of lines returned by all the executions of this query (from DB) * For now, {@link org.hibernate.Query#iterate()} - * and {@link org.hibernate.Query#scroll()()} do not fill this statistic + * and {@link org.hibernate.Query#scroll()} do not fill this statistic * * @return The number of rows cumulatively returned by the given query; iterate * and scroll queries do not effect this total as their number of returned rows diff --git a/hibernate-core/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java b/hibernate-core/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java index cfddf1500b..5a3bc99249 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java @@ -36,7 +36,7 @@ import java.util.List; * Code based on from: * https://github.com/hibernate/hibernate-orm/blob/159bc99a36d86988b61b88ba91eec82cac044e1c/hibernate-core/src/main/java/org/hibernate/tool/enhance/EnhancementTask.java * https://github.com/hibernate/hibernate-orm/blob/159bc99a36d86988b61b88ba91eec82cac044e1c/tooling/hibernate-enhance-maven-plugin/src/main/java/org/hibernate/orm/tooling/maven/MavenEnhancePlugin.java - * + *
    {@code
      * 
      *     
      *         
    @@ -44,6 +44,7 @@ import java.util.List;
      *     
      *     
      * 
    + * }
    * * @author Luis Barreiro * @author Taro App diff --git a/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiServiceUtil.java b/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiServiceUtil.java index a82c059fd6..febdeeb6d9 100644 --- a/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiServiceUtil.java +++ b/hibernate-osgi/src/main/java/org/hibernate/osgi/OsgiServiceUtil.java @@ -38,8 +38,7 @@ public class OsgiServiceUtil implements Stoppable { * {@link ServiceTracker} (best practice, automatically handles a lot of boilerplate and error conditions). * * @param contract The service contract for which to locate implementors - * @param context The OSGi bundle context - * @param T[] The Java type of the service to locate + * @param The Java type of the service to locate * @return All know implementors */ public T[] getServiceImpls(Class contract) { @@ -63,8 +62,7 @@ public class OsgiServiceUtil implements Stoppable { * {@link ServiceTracker#waitForService(long)} * * @param contract The service contract for which to locate implementors - * @param context The OSGi bundle context - * @param T[] The Java type of the service to locate + * @param The Java type of the service to locate * @return All know implementors */ public T getServiceImpl(Class contract) { diff --git a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/SDOParameterMap.java b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/SDOParameterMap.java index fb9b83ca29..ef3fc97d85 100644 --- a/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/SDOParameterMap.java +++ b/hibernate-spatial/src/main/java/org/hibernate/spatial/dialect/oracle/criterion/SDOParameterMap.java @@ -250,7 +250,7 @@ public class SDOParameterMap { /** * Returns all parameters contained in this instance as a quoted String containing - * the = pairs separated by spaces. + * the {@code =} pairs separated by spaces. *

    * The return format is as expected by the various SDO_GEOMETRY spatial functions. * diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java b/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java index 792b30ab6c..8a79359016 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java @@ -160,7 +160,8 @@ public class ConnectionProviderBuilder implements DialectCheck { try { actualConnection.close(); } - catch (SQLException ignore) {} + catch (SQLException ignore) { + } } } diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java index b1ee3dd110..a571597c65 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/ImportContextImpl.java @@ -53,8 +53,8 @@ public class ImportContextImpl implements ImportContext { * Attempts to handle fqcn with array and generics references. *

    * e.g. - * java.util.Collection imports java.util.Collection and returns Collection - * org.marvel.Hulk[] imports org.marvel.Hulk and returns Hulk + * {@code java.util.Collection} imports {@code java.util.Collection} and returns {@code Collection} + * {@code org.marvel.Hulk[]} imports {@code org.marvel.Hulk} and returns {@code Hulk} * * @param fqcn Fully qualified class name * diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java index 771fe1c838..ec565ae750 100644 --- a/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java +++ b/tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/model/ImportContext.java @@ -18,8 +18,8 @@ public interface ImportContext { * Attempts to handle fqcn with array and generics references. *

    * e.g. - * java.util.Collection imports java.util.Collection and returns Collection - * org.marvel.Hulk[] imports org.marvel.Hulk and returns Hulk + * {@code java.util.Collection} imports {@code java.util.Collection} and returns {@code Collection} + * {@code org.marvel.Hulk[]} imports {@code org.marvel.Hulk} and returns {@code Hulk} * * @param fqcn Fully qualified class name of the type to import. *

Property NameProperty Value