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 918eccedb048b0e875a690c882735cb448961092 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Fri Feb 27 13:51:21 2026 -0600 spotlessApply --- .../binder/ConfiguredDiscriminatorBinder.java | 19 ++++++++----------- .../binder/DefaultDiscriminatorBinder.java | 6 +----- .../binder/DiscriminatorPropertyBinder.java | 6 ------ .../cfg/domainbinding/binder/GrailsDomainBinder.java | 8 ++------ .../grails/orm/hibernate/query/JpaFromProvider.java | 7 ++++++- 5 files changed, 17 insertions(+), 29 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ConfiguredDiscriminatorBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ConfiguredDiscriminatorBinder.java index 6e0e5efa28..4fe99129ce 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ConfiguredDiscriminatorBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ConfiguredDiscriminatorBinder.java @@ -48,7 +48,8 @@ public class ConfiguredDiscriminatorBinder { * @param discriminator The discriminator value to configure * @param config The discriminator configuration */ - public void bindConfiguredDiscriminator(RootClass entity, SimpleValue discriminator, DiscriminatorConfig config) { + public void bindConfiguredDiscriminator( + RootClass entity, SimpleValue discriminator, DiscriminatorConfig config) { // Set discriminator value entity.setDiscriminatorValue(config.getValue()); @@ -73,25 +74,21 @@ public class ConfiguredDiscriminatorBinder { return STRING_TYPE; } - return (type instanceof Class) - ? ((Class<?>) type).getName() - : type.toString(); + return (type instanceof Class) ? ((Class<?>) type).getName() : type.toString(); } - private void bindDiscriminatorWithFormula(SimpleValue discriminator, String typeName, String formula) { + private void bindDiscriminatorWithFormula( + SimpleValue discriminator, String typeName, String formula) { discriminator.setTypeName(typeName); Formula f = new Formula(); f.setFormula(formula); discriminator.addFormula(f); } - private void bindDiscriminatorWithColumn(SimpleValue discriminator, String typeName, ColumnConfig columnConfig) { + private void bindDiscriminatorWithColumn( + SimpleValue discriminator, String typeName, ColumnConfig columnConfig) { simpleValueColumnBinder.bindSimpleValue( - discriminator, - typeName, - JPA_DEFAULT_DISCRIMINATOR_TYPE, - false - ); + discriminator, typeName, JPA_DEFAULT_DISCRIMINATOR_TYPE, false); if (columnConfig != null) { configureDiscriminatorColumn(discriminator, columnConfig); diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/DefaultDiscriminatorBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/DefaultDiscriminatorBinder.java index 0906979bbb..d24245cf23 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/DefaultDiscriminatorBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/DefaultDiscriminatorBinder.java @@ -45,10 +45,6 @@ public class DefaultDiscriminatorBinder { // Bind with default column configuration simpleValueColumnBinder.bindSimpleValue( - discriminator, - STRING_TYPE, - JPA_DEFAULT_DISCRIMINATOR_TYPE, - false - ); + discriminator, STRING_TYPE, JPA_DEFAULT_DISCRIMINATOR_TYPE, false); } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/DiscriminatorPropertyBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/DiscriminatorPropertyBinder.java index b6305a0ddb..e5d7f654bd 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/DiscriminatorPropertyBinder.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/DiscriminatorPropertyBinder.java @@ -18,19 +18,13 @@ */ package org.grails.orm.hibernate.cfg.domainbinding.binder; -import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder.JPA_DEFAULT_DISCRIMINATOR_TYPE; - -import org.grails.orm.hibernate.cfg.ColumnConfig; import org.grails.orm.hibernate.cfg.DiscriminatorConfig; import org.grails.orm.hibernate.cfg.Mapping; import org.grails.orm.hibernate.cfg.MappingCacheHolder; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.BasicValue; -import org.hibernate.mapping.Column; -import org.hibernate.mapping.Formula; import org.hibernate.mapping.RootClass; import org.hibernate.mapping.SimpleValue; -import org.hibernate.mapping.Table; @SuppressWarnings("PMD.DataflowAnomalyAnalysis") public class DiscriminatorPropertyBinder { 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 4cc1b9eaf8..6128ead4c7 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 @@ -225,12 +225,8 @@ public class GrailsDomainBinder implements AdditionalMappingContributor, TypeCon metadataBuildingContext, mappingCacheHolder, new ConfiguredDiscriminatorBinder( - new SimpleValueColumnBinder(), - new ColumnConfigToColumnBinder() - ), - new DefaultDiscriminatorBinder( - new SimpleValueColumnBinder() - )); + new SimpleValueColumnBinder(), new ColumnConfigToColumnBinder()), + new DefaultDiscriminatorBinder(new SimpleValueColumnBinder())); RootBinder rootBinder = new RootBinder( dataSourceName, diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java index ee864bd360..4e07eeb37a 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/query/JpaFromProvider.java @@ -35,7 +35,12 @@ import java.util.stream.Stream; import org.grails.datastore.gorm.query.criteria.DetachedAssociationCriteria; import org.hibernate.query.criteria.JpaCriteriaQuery; -@SuppressWarnings({"PMD.DataflowAnomalyAnalysis", "PMD.ProperCloneImplementation", "PMD.CloneMethodReturnTypeMustMatchClassName", "PMD.CloneThrowsCloneNotSupportedException"}) +@SuppressWarnings({ + "PMD.DataflowAnomalyAnalysis", + "PMD.ProperCloneImplementation", + "PMD.CloneMethodReturnTypeMustMatchClassName", + "PMD.CloneThrowsCloneNotSupportedException" +}) public class JpaFromProvider implements Cloneable { private static final int SINGLE_PROPERTY = 1;
