This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7-dev in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 97d831e2198b7f4a1fbe753a6db4f41fc458b9f9 Author: Walter Duque de Estrada <[email protected]> AuthorDate: Sat Mar 7 12:33:20 2026 -0600 hibernate7: more Codenarc --- .../hibernate/mapping/MappingBuilder.groovy | 2 +- .../org/grails/orm/hibernate/cfg/JoinTable.groovy | 1 + .../org/grails/orm/hibernate/cfg/Mapping.groovy | 97 +++++++++++----------- .../org/grails/orm/hibernate/cfg/NaturalId.groovy | 2 +- .../grails/orm/hibernate/cfg/PropertyConfig.groovy | 82 +++++++++--------- .../cfg/PropertyDefinitionDelegate.groovy | 23 ++--- .../org/grails/orm/hibernate/cfg/SortConfig.groovy | 1 + .../org/grails/orm/hibernate/cfg/Table.groovy | 1 + 8 files changed, 104 insertions(+), 105 deletions(-) diff --git a/grails-data-hibernate7/core/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy b/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/mapping/MappingBuilder.groovy similarity index 97% rename from grails-data-hibernate7/core/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy rename to grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/mapping/MappingBuilder.groovy index 1c663f48ea..83c82299bc 100644 --- a/grails-data-hibernate7/core/src/main/groovy/grails/orm/hibernate/mapping/MappingBuilder.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/grails/gorm/hibernate/mapping/MappingBuilder.groovy @@ -50,7 +50,7 @@ class MappingBuilder { @Override Mapping build() { - if(mapping == null) { + if (mapping == null) { mapping = Mapping.configureNew(definition) } return mapping diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy index cc08d9bbf9..1f861f156d 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/JoinTable.groovy @@ -31,6 +31,7 @@ import groovy.transform.builder.SimpleStrategy @Builder(builderStrategy = SimpleStrategy, prefix = '') @CompileStatic class JoinTable extends Table { + /** * The foreign key column */ diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy index 80a4d021d1..e4cb7c3d8b 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/Mapping.groovy @@ -49,7 +49,7 @@ class Mapping extends Entity<PropertyConfig> { return null } - return type instanceof Class ? ((Class)type).name : type.toString() + return type instanceof Class ? ((Class) type).name : type.toString() } /** @@ -97,7 +97,6 @@ class Mapping extends Entity<PropertyConfig> { */ HibernateIdentity identity = new Identity() - /** * Caching config */ @@ -139,7 +138,6 @@ class Mapping extends Entity<PropertyConfig> { */ String comment - boolean isJoinedSubclass() { return !tablePerHierarchy && !tablePerConcreteClass } @@ -161,6 +159,7 @@ class Mapping extends Entity<PropertyConfig> { Map<String, PropertyConfig> getPropertyConfigs() { return columns } + /** * Define the table name * @param name The table name @@ -192,6 +191,7 @@ class Mapping extends Entity<PropertyConfig> { Table.configureExisting(table, tableConfig) return this } + /** * Define the identity config * @param identityConfig The id config @@ -199,11 +199,12 @@ class Mapping extends Entity<PropertyConfig> { */ @Override Mapping id(Map identityConfig) { - if(identity instanceof Identity) { - Identity.configureExisting((Identity)identity, identityConfig) + if (identity instanceof Identity) { + Identity.configureExisting((Identity) identity, identityConfig) } return this } + /** * Define the identity config * @param identityConfig The id config @@ -211,8 +212,8 @@ class Mapping extends Entity<PropertyConfig> { */ @Override Mapping id(@DelegatesTo(Identity) Closure identityConfig) { - if(identity instanceof Identity) { - Identity.configureExisting((Identity)identity, identityConfig) + if (identity instanceof Identity) { + Identity.configureExisting((Identity) identity, identityConfig) } return this } @@ -222,7 +223,6 @@ class Mapping extends Entity<PropertyConfig> { * @param identityConfig The id config * @return This mapping */ - Mapping id(CompositeIdentity compositeIdentity) { this.identity = compositeIdentity return this @@ -234,7 +234,7 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ Mapping cache(@DelegatesTo(CacheConfig) Closure cacheConfig) { - if(this.cache == null) { + if (this.cache == null) { this.cache = new CacheConfig() } CacheConfig.configureExisting(cache, cacheConfig) @@ -247,7 +247,7 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ Mapping cache(Map cacheConfig) { - if(this.cache == null) { + if (this.cache == null) { this.cache = new CacheConfig() } CacheConfig.configureExisting(cache, cacheConfig) @@ -260,7 +260,7 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ Mapping cache(String usage) { - if(this.cache == null) { + if (this.cache == null) { this.cache = new CacheConfig() } this.cache.usage = usage @@ -268,7 +268,6 @@ class Mapping extends Entity<PropertyConfig> { return this } - /** * Configures sorting * @param name The name @@ -276,7 +275,7 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ Mapping sort(String name, String direction) { - if(name && direction) { + if (name && direction) { this.sort.name = name this.sort.direction = direction } @@ -290,7 +289,7 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ Mapping sort(Map nameAndDirections) { - if(nameAndDirections) { + if (nameAndDirections) { this.sort.namesAndDirections = nameAndDirections } return this @@ -302,7 +301,7 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ Mapping discriminator(@DelegatesTo(DiscriminatorConfig) Closure discriminatorDef) { - if(discriminator == null) { + if (discriminator == null) { discriminator = new DiscriminatorConfig() } discriminatorDef.setDelegate(discriminator) @@ -317,7 +316,7 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ Mapping discriminator(String value) { - if(discriminator == null) { + if (discriminator == null) { discriminator = new DiscriminatorConfig() } discriminator.value = value @@ -330,28 +329,28 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ Mapping discriminator(Map args) { - if(args != null) { - if(discriminator == null) { + if (args != null) { + if (discriminator == null) { discriminator = new DiscriminatorConfig() } String value = args.remove('value')?.toString() discriminator.value = value if (args.column instanceof String) { - discriminator.column = new ColumnConfig(name:args.column.toString()) + discriminator.column = new ColumnConfig(name: args.column.toString()) } else if (args.column instanceof Map) { ColumnConfig config = new ColumnConfig() DataBinder dataBinder = new DataBinder(config) - dataBinder.bind(new MutablePropertyValues((Map)args.column)) + dataBinder.bind(new MutablePropertyValues((Map) args.column)) discriminator.column = config } discriminator.type(args.remove('type')) - if(args.containsKey('insert')) { - discriminator.insertable( args.remove('insert') as Boolean ) + if (args.containsKey('insert')) { + discriminator.insertable(args.remove('insert') as Boolean) } - if(args.containsKey('insertable')) { - discriminator.insertable( args.remove('insertable') as Boolean ) + if (args.containsKey('insertable')) { + discriminator.insertable(args.remove('insertable') as Boolean) } discriminator.formula(args.remove('formula')?.toString()) } @@ -363,9 +362,9 @@ class Mapping extends Entity<PropertyConfig> { * @param propertyNames * @return */ - CompositeIdentity composite(String...propertyNames) { + CompositeIdentity composite(String... propertyNames) { identity = new CompositeIdentity(propertyNames: propertyNames) - return (CompositeIdentity)identity + return (CompositeIdentity) identity } /** @@ -403,11 +402,10 @@ class Mapping extends Entity<PropertyConfig> { @CompileStatic Mapping version(String versionColumn) { PropertyConfig pc = getOrInitializePropertyConfig(GormProperties.VERSION) - pc.columns << new ColumnConfig(name:versionColumn) + pc.columns << new ColumnConfig(name: versionColumn) return this } - /** * Configure a property * @param name The name of the property @@ -442,7 +440,7 @@ class Mapping extends Entity<PropertyConfig> { */ @Override PropertyConfig property(@DelegatesTo(PropertyConfig) Closure propertyConfig) { - if(columns.containsKey('*')) { + if (columns.containsKey('*')) { PropertyConfig cloned = cloneGlobalConstraint() return PropertyConfig.configureExisting(cloned, propertyConfig) } @@ -461,6 +459,7 @@ class Mapping extends Entity<PropertyConfig> { Entity version(@DelegatesTo(PropertyConfig) Closure versionConfig) { return super.version(versionConfig) } + /** * Configure a new property * @param name The name of the property @@ -468,8 +467,8 @@ class Mapping extends Entity<PropertyConfig> { * @return This mapping */ @Override - PropertyConfig property( Map propertyConfig) { - if(columns.containsKey('*')) { + PropertyConfig property(Map propertyConfig) { + if (columns.containsKey('*')) { // apply global constraints constraints PropertyConfig cloned = cloneGlobalConstraint() return PropertyConfig.configureExisting(cloned, propertyConfig) @@ -518,11 +517,11 @@ class Mapping extends Entity<PropertyConfig> { @Override def propertyMissing(String name, Object val) { - if(val instanceof Closure) { - property(name, (Closure)val) + if (val instanceof Closure) { + property(name, (Closure) val) } - else if(val instanceof PropertyConfig) { - columns[name] =((PropertyConfig)val) + else if (val instanceof PropertyConfig) { + columns[name] = ((PropertyConfig) val) } else { throw new MissingPropertyException(name, Mapping) @@ -531,21 +530,21 @@ class Mapping extends Entity<PropertyConfig> { @Override def methodMissing(String name, Object args) { - if(args && args.getClass().isArray()) { + if (args && args.getClass().isArray()) { Object[] argsArray = (Object[]) args - if(argsArray[0] instanceof Closure) { - property(name, (Closure)argsArray[0]) + if (argsArray[0] instanceof Closure) { + property(name, (Closure) argsArray[0]) } - else if(argsArray[0] instanceof PropertyConfig) { - columns[name] = (PropertyConfig)argsArray[0] + else if (argsArray[0] instanceof PropertyConfig) { + columns[name] = (PropertyConfig) argsArray[0] } - else if(argsArray[0] instanceof Map) { + else if (argsArray[0] instanceof Map) { PropertyConfig property = getOrInitializePropertyConfig(name) Map namedArgs = (Map) argsArray[0] - if(argsArray[argsArray.length - 1] instanceof Closure) { + if (argsArray[argsArray.length - 1] instanceof Closure) { PropertyConfig.configureExisting( property, - ((Closure)argsArray[argsArray.length - 1]) + ((Closure) argsArray[argsArray.length - 1]) ) } PropertyConfig.configureExisting(property, namedArgs) @@ -562,12 +561,12 @@ class Mapping extends Entity<PropertyConfig> { @Override protected PropertyConfig getOrInitializePropertyConfig(String name) { PropertyConfig pc = columns[name] - if(pc == null && columns.containsKey('*')) { + if (pc == null && columns.containsKey('*')) { // apply global constraints constraints PropertyConfig globalConstraints = columns.get('*') - if(globalConstraints != null) { - pc = (PropertyConfig)globalConstraints.clone() - if(pc.columns.size() == 1) { + if (globalConstraints != null) { + pc = (PropertyConfig) globalConstraints.clone() + if (pc.columns.size() == 1) { pc.firstColumnIsColumnCopy = true } } @@ -594,6 +593,6 @@ class Mapping extends Entity<PropertyConfig> { } boolean hasCompositeIdentifier() { - return identity instanceof CompositeIdentity - } + return identity instanceof CompositeIdentity + } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy index dbc8ffdf04..9e73d9d1a2 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/NaturalId.groovy @@ -18,7 +18,6 @@ package org.grails.orm.hibernate.cfg import groovy.transform.CompileStatic import groovy.transform.builder.Builder import groovy.transform.builder.SimpleStrategy -import org.grails.orm.hibernate.cfg.domainbinding.util.UniqueNameGenerator import org.hibernate.mapping.PersistentClass import org.hibernate.mapping.UniqueKey @@ -29,6 +28,7 @@ import org.hibernate.mapping.UniqueKey @CompileStatic @Builder(builderStrategy = SimpleStrategy, prefix = '') class NaturalId { + /** * The property names that make up the natural id */ diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy index fcd5adc14e..5803d5ed3c 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyConfig.groovy @@ -45,7 +45,7 @@ class PropertyConfig extends Property { // Whether the first column is created from cloning this instance boolean firstColumnIsColumnCopy = false - boolean explicitSaveUpdateCascade; + boolean explicitSaveUpdateCascade /** * The Hibernate type or user type of the property. This can be @@ -64,7 +64,6 @@ class PropertyConfig extends Property { */ String sort - /** * The default sort order */ @@ -75,7 +74,6 @@ class PropertyConfig extends Property { */ Integer batchSize - /** * Whether to ignore ObjectNotFoundException */ @@ -96,7 +94,7 @@ class PropertyConfig extends Property { * * @deprecated Use {@link #getUpdatable()} instead */ - @Deprecated(since = "7.0", forRemoval = true) + @Deprecated(since = '7.0', forRemoval = true) boolean getUpdateable() { return updatable } @@ -106,7 +104,7 @@ class PropertyConfig extends Property { * * @deprecated Use {@code updatable} instead */ - @Deprecated(since = "7.0", forRemoval = true) + @Deprecated(since = '7.0', forRemoval = true) void setUpdateable(boolean updateable) { this.updatable = updateable } @@ -122,12 +120,12 @@ class PropertyConfig extends Property { * @return This property config */ PropertyConfig column(@DelegatesTo(ColumnConfig) Closure columnDef) { - if(columns.size() == 1 && firstColumnIsColumnCopy) { + if (columns.size() == 1 && firstColumnIsColumnCopy) { firstColumnIsColumnCopy = false ColumnConfig.configureExisting(columns[0], columnDef) } else { - columns.add( ColumnConfig.configureNew(columnDef) ) + columns.add(ColumnConfig.configureNew(columnDef)) } return this } @@ -137,13 +135,13 @@ class PropertyConfig extends Property { * @param columnDef The column definition * @return This property config */ - PropertyConfig column( Map columnDef ) { - if(columns.size() == 1 && firstColumnIsColumnCopy) { + PropertyConfig column(Map columnDef) { + if (columns.size() == 1 && firstColumnIsColumnCopy) { firstColumnIsColumnCopy = false ColumnConfig.configureExisting(columns[0], columnDef) } else { - columns.add( ColumnConfig.configureNew(columnDef) ) + columns.add(ColumnConfig.configureNew(columnDef)) } return this } @@ -153,13 +151,13 @@ class PropertyConfig extends Property { * @param columnDef The column definition * @return This property config */ - PropertyConfig column( String columnDef ) { - if(columns.size() == 1 && firstColumnIsColumnCopy) { + PropertyConfig column(String columnDef) { + if (columns.size() == 1 && firstColumnIsColumnCopy) { firstColumnIsColumnCopy = false columns[0].name = columnDef } else { - columns.add( ColumnConfig.configureNew(name: columnDef) ) + columns.add(ColumnConfig.configureNew(name: columnDef)) } return this } @@ -174,7 +172,7 @@ class PropertyConfig extends Property { * @return This mapping */ PropertyConfig cache(@DelegatesTo(CacheConfig) Closure cacheConfig) { - if(this.cache == null) { + if (this.cache == null) { this.cache = new CacheConfig() } CacheConfig.configureExisting(cache, cacheConfig) @@ -187,7 +185,7 @@ class PropertyConfig extends Property { * @return This mapping */ PropertyConfig cache(Map cacheConfig) { - if(this.cache == null) { + if (this.cache == null) { this.cache = new CacheConfig() } CacheConfig.configureExisting(cache, cacheConfig) @@ -222,7 +220,7 @@ class PropertyConfig extends Property { @Override void setUnique(boolean unique) { super.setUnique(unique) - if(columns.size() == 1) { + if (columns.size() == 1) { columns[0].unique = unique } } @@ -232,10 +230,10 @@ class PropertyConfig extends Property { PropertyConfig joinTable(Map joinTableDef) { DataBinder dataBinder = new DataBinder(joinTable) dataBinder.bind(new MutablePropertyValues(joinTableDef)) - if(joinTableDef.key) { + if (joinTableDef.key) { joinTable.key(joinTableDef.key.toString()) } - if(joinTableDef.column) { + if (joinTableDef.column) { joinTable.column(joinTableDef.column.toString()) } return this @@ -245,7 +243,7 @@ class PropertyConfig extends Property { * @param fetch The Hibernate {@link FetchMode} */ void setFetch(FetchMode fetch) { - if(FetchMode.JOIN.equals(fetch)) { + if (FetchMode.JOIN.equals(fetch)) { super.setFetchStrategy(FetchType.EAGER) } else { @@ -258,7 +256,7 @@ class PropertyConfig extends Property { */ FetchMode getFetchMode() { FetchType strategy = super.getFetchStrategy() - if(strategy == null) { + if (strategy == null) { return FetchMode.DEFAULT } switch (strategy) { @@ -294,7 +292,6 @@ class PropertyConfig extends Property { return configureExisting(property, config) } - /** * Configures a new PropertyConfig instance * @@ -322,9 +319,9 @@ class PropertyConfig extends Property { } else { cc = new ColumnConfig() - property.columns.add cc + property.columns.add(cc) } - if(config.column) { + if (config.column) { config.name = config.column } ColumnConfig.configureExisting(cc, config) @@ -351,13 +348,13 @@ class PropertyConfig extends Property { */ String getColumn() { checkHasSingleColumn() - if(columns.isEmpty()) return null + if (columns.isEmpty()) return null return columns[0].name } String getEnumType() { checkHasSingleColumn() - if(columns.isEmpty()) return "default" + if (columns.isEmpty()) return 'default' return columns[0].enumType } @@ -368,7 +365,7 @@ class PropertyConfig extends Property { */ String getSqlType() { checkHasSingleColumn() - if(columns.isEmpty()) return null + if (columns.isEmpty()) return null return columns[0].sqlType } @@ -379,7 +376,7 @@ class PropertyConfig extends Property { */ String getIndexName() { checkHasSingleColumn() - if(columns.isEmpty()) return null + if (columns.isEmpty()) return null return columns[0].index?.toString() } @@ -390,11 +387,11 @@ class PropertyConfig extends Property { * column. */ boolean isUnique() { - if(columns.size()>1) { + if (columns.size() > 1) { return super.isUnique() } else { - if(columns.isEmpty()) return super.isUnique() + if (columns.isEmpty()) return super.isUnique() return columns[0].unique } } @@ -406,7 +403,7 @@ class PropertyConfig extends Property { */ int getLength() { checkHasSingleColumn() - if(columns.isEmpty()) return -1 + if (columns.isEmpty()) return -1 return columns[0].length } @@ -417,7 +414,7 @@ class PropertyConfig extends Property { */ int getPrecision() { checkHasSingleColumn() - if(columns.isEmpty()) return -1 + if (columns.isEmpty()) return -1 return columns[0].precision } @@ -428,7 +425,7 @@ class PropertyConfig extends Property { */ int getScale() { checkHasSingleColumn() - if(columns.isEmpty()) { + if (columns.isEmpty()) { return super.getScale() } return columns[0].scale @@ -437,15 +434,14 @@ class PropertyConfig extends Property { /** * @return The type name */ - String getTypeName() { - return type?.with { it instanceof Class ? it.name : it.toString() }; + String getTypeName() { + return type?.with { it instanceof Class ? it.name : it.toString() } } - @Override void setScale(int scale) { checkHasSingleColumn() - if(!columns.isEmpty()) { + if (!columns.isEmpty()) { columns[0].scale = scale } else { @@ -459,32 +455,32 @@ class PropertyConfig extends Property { protected void checkHasSingleColumn() { if (columns?.size() > 1) { - throw new RuntimeException("Cannot treat multi-column property as a single-column property") + throw new RuntimeException('Cannot treat multi-column property as a single-column property') } } @Override PropertyConfig clone() throws CloneNotSupportedException { - PropertyConfig pc = (PropertyConfig)super.clone() + PropertyConfig pc = (PropertyConfig) super.clone() pc.fetch = fetchMode - pc.indexColumn = indexColumn != null ? (PropertyConfig)indexColumn.clone() : null + pc.indexColumn = indexColumn != null ? (PropertyConfig) indexColumn.clone() : null pc.cache = cache != null ? cache.clone() : cache pc.joinTable = joinTable.clone() - if(typeParams != null) { + if (typeParams != null) { pc.typeParams = new Properties(typeParams) } List newColumns = new ArrayList<ColumnConfig>(columns.size()) pc.columns = newColumns - for(c in columns) { + for (c in columns) { newColumns.add(c.clone()) } return pc } - public boolean hasJoinKeyMapping() { - return Optional.ofNullable(getJoinTable()).map(JoinTable::getKey).isPresent(); + boolean hasJoinKeyMapping() { + joinTable?.key != null } } diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy index e28c19fb18..c08abc656b 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PropertyDefinitionDelegate.groovy @@ -16,6 +16,7 @@ import org.grails.datastore.mapping.model.DatastoreConfigurationException */ @CompileStatic class PropertyDefinitionDelegate { + PropertyConfig config private int index = 0 @@ -26,13 +27,13 @@ class PropertyDefinitionDelegate { ColumnConfig column(Map args) { // Check that this column has a name - if (!args["name"]) { - throw new DatastoreConfigurationException("Column definition must have a name!") + if (!args['name']) { + throw new DatastoreConfigurationException('Column definition must have a name!') } // Create a new column configuration based on the mapping for this column. ColumnConfig column - if(index < config.columns.size()) { + if (index < config.columns.size()) { // configure existing column = config.columns[0] } @@ -41,14 +42,14 @@ class PropertyDefinitionDelegate { // Append the new column configuration to the property config. config.columns << column } - column.name = args["name"] - column.sqlType = args["sqlType"] - column.enumType = args["enumType"] ?: column.enumType - column.index = args["index"] - column.unique = args["unique"] ?: false - column.length = args["length"] ? args["length"] as Integer : -1 - column.precision = args["precision"] ? args["precision"] as Integer : -1 - column.scale = args["scale"] ? args["scale"] as Integer : -1 + column.name = args['name'] + column.sqlType = args['sqlType'] + column.enumType = args['enumType'] ?: column.enumType + column.index = args['index'] + column.unique = args['unique'] ?: false + column.length = args['length'] ? args['length'] as Integer : -1 + column.precision = args['precision'] ? args['precision'] as Integer : -1 + column.scale = args['scale'] ? args['scale'] as Integer : -1 index++ return column diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy index 683b57dc7e..145bf297cb 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/SortConfig.groovy @@ -25,6 +25,7 @@ import groovy.transform.builder.SimpleStrategy @CompileStatic @Builder(builderStrategy = SimpleStrategy, prefix = '') class SortConfig { + /** * The property to sort bu */ diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy index 2afc1a7753..f1cd8ed0d2 100644 --- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy +++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/Table.groovy @@ -30,6 +30,7 @@ import org.springframework.validation.DataBinder @Builder(builderStrategy = SimpleStrategy, prefix = '') @CompileStatic class Table { + /** * The table name */
