This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 7f18004d9aaa3c2a6642788d92946a0a44a084ae Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Feb 21 14:55:34 2026 -0600 Spotless Apply --- .../orm/hibernate/AbstractHibernateDatastore.java | 78 +++++++++------------- .../orm/hibernate/AbstractHibernateSession.java | 6 +- .../cfg/domainbinding/binder/ClassBinder.java | 4 +- .../binder/ClassPropertiesBinder.java | 8 +-- .../cfg/domainbinding/binder/CollectionBinder.java | 10 +-- .../binder/CollectionForPropertyConfigBinder.java | 8 +-- .../cfg/domainbinding/binder/ComponentBinder.java | 1 - .../domainbinding/binder/GrailsDomainBinder.java | 5 +- .../collectionType/BagCollectionType.java | 8 +-- .../collectionType/CollectionHolder.java | 12 +--- .../collectionType/CollectionType.java | 17 ++--- .../secondpass/BidirectionalOneToManyLinker.java | 8 +-- .../secondpass/CollectionKeyColumnUpdater.java | 4 +- .../secondpass/CollectionSecondPassBinder.java | 8 +-- .../secondpass/CollectionWithJoinTableBinder.java | 8 +-- .../cfg/domainbinding/util/BackticksRemover.java | 4 +- .../domainbinding/util/BasicValueIdCreator.java | 16 ++--- .../cfg/domainbinding/util/CascadeBehavior.java | 12 +--- .../domainbinding/util/CascadeBehaviorFetcher.java | 16 ++--- .../listener/AbstractHibernateEventListener.java | 6 +- .../hibernate/support/ClosureEventListener.java | 17 ++--- .../support/ClosureEventTriggeringInterceptor.java | 9 +-- 22 files changed, 85 insertions(+), 180 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java index 8aeb6dc2f8..e05ffd1982 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateDatastore.java @@ -72,47 +72,63 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore /** The config property cache queries. */ public static final String CONFIG_PROPERTY_CACHE_QUERIES = "grails.hibernate.cache.queries"; + /** The config property osiv readonly. */ public static final String CONFIG_PROPERTY_OSIV_READONLY = "grails.hibernate.osiv.readonly"; + /** The config property pass readonly to hibernate. */ public static final String CONFIG_PROPERTY_PASS_READONLY_TO_HIBERNATE = "grails.hibernate.pass.readonly"; + /** The session factory. */ protected final SessionFactory sessionFactory; + /** The connection sources. */ protected final ConnectionSources<SessionFactory, HibernateConnectionSourceSettings> connectionSources; + /** The default flush mode name. */ protected final String defaultFlushModeName; + /** The multi tenant mode. */ protected final MultiTenancySettings.MultiTenancyMode multiTenantMode; + /** The schema handler. */ protected final SchemaHandler schemaHandler; + /** The event triggering interceptor. */ protected AbstractHibernateEventListener eventTriggeringInterceptor; + /** The auto timestamp event listener. */ protected AutoTimestampEventListener autoTimestampEventListener; + /** The osiv read only. */ protected final boolean osivReadOnly; + /** The pass read only to hibernate. */ protected final boolean passReadOnlyToHibernate; + /** The is cache queries. */ protected final boolean isCacheQueries; + /** The default flush mode. */ protected final int defaultFlushMode; + /** The fail on error. */ protected final boolean failOnError; + /** The mark dirty. */ protected final boolean markDirty; + /** The data source name. */ protected final String dataSourceName; + /** The tenant resolver. */ protected final TenantResolver tenantResolver; + private boolean destroyed; - /** - * Creates a new {@link AbstractHibernateDatastore} instance. - */ + /** Creates a new {@link AbstractHibernateDatastore} instance. */ protected AbstractHibernateDatastore( ConnectionSources<SessionFactory, HibernateConnectionSourceSettings> connectionSources, HibernateMappingContext mappingContext) { @@ -146,9 +162,7 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore } } - /** - * Creates a new {@link AbstractHibernateDatastore} instance. - */ + /** Creates a new {@link AbstractHibernateDatastore} instance. */ protected AbstractHibernateDatastore( MappingContext mappingContext, SessionFactory sessionFactory, @@ -187,9 +201,7 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore this.schemaHandler = new DefaultSchemaHandler(); } - /** - * Creates a new {@link AbstractHibernateDatastore} instance. - */ + /** Creates a new {@link AbstractHibernateDatastore} instance. */ public AbstractHibernateDatastore( MappingContext mappingContext, SessionFactory sessionFactory, PropertyResolver config) { this(mappingContext, sessionFactory, config, null, ConnectionSource.DEFAULT); @@ -201,9 +213,7 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore this.mappingContext.setValidatorRegistry(validatorRegistry); } - /** - * Create validator registry. - */ + /** Create validator registry. */ protected ValidatorRegistry createValidatorRegistry(MessageSource messageSource) { return ValidatorRegistries.createValidatorRegistry( mappingContext, @@ -246,9 +256,7 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore */ public abstract AbstractHibernateDatastore getDatastoreForConnection(String connectionName); - /** - * Resolve tenant ids. - */ + /** Resolve tenant ids. */ public Iterable<Serializable> resolveTenantIds() { if (this.tenantResolver instanceof AllTenantsResolver) { return ((AllTenantsResolver) tenantResolver).resolveTenantIds(); @@ -265,16 +273,12 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore } } - /** - * Resolve tenant identifier. - */ + /** Resolve tenant identifier. */ public Serializable resolveTenantIdentifier() throws TenantNotFoundException { return Tenants.currentId(this); } - /** - * Returns whether auto flush. - */ + /** Returns whether auto flush. */ public boolean isAutoFlush() { return defaultFlushMode == FlushMode.AUTO.level; } @@ -293,30 +297,22 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore return defaultFlushModeName; } - /** - * Returns whether fail on error. - */ + /** Returns whether fail on error. */ public boolean isFailOnError() { return failOnError; } - /** - * Returns whether osiv read only. - */ + /** Returns whether osiv read only. */ public boolean isOsivReadOnly() { return osivReadOnly; } - /** - * Returns whether pass read only to hibernate. - */ + /** Returns whether pass read only to hibernate. */ public boolean isPassReadOnlyToHibernate() { return passReadOnlyToHibernate; } - /** - * Returns whether cache queries. - */ + /** Returns whether cache queries. */ public boolean isCacheQueries() { return isCacheQueries; } @@ -398,9 +394,7 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore this.level = level; } - /** - * Gets the level. - */ + /** Gets the level. */ public int getLevel() { return level; } @@ -438,9 +432,7 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore */ public abstract IHibernateTemplate getHibernateTemplate(int flushMode); - /** - * Gets the hibernate template. - */ + /** Gets the hibernate template. */ public IHibernateTemplate getHibernateTemplate() { return getHibernateTemplate(defaultFlushMode); } @@ -456,9 +448,7 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore return getHibernateTemplate().execute(multiTenantCallable); } - /** - * With new session. - */ + /** With new session. */ public <T> T withNewSession(final Closure<T> callable) { Closure<T> multiTenantCallable = prepareMultiTenantClosure(callable); return getHibernateTemplate().executeWithNewSession(multiTenantCallable); @@ -500,9 +490,7 @@ public abstract class AbstractHibernateDatastore extends AbstractDatastore .disableFilter(GormProperties.TENANT_IDENTITY); } - /** - * Prepare multi tenant closure. - */ + /** Prepare multi tenant closure. */ protected <T> Closure<T> prepareMultiTenantClosure(final Closure<T> callable) { final boolean isMultiTenant = getMultiTenancyMode() == MultiTenancySettings.MultiTenancyMode.DISCRIMINATOR; diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java index a21bab5bb6..3ad95b420f 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/AbstractHibernateSession.java @@ -48,14 +48,14 @@ public abstract class AbstractHibernateSession extends AbstractAttributeStoringS /** The datastore. */ protected AbstractHibernateDatastore datastore; + /** The connected. */ protected boolean connected = true; + /** The hibernate template. */ protected IHibernateTemplate hibernateTemplate; - /** - * Creates a new {@link AbstractHibernateSession} instance. - */ + /** Creates a new {@link AbstractHibernateSession} instance. */ protected AbstractHibernateSession( AbstractHibernateDatastore hibernateDatastore, SessionFactory sessionFactory) { datastore = hibernateDatastore; diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassBinder.java index 79093babaf..b21de08b94 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassBinder.java @@ -26,9 +26,7 @@ import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersi import org.hibernate.boot.spi.InFlightMetadataCollector; import org.hibernate.mapping.PersistentClass; -/** - * The class binder class. - */ +/** The class binder class. */ public class ClassBinder { /** diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinder.java index 0d1d68ecc3..9cdf4291f4 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinder.java @@ -39,9 +39,7 @@ public class ClassPropertiesBinder { private final PropertyFromValueCreator propertyFromValueCreator; private final NaturalIdentifierBinder naturalIdentifierBinder; - /** - * Creates a new {@link ClassPropertiesBinder} instance. - */ + /** Creates a new {@link ClassPropertiesBinder} instance. */ public ClassPropertiesBinder( GrailsPropertyBinder grailsPropertyBinder, PropertyFromValueCreator propertyFromValueCreator, @@ -51,9 +49,7 @@ public class ClassPropertiesBinder { this.naturalIdentifierBinder = naturalIdentifierBinder; } - /** - * Creates a new {@link ClassPropertiesBinder} instance. - */ + /** Creates a new {@link ClassPropertiesBinder} instance. */ public ClassPropertiesBinder( GrailsPropertyBinder grailsPropertyBinder, PropertyFromValueCreator propertyFromValueCreator) { diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java index 8c6e9117b9..49ce08aa53 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionBinder.java @@ -74,9 +74,7 @@ public class CollectionBinder { private final UnidirectionalOneToManyBinder unidirectionalOneToManyBinder; private final MapSecondPassBinder mapSecondPassBinder; - /** - * Creates a new {@link CollectionBinder} instance. - */ + /** Creates a new {@link CollectionBinder} instance. */ public CollectionBinder( MetadataBuildingContext metadataBuildingContext, PersistentEntityNamingStrategy namingStrategy, @@ -139,9 +137,7 @@ public class CollectionBinder { simpleValueColumnFetcher); } - /** - * Creates a new {@link CollectionBinder} instance. - */ + /** Creates a new {@link CollectionBinder} instance. */ public CollectionBinder( MetadataBuildingContext metadataBuildingContext, PersistentEntityNamingStrategy namingStrategy, @@ -174,7 +170,7 @@ public class CollectionBinder { * @param owner The owning persistent class * @param mappings The Hibernate mappings instance * @param path The property path - * @return the result + * @return the result */ public Collection bindCollection( HibernateToManyProperty property, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionForPropertyConfigBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionForPropertyConfigBinder.java index b749218d1b..0311b6a903 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionForPropertyConfigBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CollectionForPropertyConfigBinder.java @@ -24,14 +24,10 @@ import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyPrope import org.hibernate.FetchMode; import org.hibernate.mapping.Collection; -/** - * The collection for property config binder class. - */ +/** The collection for property config binder class. */ public class CollectionForPropertyConfigBinder { - /** - * Bind collection for property config. - */ + /** Bind collection for property config. */ public void bindCollectionForPropertyConfig( @Nonnull Collection collection, @Nonnull HibernateToManyProperty property) { collection.setLazy(!FetchMode.JOIN.equals(property.getFetchMode())); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentBinder.java index 2721c5c39b..d4f0aed9ec 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentBinder.java @@ -32,7 +32,6 @@ import org.hibernate.mapping.Table; public class ComponentBinder { - private final MetadataBuildingContext metadataBuildingContext; private final MappingCacheHolder mappingCacheHolder; private final ComponentUpdater componentUpdater; diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java index 38b58c384f..02e7c224c9 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsDomainBinder.java @@ -161,10 +161,7 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon collectionHolder); ComponentUpdater componentUpdater = new ComponentUpdater(propertyFromValueCreator); ComponentBinder componentBinder = - new ComponentBinder( - metadataBuildingContext, - getMappingCacheHolder(), - componentUpdater); + new ComponentBinder(metadataBuildingContext, getMappingCacheHolder(), componentUpdater); GrailsPropertyBinder grailsPropertyBinder = new GrailsPropertyBinder( diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/BagCollectionType.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/BagCollectionType.java index 847c1f3af0..791c7d577c 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/BagCollectionType.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/BagCollectionType.java @@ -22,14 +22,10 @@ import java.util.Collection; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.PersistentClass; -/** - * The bag collection type class. - */ +/** The bag collection type class. */ public class BagCollectionType extends CollectionType { - /** - * Creates a new {@link BagCollectionType} instance. - */ + /** Creates a new {@link BagCollectionType} instance. */ public BagCollectionType(MetadataBuildingContext buildingContext) { super(Collection.class, buildingContext); } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/CollectionHolder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/CollectionHolder.java index 66aa1baa74..5ba0969068 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/CollectionHolder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/CollectionHolder.java @@ -25,14 +25,10 @@ import java.util.Set; import java.util.SortedSet; import org.hibernate.boot.spi.MetadataBuildingContext; -/** - * Collection holder. - */ +/** Collection holder. */ public record CollectionHolder(Map<Class<?>, CollectionType> map) { - /** - * Creates a new {@link CollectionHolder} instance. - */ + /** Creates a new {@link CollectionHolder} instance. */ public CollectionHolder(MetadataBuildingContext buildingContext) { this( Map.ofEntries( @@ -43,9 +39,7 @@ public record CollectionHolder(Map<Class<?>, CollectionType> map) { Map.entry(Map.class, new MapCollectionType(buildingContext)))); } - /** - * Get. - */ + /** Get. */ public CollectionType get(Class<?> collectionClass) { return map.get(collectionClass); } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/CollectionType.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/CollectionType.java index e4c9f00b2c..696a7ef1d7 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/CollectionType.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/collectionType/CollectionType.java @@ -33,17 +33,14 @@ public abstract class CollectionType { /** The clazz. */ protected final Class<?> clazz; + /** The building context. */ protected final MetadataBuildingContext buildingContext; - /** - * Create collection. - */ + /** Create collection. */ public abstract Collection createCollection(PersistentClass owner); - /** - * Create. - */ + /** Create. */ public Collection create(HibernateToManyProperty property, PersistentClass owner) throws MappingException { Collection coll = createCollection(owner); @@ -52,9 +49,7 @@ public abstract class CollectionType { return coll; } - /** - * Creates a new {@link CollectionType} instance. - */ + /** Creates a new {@link CollectionType} instance. */ protected CollectionType(Class<?> clazz, MetadataBuildingContext buildingContext) { this.clazz = clazz; this.buildingContext = buildingContext; @@ -65,9 +60,7 @@ public abstract class CollectionType { return clazz.getName(); } - /** - * Gets the type name. - */ + /** Gets the type name. */ public String getTypeName(HibernateToManyProperty property) { return property.getTypeName(); } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BidirectionalOneToManyLinker.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BidirectionalOneToManyLinker.java index 69100252ed..ddf644da3f 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BidirectionalOneToManyLinker.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/BidirectionalOneToManyLinker.java @@ -30,16 +30,12 @@ public class BidirectionalOneToManyLinker { private final GrailsPropertyResolver grailsPropertyResolver; - /** - * Creates a new {@link BidirectionalOneToManyLinker} instance. - */ + /** Creates a new {@link BidirectionalOneToManyLinker} instance. */ public BidirectionalOneToManyLinker(GrailsPropertyResolver grailsPropertyResolver) { this.grailsPropertyResolver = grailsPropertyResolver; } - /** - * Link. - */ + /** Link. */ public void link( Collection collection, PersistentClass associatedClass, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java index 8318078c08..3f8464438d 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionKeyColumnUpdater.java @@ -26,9 +26,7 @@ import org.hibernate.mapping.DependantValue; /** Forces columns to be nullable and checks if the key is updateable. */ public class CollectionKeyColumnUpdater { - /** - * Force nullable and check updatable. - */ + /** Force nullable and check updatable. */ public void forceNullableAndCheckUpdatable(DependantValue key, HibernateToManyProperty property) { StreamSupport.stream(key.getColumns().spliterator(), false) .filter(Objects::nonNull) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java index 4c0e8de03e..3faf74f779 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinder.java @@ -60,9 +60,7 @@ public class CollectionSecondPassBinder { private final CollectionForPropertyConfigBinder collectionForPropertyConfigBinder; private final SimpleValueColumnBinder simpleValueColumnBinder; - /** - * Creates a new {@link CollectionSecondPassBinder} instance. - */ + /** Creates a new {@link CollectionSecondPassBinder} instance. */ public CollectionSecondPassBinder( ManyToOneBinder manyToOneBinder, PrimaryKeyValueCreator primaryKeyValueCreator, @@ -87,9 +85,7 @@ public class CollectionSecondPassBinder { this.orderByClauseBuilder = new OrderByClauseBuilder(); } - /** - * Bind collection second pass. - */ + /** Bind collection second pass. */ public void bindCollectionSecondPass( @Nonnull HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java index 8a4d7c7813..9b9890a563 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionWithJoinTableBinder.java @@ -51,9 +51,7 @@ public class CollectionWithJoinTableBinder { private final SimpleValueColumnBinder simpleValueColumnBinder; private final ColumnConfigToColumnBinder columnConfigToColumnBinder; - /** - * Creates a new {@link CollectionWithJoinTableBinder} instance. - */ + /** Creates a new {@link CollectionWithJoinTableBinder} instance. */ public CollectionWithJoinTableBinder( MetadataBuildingContext metadataBuildingContext, PersistentEntityNamingStrategy namingStrategy, @@ -75,9 +73,7 @@ public class CollectionWithJoinTableBinder { this.columnConfigToColumnBinder = columnConfigToColumnBinder; } - /** - * Bind collection with join table. - */ + /** Bind collection with join table. */ public void bindCollectionWithJoinTable( @Nonnull HibernateToManyProperty property, @Nonnull InFlightMetadataCollector mappings, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/BackticksRemover.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/BackticksRemover.java index e701efcb3e..7fe51b25dc 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/BackticksRemover.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/BackticksRemover.java @@ -21,9 +21,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.util; import java.util.Optional; import java.util.function.Function; -/** - * The backticks remover class. - */ +/** The backticks remover class. */ public class BackticksRemover implements Function<String, String> { /** The backtick. */ diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/BasicValueIdCreator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/BasicValueIdCreator.java index 1db8c5c088..2c7653f6d8 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/BasicValueIdCreator.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/BasicValueIdCreator.java @@ -28,34 +28,26 @@ import org.hibernate.generator.GeneratorCreationContext; import org.hibernate.mapping.BasicValue; import org.hibernate.mapping.Table; -/** - * The basic value id creator class. - */ +/** The basic value id creator class. */ public class BasicValueIdCreator { private final JdbcEnvironment jdbcEnvironment; private final GrailsSequenceWrapper grailsSequenceWrapper; - /** - * Creates a new {@link BasicValueIdCreator} instance. - */ + /** Creates a new {@link BasicValueIdCreator} instance. */ public BasicValueIdCreator(JdbcEnvironment jdbcEnvironment) { this.jdbcEnvironment = jdbcEnvironment; this.grailsSequenceWrapper = new GrailsSequenceWrapper(); } - /** - * Creates a new {@link BasicValueIdCreator} instance. - */ + /** Creates a new {@link BasicValueIdCreator} instance. */ protected BasicValueIdCreator( JdbcEnvironment jdbcEnvironment, GrailsSequenceWrapper grailsSequenceWrapper) { this.jdbcEnvironment = jdbcEnvironment; this.grailsSequenceWrapper = grailsSequenceWrapper; } - /** - * Gets the basic value id. - */ + /** Gets the basic value id. */ public BasicValue getBasicValueId( MetadataBuildingContext metadataBuildingContext, Table table, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehavior.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehavior.java index d09ef7b40f..57bf2b5eac 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehavior.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehavior.java @@ -21,9 +21,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.util; import java.util.Arrays; import org.hibernate.MappingException; -/** - * The cascade behavior enum. - */ +/** The cascade behavior enum. */ public enum CascadeBehavior { /** Cascades all operations, including delete-orphan. Maps to "all". */ @@ -69,9 +67,7 @@ public enum CascadeBehavior { return value; } - /** - * Returns whether save update. - */ + /** Returns whether save update. */ public boolean isSaveUpdate() { return this == ALL || this == ALL_DELETE_ORPHAN || this == SAVE_UPDATE; } @@ -103,9 +99,7 @@ public enum CascadeBehavior { return cascade.contains(PERSIST.getValue()) && cascade.contains(MERGE.getValue()); } - /** - * From string. - */ + /** From string. */ public static CascadeBehavior fromString(String value) { return Arrays.stream(CascadeBehavior.values()) .filter( diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java index bac1c25860..90df30adda 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CascadeBehaviorFetcher.java @@ -37,32 +37,24 @@ import org.hibernate.MappingException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** - * The cascade behavior fetcher class. - */ +/** The cascade behavior fetcher class. */ public class CascadeBehaviorFetcher { private static final Logger LOG = LoggerFactory.getLogger(CascadeBehaviorFetcher.class); private final LogCascadeMapping logCascadeMapping; - /** - * Creates a new {@link CascadeBehaviorFetcher} instance. - */ + /** Creates a new {@link CascadeBehaviorFetcher} instance. */ public CascadeBehaviorFetcher(LogCascadeMapping logCascadeMapping) { this.logCascadeMapping = logCascadeMapping; } - /** - * Creates a new {@link CascadeBehaviorFetcher} instance. - */ + /** Creates a new {@link CascadeBehaviorFetcher} instance. */ public CascadeBehaviorFetcher() { this(new LogCascadeMapping(LOG)); } - /** - * Gets the cascade behaviour. - */ + /** Gets the cascade behaviour. */ public String getCascadeBehaviour(Association<?> association) { var cascadeStrategy = getDefinedBehavior((GrailsHibernatePersistentProperty) association) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java index b0ba55c52b..f3834a4059 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/event/listener/AbstractHibernateEventListener.java @@ -41,14 +41,14 @@ public abstract class AbstractHibernateEventListener extends AbstractPersistence /** The cached should trigger. */ protected final transient ConcurrentMap<SoftKey<Class<?>>, Boolean> cachedShouldTrigger = new ConcurrentHashMap<SoftKey<Class<?>>, Boolean>(); + /** The fail on error. */ protected final boolean failOnError; + /** The fail on error packages. */ protected final List<?> failOnErrorPackages; - /** - * Creates a new {@link AbstractHibernateEventListener} instance. - */ + /** Creates a new {@link AbstractHibernateEventListener} instance. */ protected AbstractHibernateEventListener(AbstractHibernateDatastore datastore) { super(datastore); HibernateConnectionSourceSettings settings = diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java index 98880db6e3..3eaf7d9949 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventListener.java @@ -77,6 +77,7 @@ public class ClosureEventListener CallbackRegistryConsumer { private static final long serialVersionUID = 1; + /** The log. */ protected static final Logger LOG = LoggerFactory.getLogger(ClosureEventListener.class); @@ -99,9 +100,7 @@ public class ClosureEventListener private Field actionQueueUpdatesField; private Field entityUpdateActionStateField; - /** - * Creates a new {@link ClosureEventListener} instance. - */ + /** Creates a new {@link ClosureEventListener} instance. */ public ClosureEventListener( PersistentEntity persistentEntity, boolean failOnError, List failOnErrorPackages) { this.persistentEntity = persistentEntity; @@ -279,9 +278,7 @@ public class ClosureEventListener }); } - /** - * On pre insert. - */ + /** On pre insert. */ public boolean onPreInsert(final PreInsertEvent event) { return doWithManualSession( event, @@ -304,16 +301,12 @@ public class ClosureEventListener }); } - /** - * On validate. - */ + /** On validate. */ public void onValidate(ValidationEvent event) { beforeValidateEventListener.call(event.getEntityObject(), event.getValidatedFields()); } - /** - * Do validate. - */ + /** Do validate. */ protected boolean doValidate(Object entity) { boolean evict = false; GormValidateable validateable = (GormValidateable) entity; diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java index 915945abab..13242871e3 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/support/ClosureEventTriggeringInterceptor.java @@ -133,24 +133,21 @@ public class ClosureEventTriggeringInterceptor extends AbstractClosureEventTrigg /** The datastore. */ protected AbstractHibernateDatastore datastore; + /** The event publisher. */ protected ConfigurableApplicationEventPublisher eventPublisher; private MappingContext mappingContext; private ProxyHandler proxyHandler; - /** - * Sets the datastore. - */ + /** Sets the datastore. */ public void setDatastore(AbstractHibernateDatastore datastore) { this.datastore = datastore; this.mappingContext = datastore.getMappingContext(); this.proxyHandler = mappingContext.getProxyHandler(); } - /** - * Sets the event publisher. - */ + /** Sets the event publisher. */ public void setEventPublisher(ConfigurableApplicationEventPublisher eventPublisher) { this.eventPublisher = eventPublisher; }
