You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/02/25 19:31:43 UTC
(grails-core) 03/04: rename to HibernatePersistentProperty
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 b50e3cd441065c966e1ac5e8ab5c7794a778b7b2
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Feb 25 13:12:21 2026 -0600
rename to HibernatePersistentProperty
---
.../orm/hibernate/cfg/CompositeIdentity.groovy | 8 ++---
.../cfg/PersistentEntityNamingStrategy.java | 4 +--
.../binder/ClassPropertiesBinder.java | 4 +--
.../cfg/domainbinding/binder/CollectionBinder.java | 5 ++-
.../cfg/domainbinding/binder/ColumnBinder.java | 6 ++--
.../cfg/domainbinding/binder/ComponentBinder.java | 4 +--
.../cfg/domainbinding/binder/ComponentUpdater.java | 6 ++--
.../domainbinding/binder/CompositeIdBinder.java | 8 ++---
.../CompositeIdentifierToManyToOneBinder.java | 8 ++---
.../cfg/domainbinding/binder/EnumTypeBinder.java | 6 ++--
.../domainbinding/binder/GrailsPropertyBinder.java | 6 ++--
.../cfg/domainbinding/binder/ManyToOneBinder.java | 1 -
.../cfg/domainbinding/binder/OneToOneBinder.java | 6 ++--
.../cfg/domainbinding/binder/PropertyBinder.java | 4 +--
.../cfg/domainbinding/binder/SimpleIdBinder.java | 4 +--
.../domainbinding/binder/SimpleValueBinder.java | 12 +++----
.../cfg/domainbinding/binder/VersionBinder.java | 4 +--
.../hibernate/GrailsHibernatePersistentEntity.java | 26 +++++++--------
.../hibernate/HibernateAssociation.java | 6 ++--
.../hibernate/HibernateCustomProperty.java | 2 +-
.../HibernateEmbeddedPersistentEntity.java | 10 +++---
.../hibernate/HibernateEmbeddedProperty.java | 2 +-
.../hibernate/HibernateIdentityProperty.java | 2 +-
.../hibernate/HibernatePersistentEntity.java | 16 ++++-----
...perty.java => HibernatePersistentProperty.java} | 7 ++--
.../hibernate/HibernateSimpleProperty.java | 2 +-
.../hibernate/HibernateTenantIdProperty.java | 2 +-
.../secondpass/BidirectionalOneToManyLinker.java | 4 +--
.../secondpass/CollectionSecondPassBinder.java | 7 ++--
.../domainbinding/util/CascadeBehaviorFetcher.java | 6 ++--
.../util/ColumnNameForPropertyAndPathFetcher.java | 4 +--
.../cfg/domainbinding/util/CreateKeyForProps.java | 8 ++---
.../util/DefaultColumnNameFetcher.java | 4 +--
.../domainbinding/util/NamingStrategyWrapper.java | 6 ++--
.../util/PropertyFromValueCreator.java | 4 +--
.../domainbinding/util/TableForManyCalculator.java | 4 +--
.../orm/hibernate/cfg/CompositeIdentitySpec.groovy | 10 +++---
.../cfg/GrailsHibernatePersistentEntitySpec.groovy | 4 +--
.../GrailsHibernatePersistentPropertySpec.groovy | 38 +++++++++++-----------
.../cfg/domainbinding/CollectionBinderSpec.groovy | 4 +--
.../cfg/domainbinding/ColumnBinderSpec.groovy | 10 +++---
.../ColumnNameForPropertyAndPathFetcherSpec.groovy | 8 ++---
.../cfg/domainbinding/ComponentBinderSpec.groovy | 6 ++--
.../cfg/domainbinding/CompositeIdBinderSpec.groovy | 18 +++++-----
...CompositeIdentifierToManyToOneBinderSpec.groovy | 20 ++++++------
.../cfg/domainbinding/CreateKeyForPropsSpec.groovy | 12 +++----
.../cfg/domainbinding/EnumTypeBinderSpec.groovy | 4 +--
.../ForeignKeyColumnCountCalculatorSpec.groovy | 4 +--
.../domainbinding/GrailsPropertyBinderSpec.groovy | 22 ++++++-------
.../cfg/domainbinding/IdentityBinderSpec.groovy | 12 +++----
.../cfg/domainbinding/ManyToOneBinderSpec.groovy | 8 ++---
.../domainbinding/NamingStrategyWrapperSpec.groovy | 4 +--
.../cfg/domainbinding/OneToOneBinderSpec.groovy | 14 ++++----
.../cfg/domainbinding/PropertyBinderSpec.groovy | 10 +++---
.../PropertyFromValueCreatorSpec.groovy | 6 ++--
.../cfg/domainbinding/SimpleIdBinderSpec.groovy | 12 +++----
.../cfg/domainbinding/SimpleValueBinderSpec.groovy | 18 +++++-----
.../TableForManyCalculatorSpec.groovy | 18 +++++-----
.../cfg/domainbinding/VersionBinderSpec.groovy | 4 +--
.../binder/ClassPropertiesBinderSpec.groovy | 6 ++--
.../binder/ComponentUpdaterSpec.groovy | 10 +++---
.../CollectionSecondPassBinderSpec.groovy | 6 ++--
.../secondpass/ListSecondPassBinderSpec.groovy | 4 +--
.../secondpass/MapSecondPassBinderSpec.groovy | 4 +--
.../liquibase/GormColumnSnapshotGenerator.groovy | 6 ++--
65 files changed, 258 insertions(+), 262 deletions(-)
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy
index e33d628913..6d70451131 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/CompositeIdentity.groovy
@@ -21,7 +21,7 @@ import groovy.transform.builder.Builder
import groovy.transform.builder.SimpleStrategy
import org.grails.datastore.mapping.config.Property
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateIdentity
import org.hibernate.MappingException
@@ -65,9 +65,9 @@ class CompositeIdentity extends Property implements HibernateIdentity {
* @param domainClass The domain class
* @return The hibernate properties for the composite identity
*/
- GrailsHibernatePersistentProperty[] getHibernateProperties(GrailsHibernatePersistentEntity domainClass) {
- GrailsHibernatePersistentProperty[] composite = propertyNames ?
- propertyNames.collect { domainClass.getPropertyByName(it) as GrailsHibernatePersistentProperty } as GrailsHibernatePersistentProperty[] :
+ HibernatePersistentProperty[] getHibernateProperties(GrailsHibernatePersistentEntity domainClass) {
+ HibernatePersistentProperty[] composite = propertyNames ?
+ propertyNames.collect { domainClass.getPropertyByName(it) as HibernatePersistentProperty } as HibernatePersistentProperty[] :
domainClass.compositeIdentity
if (!composite) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java
index 6a9672e41b..6c92604c61 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/PersistentEntityNamingStrategy.java
@@ -19,7 +19,7 @@
package org.grails.orm.hibernate.cfg;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
/**
* Allows plugging into to custom naming strategies
@@ -37,5 +37,5 @@ public interface PersistentEntityNamingStrategy {
String resolveTableName(String logicalName);
- String resolveForeignKeyForPropertyDomainClass(GrailsHibernatePersistentProperty property);
+ String resolveForeignKeyForPropertyDomainClass(HibernatePersistentProperty property);
}
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 9cdf4291f4..5cc614051d 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
@@ -20,7 +20,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder;
import jakarta.annotation.Nonnull;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.util.PropertyFromValueCreator;
import org.hibernate.boot.spi.InFlightMetadataCollector;
import org.hibernate.mapping.PersistentClass;
@@ -71,7 +71,7 @@ public class ClassPropertiesBinder {
persistentClass.getTable().setComment(domainClass.getMappedForm().getComment());
Table table = persistentClass.getTable();
- for (GrailsHibernatePersistentProperty currentGrailsProp :
+ for (HibernatePersistentProperty currentGrailsProp :
domainClass.getPersistentPropertiesToBind()) {
Value value =
grailsPropertyBinder.bindProperty(
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 a1f64484ee..e02a7b0557 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
@@ -25,7 +25,7 @@ import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
import org.grails.orm.hibernate.cfg.PropertyConfig;
import org.grails.orm.hibernate.cfg.domainbinding.collectionType.CollectionHolder;
import org.grails.orm.hibernate.cfg.domainbinding.collectionType.CollectionType;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToManyProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyProperty;
import org.grails.orm.hibernate.cfg.domainbinding.secondpass.BidirectionalOneToManyLinker;
@@ -42,7 +42,6 @@ import org.grails.orm.hibernate.cfg.domainbinding.secondpass.SetSecondPass;
import org.grails.orm.hibernate.cfg.domainbinding.secondpass.UnidirectionalOneToManyBinder;
import org.grails.orm.hibernate.cfg.domainbinding.secondpass.UnidirectionalOneToManyInverseValuesBinder;
import org.grails.orm.hibernate.cfg.domainbinding.util.CascadeBehavior;
-import org.grails.orm.hibernate.cfg.domainbinding.util.ColumnNameForPropertyAndPathFetcher;
import org.grails.orm.hibernate.cfg.domainbinding.util.DefaultColumnNameFetcher;
import org.grails.orm.hibernate.cfg.domainbinding.util.GrailsPropertyResolver;
import org.grails.orm.hibernate.cfg.domainbinding.util.NamespaceNameExtractor;
@@ -203,7 +202,7 @@ public class CollectionBinder {
}
private String getNameForPropertyAndPath(
- GrailsHibernatePersistentProperty property, String path) {
+ HibernatePersistentProperty property, String path) {
if (GrailsHibernateUtil.isNotEmpty(path)) {
return GrailsHibernateUtil.qualify(path, property.getName());
}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
index 14f9f9aaf5..03b83c64d2 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ColumnBinder.java
@@ -24,7 +24,7 @@ import org.grails.orm.hibernate.cfg.ColumnConfig;
import org.grails.orm.hibernate.cfg.Mapping;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
import org.grails.orm.hibernate.cfg.PropertyConfig;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToOneProperty;
import org.grails.orm.hibernate.cfg.domainbinding.util.BackticksRemover;
@@ -94,8 +94,8 @@ public class ColumnBinder {
* @param table The table name
*/
public void bindColumn(
- GrailsHibernatePersistentProperty property,
- GrailsHibernatePersistentProperty parentProperty,
+ HibernatePersistentProperty property,
+ HibernatePersistentProperty parentProperty,
Column column,
ColumnConfig cc,
String path,
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 d4f0aed9ec..d3e5c1a850 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
@@ -22,7 +22,7 @@ import jakarta.annotation.Nonnull;
import org.grails.orm.hibernate.cfg.GrailsHibernateUtil;
import org.grails.orm.hibernate.cfg.MappingCacheHolder;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateEmbeddedProperty;
import org.hibernate.boot.spi.InFlightMetadataCollector;
import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -75,7 +75,7 @@ public class ComponentBinder {
.getHibernateParentProperty(propertyType)
.ifPresent(p -> component.setParentProperty(p.getName()));
- for (GrailsHibernatePersistentProperty peerProperty :
+ for (HibernatePersistentProperty peerProperty :
domainClass.getHibernatePersistentProperties(propertyType)) {
var value =
grailsPropertyBinder.bindProperty(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
index fd4e486e46..66bbb44fc9 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdater.java
@@ -20,7 +20,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder;
import java.util.Iterator;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.util.PropertyFromValueCreator;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
@@ -37,8 +37,8 @@ public class ComponentUpdater {
public void updateComponent(
Component component,
- GrailsHibernatePersistentProperty componentProperty,
- GrailsHibernatePersistentProperty currentGrailsProp,
+ HibernatePersistentProperty componentProperty,
+ HibernatePersistentProperty currentGrailsProp,
Value value) {
Property persistentProperty = propertyFromValueCreator.createProperty(value, currentGrailsProp);
component.addProperty(persistentProperty);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdBinder.java
index 2d3b7be25f..f72a742c01 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdBinder.java
@@ -22,7 +22,7 @@ import jakarta.annotation.Nonnull;
import org.grails.orm.hibernate.cfg.CompositeIdentity;
import org.grails.orm.hibernate.cfg.GrailsHibernateUtil;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.hibernate.boot.spi.InFlightMetadataCollector;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.mapping.Component;
@@ -64,11 +64,11 @@ public class CompositeIdBinder {
if (compositeIdentity == null) {
compositeIdentity = new CompositeIdentity();
}
- GrailsHibernatePersistentProperty[] composite =
+ HibernatePersistentProperty[] composite =
compositeIdentity.getHibernateProperties(domainClass);
- GrailsHibernatePersistentProperty identifierProp = domainClass.getIdentity();
- for (GrailsHibernatePersistentProperty property : composite) {
+ HibernatePersistentProperty identifierProp = domainClass.getIdentity();
+ for (HibernatePersistentProperty property : composite) {
var value =
grailsPropertyBinder.bindProperty(
root, root.getTable(), "", identifierProp, property, mappings);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdentifierToManyToOneBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdentifierToManyToOneBinder.java
index 570f3d0d16..621bc0148e 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdentifierToManyToOneBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/CompositeIdentifierToManyToOneBinder.java
@@ -28,7 +28,7 @@ import org.grails.orm.hibernate.cfg.ColumnConfig;
import org.grails.orm.hibernate.cfg.CompositeIdentity;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.util.BackticksRemover;
import org.grails.orm.hibernate.cfg.domainbinding.util.DefaultColumnNameFetcher;
import org.grails.orm.hibernate.cfg.domainbinding.util.ForeignKeyColumnCountCalculator;
@@ -69,7 +69,7 @@ public class CompositeIdentifierToManyToOneBinder {
}
public void bindCompositeIdentifierToManyToOne(
- GrailsHibernatePersistentProperty property,
+ HibernatePersistentProperty property,
SimpleValue value,
CompositeIdentity compositeId,
PersistentEntity refDomainClass,
@@ -116,7 +116,7 @@ public class CompositeIdentifierToManyToOneBinder {
backticksRemover.apply(prefix) + UNDERSCORE + backticksRemover.apply(string);
String suffix =
- cip instanceof GrailsHibernatePersistentProperty ghpp
+ cip instanceof HibernatePersistentProperty ghpp
? defaultColumnNameFetcher.getDefaultColumnName(ghpp)
: cip.getName();
String finalColumnName =
@@ -132,7 +132,7 @@ public class CompositeIdentifierToManyToOneBinder {
}
String suffix =
- referencedProperty instanceof GrailsHibernatePersistentProperty ghpp
+ referencedProperty instanceof HibernatePersistentProperty ghpp
? defaultColumnNameFetcher.getDefaultColumnName(ghpp)
: referencedProperty.getName();
String finalColumnName =
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/EnumTypeBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/EnumTypeBinder.java
index af71339c5b..57be014322 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/EnumTypeBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/EnumTypeBinder.java
@@ -25,7 +25,7 @@ import java.util.Properties;
import org.grails.orm.hibernate.cfg.ColumnConfig;
import org.grails.orm.hibernate.cfg.IdentityEnumType;
import org.grails.orm.hibernate.cfg.PropertyConfig;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.util.ColumnNameForPropertyAndPathFetcher;
import org.grails.orm.hibernate.cfg.domainbinding.util.GrailsEnumType;
import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -66,7 +66,7 @@ public class EnumTypeBinder {
private static final Logger LOG = LoggerFactory.getLogger(EnumTypeBinder.class);
public BasicValue bindEnumType(
- GrailsHibernatePersistentProperty property, Class<?> propertyType, Table table, String path) {
+ HibernatePersistentProperty property, Class<?> propertyType, Table table, String path) {
BasicValue simpleValue = new BasicValue(metadataBuildingContext, table);
String columnName =
columnNameForPropertyAndPathFetcher.getColumnNameForPropertyAndPath(property, path, null);
@@ -75,7 +75,7 @@ public class EnumTypeBinder {
}
public void bindEnumType(
- GrailsHibernatePersistentProperty property,
+ HibernatePersistentProperty property,
Class<?> propertyType,
BasicValue simpleValue,
String columnName) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsPropertyBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsPropertyBinder.java
index 522729047e..5120179b3c 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsPropertyBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/GrailsPropertyBinder.java
@@ -19,7 +19,7 @@
package org.grails.orm.hibernate.cfg.domainbinding.binder;
import jakarta.annotation.Nonnull;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateEmbeddedProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToOneProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToOneProperty;
@@ -63,8 +63,8 @@ public class GrailsPropertyBinder {
PersistentClass persistentClass,
Table table,
String path,
- GrailsHibernatePersistentProperty parentProperty,
- @Nonnull GrailsHibernatePersistentProperty currentGrailsProp,
+ HibernatePersistentProperty parentProperty,
+ @Nonnull HibernatePersistentProperty currentGrailsProp,
@Nonnull InFlightMetadataCollector mappings) {
if (LOG.isDebugEnabled()) {
LOG.debug(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneBinder.java
index 9e7638def4..3643f8dfb6 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ManyToOneBinder.java
@@ -27,7 +27,6 @@ import org.grails.orm.hibernate.cfg.Mapping;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
import org.grails.orm.hibernate.cfg.PropertyConfig;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateAssociation;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToOneProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/OneToOneBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/OneToOneBinder.java
index 93b2df2f18..555ea3cba8 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/OneToOneBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/OneToOneBinder.java
@@ -21,7 +21,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder;
import org.grails.datastore.mapping.model.types.Association;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
import org.grails.orm.hibernate.cfg.PropertyConfig;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.hibernate.FetchMode;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
@@ -56,7 +56,7 @@ public class OneToOneBinder {
org.hibernate.mapping.Table table,
String path) {
OneToOne oneToOne = new OneToOne(metadataBuildingContext, table, owner);
- PropertyConfig config = ((GrailsHibernatePersistentProperty) property).getMappedForm();
+ PropertyConfig config = ((HibernatePersistentProperty) property).getMappedForm();
final Association otherSide = property.getInverseSide();
final boolean hasOne = otherSide != null && otherSide.isHasOne();
@@ -80,7 +80,7 @@ public class OneToOneBinder {
if (hasOne || otherSide == null) {
simpleValueBinder.bindSimpleValue(
- (GrailsHibernatePersistentProperty) property, null, oneToOne, path);
+ (HibernatePersistentProperty) property, null, oneToOne, path);
} else {
oneToOne.setReferencedPropertyName(otherSide.getName());
}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/PropertyBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/PropertyBinder.java
index 29fa22ccf5..4a1f93fa61 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/PropertyBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/PropertyBinder.java
@@ -24,7 +24,7 @@ import org.grails.datastore.mapping.model.types.Association;
import org.grails.datastore.mapping.reflect.EntityReflector;
import org.grails.orm.hibernate.access.TraitPropertyAccessStrategy;
import org.grails.orm.hibernate.cfg.PropertyConfig;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateAssociation;
import org.grails.orm.hibernate.cfg.domainbinding.util.CascadeBehaviorFetcher;
import org.hibernate.boot.spi.AccessType;
@@ -51,7 +51,7 @@ public class PropertyBinder {
* @param value The Hibernate value
* @return The Hibernate property
*/
- public Property bindProperty(GrailsHibernatePersistentProperty persistentProperty, Value value) {
+ public Property bindProperty(HibernatePersistentProperty persistentProperty, Value value) {
var prop = new Property();
prop.setValue(value);
// set the property name
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleIdBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleIdBinder.java
index e4c2934711..7346e12022 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleIdBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleIdBinder.java
@@ -24,7 +24,7 @@ import jakarta.annotation.Nonnull;
import org.grails.orm.hibernate.cfg.Identity;
import org.grails.orm.hibernate.cfg.Mapping;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.util.BasicValueIdCreator;
import org.hibernate.MappingException;
import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -76,7 +76,7 @@ public class SimpleIdBinder {
String propertyName = mappedId.getName();
if (propertyName != null && !propertyName.equals(domainClass.getName())) {
var namedIdentityProp =
- (GrailsHibernatePersistentProperty) domainClass.getPropertyByName(propertyName);
+ (HibernatePersistentProperty) domainClass.getPropertyByName(propertyName);
if (namedIdentityProp == null) {
throw new MappingException(
"Mapping specifies an identifier property name that doesn't exist ["
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleValueBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleValueBinder.java
index 71735e7910..ee408daeb8 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleValueBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/SimpleValueBinder.java
@@ -25,7 +25,7 @@ import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
import org.grails.orm.hibernate.cfg.PropertyConfig;
import org.grails.orm.hibernate.cfg.domainbinding.generator.GrailsSequenceWrapper;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
import org.hibernate.generator.Generator;
@@ -86,8 +86,8 @@ public class SimpleValueBinder {
}
public BasicValue bindSimpleValue(
- @jakarta.annotation.Nonnull GrailsHibernatePersistentProperty property,
- GrailsHibernatePersistentProperty parentProperty,
+ @jakarta.annotation.Nonnull HibernatePersistentProperty property,
+ HibernatePersistentProperty parentProperty,
Table table,
String path) {
BasicValue basicValue = new BasicValue(metadataBuildingContext, table);
@@ -96,8 +96,8 @@ public class SimpleValueBinder {
}
public void bindSimpleValue(
- @jakarta.annotation.Nonnull GrailsHibernatePersistentProperty property,
- GrailsHibernatePersistentProperty parentProperty,
+ @jakarta.annotation.Nonnull HibernatePersistentProperty property,
+ HibernatePersistentProperty parentProperty,
SimpleValue simpleValue,
String path) {
@@ -138,7 +138,7 @@ public class SimpleValueBinder {
}
private Generator createGenerator(
- GrailsHibernatePersistentProperty property,
+ HibernatePersistentProperty property,
GeneratorCreationContext context,
String generatorName) {
return grailsSequenceWrapper.getGenerator(
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/VersionBinder.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/VersionBinder.java
index 55689f3b11..fc6455c721 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/VersionBinder.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/VersionBinder.java
@@ -22,7 +22,7 @@ import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBind
import java.util.function.BiFunction;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.engine.OptimisticLockStyle;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
@@ -60,7 +60,7 @@ public class VersionBinder {
BasicValue::new);
}
- public void bindVersion(GrailsHibernatePersistentProperty version, RootClass entity) {
+ public void bindVersion(HibernatePersistentProperty version, RootClass entity) {
if (version != null) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentEntity.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentEntity.java
index 2da99353ed..f7314cdff5 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentEntity.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentEntity.java
@@ -92,10 +92,10 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity {
}
@Override
- GrailsHibernatePersistentProperty getIdentity();
+ HibernatePersistentProperty getIdentity();
@Override
- GrailsHibernatePersistentProperty[] getCompositeIdentity();
+ HibernatePersistentProperty[] getCompositeIdentity();
default Optional<CompositeIdentity> getHibernateCompositeIdentity() {
return Optional.ofNullable(getMappedForm())
@@ -125,8 +125,8 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity {
/**
* @return The properties that should be bound to the Hibernate meta model
*/
- default List<GrailsHibernatePersistentProperty> getPersistentPropertiesToBind() {
- List<GrailsHibernatePersistentProperty> properties = getHibernatePersistentProperties();
+ default List<HibernatePersistentProperty> getPersistentPropertiesToBind() {
+ List<HibernatePersistentProperty> properties = getHibernatePersistentProperties();
if (properties == null) {
return java.util.Collections.emptyList();
}
@@ -141,15 +141,15 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity {
}
@Override
- GrailsHibernatePersistentProperty getVersion();
+ HibernatePersistentProperty getVersion();
/**
* @param parentType The type of the parent entity
* @return The parent property if it exists
*/
- default Optional<GrailsHibernatePersistentProperty> getHibernateParentProperty(
+ default Optional<HibernatePersistentProperty> getHibernateParentProperty(
Class<?> parentType) {
- List<GrailsHibernatePersistentProperty> properties = getHibernatePersistentProperties();
+ List<HibernatePersistentProperty> properties = getHibernatePersistentProperties();
if (properties == null) {
return Optional.empty();
}
@@ -163,9 +163,9 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity {
* @param parentType The type of the parent entity to exclude from the results
* @return The properties that should be bound to the Hibernate meta model
*/
- default List<GrailsHibernatePersistentProperty> getHibernatePersistentProperties(
+ default List<HibernatePersistentProperty> getHibernatePersistentProperties(
Class<?> parentType) {
- List<GrailsHibernatePersistentProperty> properties = getHibernatePersistentProperties();
+ List<HibernatePersistentProperty> properties = getHibernatePersistentProperties();
if (properties == null) {
return java.util.Collections.emptyList();
}
@@ -207,7 +207,7 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity {
return Optional.ofNullable(getTenantId())
.map(
tenantId ->
- tenantId instanceof GrailsHibernatePersistentProperty ghpp
+ tenantId instanceof HibernatePersistentProperty ghpp
? fetcher.getDefaultColumnName(ghpp)
: tenantId.getName())
.map(defaultColumnName -> ":tenantId = " + defaultColumnName)
@@ -258,12 +258,12 @@ public interface GrailsHibernatePersistentEntity extends PersistentEntity {
: discriminatorConfig.getFormula();
}
- default List<GrailsHibernatePersistentProperty> getHibernatePersistentProperties() {
+ default List<HibernatePersistentProperty> getHibernatePersistentProperties() {
var properties =
new java.util.ArrayList<>(
getPersistentProperties().stream()
- .filter(GrailsHibernatePersistentProperty.class::isInstance)
- .map(GrailsHibernatePersistentProperty.class::cast)
+ .filter(HibernatePersistentProperty.class::isInstance)
+ .map(HibernatePersistentProperty.class::cast)
.toList());
properties.sort(
(p1, p2) -> {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateAssociation.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateAssociation.java
index ef21dbacc6..20412448a1 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateAssociation.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateAssociation.java
@@ -28,7 +28,7 @@ import org.grails.orm.hibernate.cfg.PropertyConfig;
/**
* Common interface for all Hibernate association properties (both ToOne and ToMany). Extends
- * {@link GrailsHibernatePersistentProperty} and declares the key {@link
+ * {@link HibernatePersistentProperty} and declares the key {@link
* org.grails.datastore.mapping.model.types.Association} methods directly so callers can use them
* without casting. Note: {@code Association} is an abstract class so cannot be listed as a
* super-interface; the implementing classes satisfy these contracts through their class hierarchy.
@@ -36,7 +36,7 @@ import org.grails.orm.hibernate.cfg.PropertyConfig;
* @see HibernateToOneProperty
* @see HibernateToManyProperty
*/
-public interface HibernateAssociation extends GrailsHibernatePersistentProperty {
+public interface HibernateAssociation extends HibernatePersistentProperty {
// --- Association contract (satisfied by the class hierarchy of all implementors) ---
@@ -83,6 +83,6 @@ public interface HibernateAssociation extends GrailsHibernatePersistentProperty
if (propertyType == getType() && getHibernateAssociatedEntity() != null) {
return null;
}
- return GrailsHibernatePersistentProperty.super.getTypeName(propertyType, config, mapping);
+ return HibernatePersistentProperty.super.getTypeName(propertyType, config, mapping);
}
}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomProperty.java
index 85c290ad42..d7fd715dd9 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateCustomProperty.java
@@ -27,7 +27,7 @@ import org.grails.orm.hibernate.cfg.PropertyConfig;
/** Hibernate implementation of {@link org.grails.datastore.mapping.model.types.Custom} */
public class HibernateCustomProperty extends CustomWithMapping<PropertyConfig>
- implements GrailsHibernatePersistentProperty {
+ implements HibernatePersistentProperty {
public HibernateCustomProperty(
PersistentEntity entity,
MappingContext context,
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
index e220f138a3..0ba078cd5a 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedPersistentEntity.java
@@ -42,18 +42,18 @@ public class HibernateEmbeddedPersistentEntity extends EmbeddedPersistentEntity<
}
@Override
- public GrailsHibernatePersistentProperty getIdentity() {
- return super.getIdentity() instanceof GrailsHibernatePersistentProperty ghpp ? ghpp : null;
+ public HibernatePersistentProperty getIdentity() {
+ return super.getIdentity() instanceof HibernatePersistentProperty ghpp ? ghpp : null;
}
@Override
- public GrailsHibernatePersistentProperty[] getCompositeIdentity() {
+ public HibernatePersistentProperty[] getCompositeIdentity() {
return null;
}
@Override
- public GrailsHibernatePersistentProperty getVersion() {
- return super.getVersion() instanceof GrailsHibernatePersistentProperty ghpp ? ghpp : null;
+ public HibernatePersistentProperty getVersion() {
+ return super.getVersion() instanceof HibernatePersistentProperty ghpp ? ghpp : null;
}
@Override
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedProperty.java
index 62d2ac378e..c057a2ac0b 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateEmbeddedProperty.java
@@ -26,7 +26,7 @@ import org.grails.orm.hibernate.cfg.PropertyConfig;
/** Hibernate implementation of {@link org.grails.datastore.mapping.model.types.Embedded} */
public class HibernateEmbeddedProperty extends EmbeddedWithMapping<PropertyConfig>
- implements GrailsHibernatePersistentProperty {
+ implements HibernatePersistentProperty {
public HibernateEmbeddedProperty(
PersistentEntity entity, MappingContext context, PropertyDescriptor property) {
super(entity, context, property);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateIdentityProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateIdentityProperty.java
index aa9f7f11f6..f418a63c59 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateIdentityProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateIdentityProperty.java
@@ -26,7 +26,7 @@ import org.grails.orm.hibernate.cfg.PropertyConfig;
/** Hibernate implementation of {@link org.grails.datastore.mapping.model.types.Identity} */
public class HibernateIdentityProperty extends IdentityWithMapping<PropertyConfig>
- implements GrailsHibernatePersistentProperty {
+ implements HibernatePersistentProperty {
public HibernateIdentityProperty(
PersistentEntity entity, MappingContext context, PropertyDescriptor property) {
super(entity, context, property);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntity.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntity.java
index cb28111049..4b85db4ad2 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntity.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentEntity.java
@@ -66,21 +66,21 @@ public class HibernatePersistentEntity extends AbstractPersistentEntity<Mapping>
}
@Override
- public GrailsHibernatePersistentProperty getIdentity() {
- return identity instanceof GrailsHibernatePersistentProperty ghpp ? ghpp : null;
+ public HibernatePersistentProperty getIdentity() {
+ return identity instanceof HibernatePersistentProperty ghpp ? ghpp : null;
}
@Override
- public GrailsHibernatePersistentProperty[] getCompositeIdentity() {
+ public HibernatePersistentProperty[] getCompositeIdentity() {
PersistentProperty[] compositeIdentity = super.getCompositeIdentity();
if (compositeIdentity == null) {
return null;
}
- GrailsHibernatePersistentProperty[] result =
- new GrailsHibernatePersistentProperty[compositeIdentity.length];
+ HibernatePersistentProperty[] result =
+ new HibernatePersistentProperty[compositeIdentity.length];
for (int i = 0; i < compositeIdentity.length; i++) {
result[i] =
- compositeIdentity[i] instanceof GrailsHibernatePersistentProperty ghpp ? ghpp : null;
+ compositeIdentity[i] instanceof HibernatePersistentProperty ghpp ? ghpp : null;
}
return result;
}
@@ -98,7 +98,7 @@ public class HibernatePersistentEntity extends AbstractPersistentEntity<Mapping>
}
@Override
- public GrailsHibernatePersistentProperty getVersion() {
- return version instanceof GrailsHibernatePersistentProperty ghpp ? ghpp : null;
+ public HibernatePersistentProperty getVersion() {
+ return version instanceof HibernatePersistentProperty ghpp ? ghpp : null;
}
}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentProperty.java
similarity index 95%
rename from grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentProperty.java
rename to grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentProperty.java
index 3063d09c06..a83ea7e2dc 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/GrailsHibernatePersistentProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernatePersistentProperty.java
@@ -25,7 +25,6 @@ import org.grails.datastore.mapping.model.PersistentProperty;
import org.grails.datastore.mapping.model.types.Association;
import org.grails.datastore.mapping.model.types.Embedded;
import org.grails.orm.hibernate.cfg.ColumnConfig;
-import org.grails.orm.hibernate.cfg.JoinTable;
import org.grails.orm.hibernate.cfg.Mapping;
import org.grails.orm.hibernate.cfg.PropertyConfig;
import org.hibernate.MappingException;
@@ -35,7 +34,7 @@ import org.hibernate.mapping.SimpleValue;
import org.hibernate.usertype.UserCollectionType;
/** Interface for Hibernate persistent properties */
-public interface GrailsHibernatePersistentProperty extends PersistentProperty<PropertyConfig> {
+public interface HibernatePersistentProperty extends PersistentProperty<PropertyConfig> {
default boolean isBidirectionalManyToOneWithListMapping(Property prop) {
return false;
@@ -178,7 +177,7 @@ public interface GrailsHibernatePersistentProperty extends PersistentProperty<Pr
default String getColumnName(ColumnConfig cc) {
return Optional.of(this)
- .filter(GrailsHibernatePersistentProperty::isJoinKeyMapped)
+ .filter(HibernatePersistentProperty::isJoinKeyMapped)
.map(p -> p.getMappedForm().getJoinTable().getKey().getName())
.orElseGet(
() ->
@@ -212,7 +211,7 @@ public interface GrailsHibernatePersistentProperty extends PersistentProperty<Pr
* @param simpleValue The Hibernate simple value
* @return The property that defines the type
*/
- default GrailsHibernatePersistentProperty getTypeProperty(SimpleValue simpleValue) {
+ default HibernatePersistentProperty getTypeProperty(SimpleValue simpleValue) {
if (simpleValue instanceof DependantValue) {
return Optional.ofNullable(getHibernateOwner().getIdentity()).orElse(this);
}
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleProperty.java
index 4ae9321860..134b3c1896 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateSimpleProperty.java
@@ -26,7 +26,7 @@ import org.grails.orm.hibernate.cfg.PropertyConfig;
/** Hibernate implementation of {@link org.grails.datastore.mapping.model.types.Simple} */
public class HibernateSimpleProperty extends SimpleWithMapping<PropertyConfig>
- implements GrailsHibernatePersistentProperty {
+ implements HibernatePersistentProperty {
public HibernateSimpleProperty(
PersistentEntity entity, MappingContext context, PropertyDescriptor property) {
super(entity, context, property);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateTenantIdProperty.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateTenantIdProperty.java
index 1ab4607e76..f5033c9d09 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateTenantIdProperty.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/hibernate/HibernateTenantIdProperty.java
@@ -26,7 +26,7 @@ import org.grails.orm.hibernate.cfg.PropertyConfig;
/** Hibernate implementation of {@link org.grails.datastore.mapping.model.types.TenantId} */
public class HibernateTenantIdProperty extends TenantIdWithMapping<PropertyConfig>
- implements GrailsHibernatePersistentProperty {
+ implements HibernatePersistentProperty {
public HibernateTenantIdProperty(
PersistentEntity entity, MappingContext context, PropertyDescriptor property) {
super(entity, context, property);
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 ddf644da3f..13259c7ea6 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
@@ -18,7 +18,7 @@
*/
package org.grails.orm.hibernate.cfg.domainbinding.secondpass;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.util.GrailsPropertyResolver;
import org.hibernate.mapping.Collection;
import org.hibernate.mapping.Column;
@@ -40,7 +40,7 @@ public class BidirectionalOneToManyLinker {
Collection collection,
PersistentClass associatedClass,
DependantValue key,
- GrailsHibernatePersistentProperty otherSide) {
+ HibernatePersistentProperty otherSide) {
collection.setInverse(true);
for (Column column :
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 d73ebead18..6b223e08a1 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
@@ -26,11 +26,10 @@ import java.util.Map;
import java.util.Set;
import org.grails.datastore.mapping.model.DatastoreConfigurationException;
import org.grails.datastore.mapping.model.config.GormProperties;
-import org.grails.datastore.mapping.model.types.Association;
import org.grails.orm.hibernate.cfg.domainbinding.binder.CollectionForPropertyConfigBinder;
import org.grails.orm.hibernate.cfg.domainbinding.binder.ManyToOneBinder;
import org.grails.orm.hibernate.cfg.domainbinding.binder.SimpleValueColumnBinder;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToManyProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyProperty;
@@ -207,8 +206,8 @@ public class CollectionSecondPassBinder {
+ property.getName()
+ "] are not supported with unidirectional one to many relationships.");
}
- GrailsHibernatePersistentProperty sortBy =
- (GrailsHibernatePersistentProperty)
+ HibernatePersistentProperty sortBy =
+ (HibernatePersistentProperty)
referenced.getPropertyByName(property.getSort());
String order = Optional.ofNullable(property.getOrder()).orElse("asc");
collection.setOrderBy(
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 90df30adda..f3d7845391 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
@@ -28,7 +28,7 @@ import org.grails.datastore.mapping.model.types.Embedded;
import org.grails.orm.hibernate.cfg.Mapping;
import org.grails.orm.hibernate.cfg.PropertyConfig;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToOneProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToManyProperty;
@@ -57,14 +57,14 @@ public class CascadeBehaviorFetcher {
/** Gets the cascade behaviour. */
public String getCascadeBehaviour(Association<?> association) {
var cascadeStrategy =
- getDefinedBehavior((GrailsHibernatePersistentProperty) association)
+ getDefinedBehavior((HibernatePersistentProperty) association)
.orElse(getImpliedBehavior(association));
logCascadeMapping.logCascadeMapping(association, cascadeStrategy);
return cascadeStrategy.getValue();
}
private Optional<CascadeBehavior> getDefinedBehavior(
- GrailsHibernatePersistentProperty grailsProperty) {
+ HibernatePersistentProperty grailsProperty) {
return Optional.ofNullable(grailsProperty.getMappedForm())
.map(PropertyConfig::getCascade)
.map(CascadeBehavior::fromString);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ColumnNameForPropertyAndPathFetcher.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ColumnNameForPropertyAndPathFetcher.java
index e0fde7a372..618c98ec19 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ColumnNameForPropertyAndPathFetcher.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/ColumnNameForPropertyAndPathFetcher.java
@@ -22,7 +22,7 @@ import java.util.Optional;
import org.grails.orm.hibernate.cfg.ColumnConfig;
import org.grails.orm.hibernate.cfg.GrailsHibernateUtil;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
public class ColumnNameForPropertyAndPathFetcher {
private final PersistentEntityNamingStrategy namingStrategy;
@@ -41,7 +41,7 @@ public class ColumnNameForPropertyAndPathFetcher {
private static final String UNDERSCORE = "_";
public String getColumnNameForPropertyAndPath(
- GrailsHibernatePersistentProperty grailsProp, String path, ColumnConfig cc) {
+ HibernatePersistentProperty grailsProp, String path, ColumnConfig cc) {
return Optional.ofNullable(grailsProp.getColumnName(cc))
.orElseGet(
() -> {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CreateKeyForProps.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CreateKeyForProps.java
index 7dbea9b9cd..f8ae071c9c 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CreateKeyForProps.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/CreateKeyForProps.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.List;
import org.grails.datastore.mapping.model.PersistentEntity;
import org.grails.orm.hibernate.cfg.PropertyConfig;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.hibernate.MappingException;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Table;
@@ -47,7 +47,7 @@ public class CreateKeyForProps {
}
public void createKeyForProps(
- GrailsHibernatePersistentProperty grailsProp, String path, Table table, String columnName) {
+ HibernatePersistentProperty grailsProp, String path, Table table, String columnName) {
PropertyConfig mappedForm = grailsProp.getMappedForm();
if (mappedForm.isUnique() && mappedForm.isUniqueWithinGroup()) {
@@ -58,8 +58,8 @@ public class CreateKeyForProps {
PersistentEntity owner = grailsProp.getOwner();
for (Iterator<?> i = propertyNames.iterator(); i.hasNext(); ) {
String propertyName = (String) i.next();
- GrailsHibernatePersistentProperty otherProp =
- (GrailsHibernatePersistentProperty) owner.getPropertyByName(propertyName);
+ HibernatePersistentProperty otherProp =
+ (HibernatePersistentProperty) owner.getPropertyByName(propertyName);
if (otherProp == null) {
throw new MappingException(
owner.getJavaClass().getName() + " references an unknown property " + propertyName);
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/DefaultColumnNameFetcher.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/DefaultColumnNameFetcher.java
index a47ea95024..0b195d2e62 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/DefaultColumnNameFetcher.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/DefaultColumnNameFetcher.java
@@ -21,7 +21,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.util;
import org.grails.datastore.mapping.model.types.Association;
import org.grails.datastore.mapping.model.types.Basic;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateOneToManyProperty;
@@ -44,7 +44,7 @@ public class DefaultColumnNameFetcher {
this.backticksRemover = backticksRemover;
}
- public String getDefaultColumnName(GrailsHibernatePersistentProperty property) {
+ public String getDefaultColumnName(HibernatePersistentProperty property) {
String columnName = namingStrategyWrapper.resolveColumnName(property.getName());
if (property instanceof Association) {
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java
index 03f6d0c274..817b25a36f 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/NamingStrategyWrapper.java
@@ -25,7 +25,7 @@ import java.util.Optional;
import org.grails.datastore.mapping.reflect.NameUtils;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
@@ -85,9 +85,9 @@ public class NamingStrategyWrapper implements PersistentEntityNamingStrategy {
@Override
public String resolveForeignKeyForPropertyDomainClass(
- GrailsHibernatePersistentProperty property) {
+ HibernatePersistentProperty property) {
return Optional.ofNullable(property)
- .map(GrailsHibernatePersistentProperty::getHibernateOwner)
+ .map(HibernatePersistentProperty::getHibernateOwner)
.map(GrailsHibernatePersistentEntity::getJavaClass)
.map(Class::getSimpleName)
.map(NameUtils::decapitalize)
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/PropertyFromValueCreator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/PropertyFromValueCreator.java
index a2ac5a4948..916bd13837 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/PropertyFromValueCreator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/PropertyFromValueCreator.java
@@ -19,7 +19,7 @@
package org.grails.orm.hibernate.cfg.domainbinding.util;
import org.grails.orm.hibernate.cfg.domainbinding.binder.PropertyBinder;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.Value;
@@ -35,7 +35,7 @@ public class PropertyFromValueCreator {
this.propertyBinder = propertyBinder;
}
- public Property createProperty(Value value, GrailsHibernatePersistentProperty grailsProperty) {
+ public Property createProperty(Value value, HibernatePersistentProperty grailsProperty) {
// set type
if (!grailsProperty.isEnumType()) {
value.setTypeUsingReflection(grailsProperty.getOwnerClassName(), grailsProperty.getName());
diff --git a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/TableForManyCalculator.java b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/TableForManyCalculator.java
index 7f6a46f6b0..e9fddb5d41 100644
--- a/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/TableForManyCalculator.java
+++ b/grails-data-hibernate7/core/src/main/groovy/org/grails/orm/hibernate/cfg/domainbinding/util/TableForManyCalculator.java
@@ -27,7 +27,7 @@ import org.grails.orm.hibernate.cfg.JoinTable;
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy;
import org.grails.orm.hibernate.cfg.PropertyConfig;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity;
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty;
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty;
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateManyToManyProperty;
import org.hibernate.MappingException;
@@ -52,7 +52,7 @@ public class TableForManyCalculator {
* relationship so that there is not a situation where you have two mapping tables for left_right
* and right_left
*/
- public String calculateTableForMany(GrailsHibernatePersistentProperty property) {
+ public String calculateTableForMany(HibernatePersistentProperty property) {
String propertyColumnName = namingStrategy.resolveColumnName(property.getName());
PropertyConfig config = property.getMappedForm();
JoinTable jt = config.getJoinTable();
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/CompositeIdentitySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/CompositeIdentitySpec.groovy
index 40cbc69d01..bdce4d9dd8 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/CompositeIdentitySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/CompositeIdentitySpec.groovy
@@ -3,15 +3,15 @@ package org.grails.orm.hibernate.cfg
import org.hibernate.MappingException
import spock.lang.Specification
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
class CompositeIdentitySpec extends Specification {
def "test getHibernateProperties with property names"() {
given:
def domainClass = Mock(GrailsHibernatePersistentEntity)
- def prop1 = Mock(GrailsHibernatePersistentProperty)
- def prop2 = Mock(GrailsHibernatePersistentProperty)
+ def prop1 = Mock(HibernatePersistentProperty)
+ def prop2 = Mock(HibernatePersistentProperty)
def compositeIdentity = new CompositeIdentity(propertyNames: ['prop1', 'prop2'] as String[])
when:
@@ -28,14 +28,14 @@ class CompositeIdentitySpec extends Specification {
def "test getHibernateProperties with fallback to domain class"() {
given:
def domainClass = Mock(GrailsHibernatePersistentEntity)
- def prop1 = Mock(GrailsHibernatePersistentProperty)
+ def prop1 = Mock(HibernatePersistentProperty)
def compositeIdentity = new CompositeIdentity()
when:
def properties = compositeIdentity.getHibernateProperties(domainClass)
then:
- 1 * domainClass.getCompositeIdentity() >> ([prop1] as GrailsHibernatePersistentProperty[])
+ 1 * domainClass.getCompositeIdentity() >> ([prop1] as HibernatePersistentProperty[])
0 * domainClass.getPropertyByName(_)
properties.length == 1
properties[0] == prop1
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy
index 5cf3598532..5dc27afa53 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentEntitySpec.groovy
@@ -4,7 +4,7 @@ import grails.gorm.annotation.Entity
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.datastore.mapping.model.types.TenantId
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentEntity
import org.grails.orm.hibernate.cfg.domainbinding.util.DefaultColumnNameFetcher
@@ -157,7 +157,7 @@ class GrailsHibernatePersistentEntitySpec extends HibernateGormDatastoreSpec {
given:
GrailsHibernatePersistentEntity entity = Spy(HibernatePersistentEntity, constructorArgs: [Person, getMappingContext()])
// Force the stub to implement the required interface for the instanceof check in the default method
- def tenantIdProp = Stub(TenantId, additionalInterfaces: [GrailsHibernatePersistentProperty])
+ def tenantIdProp = Stub(TenantId, additionalInterfaces: [HibernatePersistentProperty])
tenantIdProp.getName() >> "tenantId"
entity.getTenantId() >> tenantIdProp
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentPropertySpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentPropertySpec.groovy
index 619a4ca004..448af1ced4 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentPropertySpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/GrailsHibernatePersistentPropertySpec.groovy
@@ -3,7 +3,7 @@ package org.grails.orm.hibernate.cfg
import grails.gorm.annotation.Entity
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.datastore.mapping.model.PersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.util.NamingStrategyWrapper
import spock.lang.Unroll
import org.hibernate.mapping.Property
@@ -16,7 +16,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
void "test isEnumType for property #propertyName"() {
given:
PersistentEntity entity = createPersistentEntity(TestEntityWithEnum)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName(propertyName)
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName(propertyName)
expect:
property.isEnumType() == expected
@@ -33,7 +33,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
createPersistentEntity(AssociatedEntity)
createPersistentEntity(ManyToOneEntity)
PersistentEntity entity = createPersistentEntity(TestEntityWithAssociations)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName(propertyName)
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName(propertyName)
expect:
property.isOneToOne() == isOneToOne
@@ -48,7 +48,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
void "test isUserButNotCollectionType"() {
given:
PersistentEntity entity = createPersistentEntity(TestEntityWithEnum)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName("myEnum")
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName("myEnum")
expect:
!property.isUserButNotCollectionType()
@@ -57,7 +57,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
void "test isSerializableType"() {
given:
PersistentEntity entity = createPersistentEntity(TestEntityWithSerializable)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName("payload")
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName("payload")
expect:
property.isSerializableType()
@@ -66,7 +66,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
void "test isEmbedded() for embedded property"() {
given:
PersistentEntity entity = createPersistentEntity(TestEntityWithEmbedded)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName("address")
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName("address")
expect:
property.isEmbedded()
@@ -75,7 +75,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
void "test getTypeName()"() {
given:
PersistentEntity entity = createPersistentEntity(TestEntityWithTypeName)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName("name")
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName("name")
expect:
property.getTypeName() == "string"
@@ -88,9 +88,9 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
PersistentEntity entityWithCustomMap = createPersistentEntity(EntityWithCustomMapIndex)
PersistentEntity entityWithList = createPersistentEntity(EntityWithList)
- GrailsHibernatePersistentProperty defaultMapProp = (GrailsHibernatePersistentProperty) entityWithDefaultMap.getPropertyByName("tags")
- GrailsHibernatePersistentProperty customMapProp = (GrailsHibernatePersistentProperty) entityWithCustomMap.getPropertyByName("tags")
- GrailsHibernatePersistentProperty listProp = (GrailsHibernatePersistentProperty) entityWithList.getPropertyByName("items")
+ HibernatePersistentProperty defaultMapProp = (HibernatePersistentProperty) entityWithDefaultMap.getPropertyByName("tags")
+ HibernatePersistentProperty customMapProp = (HibernatePersistentProperty) entityWithCustomMap.getPropertyByName("tags")
+ HibernatePersistentProperty listProp = (HibernatePersistentProperty) entityWithList.getPropertyByName("items")
expect:
defaultMapProp.getIndexColumnType("string") == "string"
@@ -103,8 +103,8 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
createPersistentEntity(AssociatedEntity)
createPersistentEntity(ManyToOneEntity)
PersistentEntity entity = createPersistentEntity(TestEntityWithAssociations)
- GrailsHibernatePersistentProperty oneToOneProp = (GrailsHibernatePersistentProperty) entity.getPropertyByName("oneToOne")
- GrailsHibernatePersistentProperty manyToOneProp = (GrailsHibernatePersistentProperty) entity.getPropertyByName("manyToOne")
+ HibernatePersistentProperty oneToOneProp = (HibernatePersistentProperty) entity.getPropertyByName("oneToOne")
+ HibernatePersistentProperty manyToOneProp = (HibernatePersistentProperty) entity.getPropertyByName("manyToOne")
expect:
oneToOneProp.isHibernateOneToOne()
@@ -121,7 +121,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
createPersistentEntity(BMTOWLMBook)
createPersistentEntity(BMTOWLMAuthor)
PersistentEntity entity = createPersistentEntity(BMTOWLMAuthor)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName(propertyName)
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName(propertyName)
// Add this for the 'prop' parameter
Property mockProperty = Mock(Property)
@@ -148,8 +148,8 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
PersistentEntity entityWithList = createPersistentEntity(EntityWithList)
PersistentEntity entityWithMap = createPersistentEntity(EntityWithMap)
- GrailsHibernatePersistentProperty listProp = (GrailsHibernatePersistentProperty) entityWithList.getPropertyByName("items")
- GrailsHibernatePersistentProperty mapProp = (GrailsHibernatePersistentProperty) entityWithMap.getPropertyByName("tags")
+ HibernatePersistentProperty listProp = (HibernatePersistentProperty) entityWithList.getPropertyByName("items")
+ HibernatePersistentProperty mapProp = (HibernatePersistentProperty) entityWithMap.getPropertyByName("tags")
expect:
listProp.getIndexColumnName(namingStrategy) == "items_idx"
@@ -162,7 +162,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
def metadataBuildingContext = domainBinder.getMetadataBuildingContext()
def table = new Table("TEST")
PersistentEntity entity = createPersistentEntity(TestEntityWithTypeName)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName("name")
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName("name")
def sv = new org.hibernate.mapping.BasicValue(metadataBuildingContext, table)
@@ -177,7 +177,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
def metadataBuildingContext = domainBinder.getMetadataBuildingContext()
def table = new Table("TEST2")
PersistentEntity entity = createPersistentEntity(TestEntityWithEnum)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName("name")
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName("name")
def sv = new org.hibernate.mapping.BasicValue(metadataBuildingContext, table)
@@ -191,7 +191,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
def metadataBuildingContext = domainBinder.getMetadataBuildingContext()
def table = new Table("TEST3")
PersistentEntity entity = createPersistentEntity(BMTOWLMAuthor)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName("books")
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName("books")
// DependantValue usually represents a foreign key, it should use the identity type of the owner
def dv = new org.hibernate.mapping.DependantValue(metadataBuildingContext, table, new org.hibernate.mapping.BasicValue(metadataBuildingContext, table))
@@ -203,7 +203,7 @@ class GrailsHibernatePersistentPropertySpec extends HibernateGormDatastoreSpec {
void "test validateAssociation throws exception for user type"() {
given:
PersistentEntity entity = createPersistentEntity(TestEntityWithAssociations)
- GrailsHibernatePersistentProperty prop = (GrailsHibernatePersistentProperty) entity.getPropertyByName("manyToOne")
+ HibernatePersistentProperty prop = (HibernatePersistentProperty) entity.getPropertyByName("manyToOne")
// Mocking getUserType to return a non-null value for an association
def proxyProp = Spy(prop)
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy
index ac9864dc77..2ff68e294a 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CollectionBinderSpec.groovy
@@ -2,7 +2,7 @@ package org.grails.orm.hibernate.cfg.domainbinding
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.hibernate.mapping.OneToMany
import org.hibernate.mapping.RootClass
import org.hibernate.boot.spi.MetadataBuildingContext
@@ -167,7 +167,7 @@ class CollectionBinderSpec extends HibernateGormDatastoreSpec {
rootClass.setEntityName(personEntity.name)
rootClass.setTable(collector.addTable(null, null, "PERSON", null, false, binder.getMetadataBuildingContext()))
- def petsProp = personEntity.getPropertyByName("pets") as GrailsHibernatePersistentProperty
+ def petsProp = personEntity.getPropertyByName("pets") as HibernatePersistentProperty
when:
def collection = collectionBinder.bindCollection(petsProp, rootClass, collector, "")
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ColumnBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ColumnBinderSpec.groovy
index 6a4efb789c..a365703e45 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ColumnBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ColumnBinderSpec.groovy
@@ -3,7 +3,7 @@ package org.grails.orm.hibernate.cfg.domainbinding
import grails.gorm.annotation.Entity
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.orm.hibernate.cfg.ColumnConfig
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.hibernate.mapping.Column
import org.hibernate.mapping.Table
@@ -68,7 +68,7 @@ class ColumnBinderSpec extends HibernateGormDatastoreSpec {
def entity = createPersistentEntity(CBNumericSub)
def prop = entity.getPropertyByName("num")
- def parentProp = Mock(GrailsHibernatePersistentProperty)
+ def parentProp = Mock(HibernatePersistentProperty)
def column = new Column("test")
def table = new Table()
def cc = new ColumnConfig(comment: "cmt", defaultValue: "def", read: "r", write: "w")
@@ -280,7 +280,7 @@ class ColumnBinderSpec extends HibernateGormDatastoreSpec {
def entity = createPersistentEntity(CBNullableEntity)
def prop = entity.getPropertyByName("nullableProp")
- def parentProp = Mock(GrailsHibernatePersistentProperty)
+ def parentProp = Mock(HibernatePersistentProperty)
def column = new Column("test")
def table = new Table()
@@ -315,7 +315,7 @@ class ColumnBinderSpec extends HibernateGormDatastoreSpec {
def entity = createPersistentEntity(CBBook)
def prop = entity.getPropertyByName("title")
- def parentProp = Mock(GrailsHibernatePersistentProperty)
+ def parentProp = Mock(HibernatePersistentProperty)
def column = new Column("test")
def table = new Table()
@@ -350,7 +350,7 @@ class ColumnBinderSpec extends HibernateGormDatastoreSpec {
def entity = createPersistentEntity(CBBook)
def prop = entity.getPropertyByName("title")
- def parentProp = Mock(GrailsHibernatePersistentProperty)
+ def parentProp = Mock(HibernatePersistentProperty)
def column = new Column("test")
def table = new Table()
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ColumnNameForPropertyAndPathFetcherSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ColumnNameForPropertyAndPathFetcherSpec.groovy
index cd00cd1e1c..4b8d8207ac 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ColumnNameForPropertyAndPathFetcherSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ColumnNameForPropertyAndPathFetcherSpec.groovy
@@ -1,7 +1,7 @@
package org.grails.orm.hibernate.cfg.domainbinding
import org.grails.orm.hibernate.cfg.ColumnConfig
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy
import spock.lang.Specification
import spock.lang.Unroll
@@ -24,7 +24,7 @@ class ColumnNameForPropertyAndPathFetcherSpec extends Specification {
backticksRemover
)
- def grailsProp = Mock(GrailsHibernatePersistentProperty)
+ def grailsProp = Mock(HibernatePersistentProperty)
def cc = Mock(ColumnConfig)
grailsProp.getColumnName(cc) >> "explicit_col"
@@ -47,7 +47,7 @@ class ColumnNameForPropertyAndPathFetcherSpec extends Specification {
backticksRemover
)
- def grailsProp = Mock(GrailsHibernatePersistentProperty)
+ def grailsProp = Mock(HibernatePersistentProperty)
grailsProp.getColumnName(null) >> null
namingStrategy.resolveColumnName(path) >> resolvedPath
@@ -75,7 +75,7 @@ class ColumnNameForPropertyAndPathFetcherSpec extends Specification {
backticksRemover
)
- def grailsProp = Mock(GrailsHibernatePersistentProperty)
+ def grailsProp = Mock(HibernatePersistentProperty)
grailsProp.getColumnName(null) >> null
defaultColumnFetcher.getDefaultColumnName(grailsProp) >> "only_default"
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentBinderSpec.groovy
index be10d82802..bd65b66b03 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ComponentBinderSpec.groovy
@@ -5,7 +5,7 @@ import org.grails.datastore.mapping.model.MappingContext
import org.grails.datastore.mapping.model.PersistentEntity
import org.grails.datastore.mapping.model.PersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.Mapping
import org.grails.orm.hibernate.cfg.MappingCacheHolder
import org.grails.orm.hibernate.cfg.PropertyConfig
@@ -87,8 +87,8 @@ class ComponentBinderSpec extends HibernateGormDatastoreSpec {
private void setupProperty(PersistentProperty prop, String name, Mapping mapping, PersistentEntity owner) {
prop.getName() >> name
_ * prop.getOwner() >> owner
- if (prop instanceof GrailsHibernatePersistentProperty) {
- _ * ((GrailsHibernatePersistentProperty)prop).getHibernateOwner() >> owner
+ if (prop instanceof HibernatePersistentProperty) {
+ _ * ((HibernatePersistentProperty)prop).getHibernateOwner() >> owner
}
def config = new PropertyConfig()
mapping.getColumns().put(name, config)
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdBinderSpec.groovy
index e41abea561..95293a2a1d 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdBinderSpec.groovy
@@ -1,7 +1,7 @@
package org.grails.orm.hibernate.cfg.domainbinding
import grails.gorm.specs.HibernateGormDatastoreSpec
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.CompositeIdentity
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
@@ -39,9 +39,9 @@ class CompositeIdBinderSpec extends HibernateGormDatastoreSpec {
def compositeIdentity = new CompositeIdentity(propertyNames: ['prop1', 'prop2'] as String[])
- def prop1 = Mock(GrailsHibernatePersistentProperty)
- def prop2 = Mock(GrailsHibernatePersistentProperty)
- def identifierProp = Mock(GrailsHibernatePersistentProperty)
+ def prop1 = Mock(HibernatePersistentProperty)
+ def prop2 = Mock(HibernatePersistentProperty)
+ def identifierProp = Mock(HibernatePersistentProperty)
domainClass.getPropertyByName("prop1") >> prop1
domainClass.getPropertyByName("prop2") >> prop2
domainClass.getIdentity() >> identifierProp
@@ -57,8 +57,8 @@ class CompositeIdBinderSpec extends HibernateGormDatastoreSpec {
root.getIdentifier() instanceof Component
root.getIdentifierMapper() instanceof Component
root.hasEmbeddedIdentifier()
- 2 * grailsPropertyBinder.bindProperty(root, table, "", identifierProp, _ as GrailsHibernatePersistentProperty, mappings) >> Mock(Value)
- 2 * componentUpdater.updateComponent(_ as Component, identifierProp, _ as GrailsHibernatePersistentProperty, _ as Value)
+ 2 * grailsPropertyBinder.bindProperty(root, table, "", identifierProp, _ as HibernatePersistentProperty, mappings) >> Mock(Value)
+ 2 * componentUpdater.updateComponent(_ as Component, identifierProp, _ as HibernatePersistentProperty, _ as Value)
}
def "should fallback to domainClass composite identity when CompositeIdentity is null"() {
@@ -69,9 +69,9 @@ class CompositeIdBinderSpec extends HibernateGormDatastoreSpec {
root.setEntityName("MyEntity")
def mappings = metadataBuildingContext.getMetadataCollector()
- def prop1 = Mock(GrailsHibernatePersistentProperty)
- def identifierProp = Mock(GrailsHibernatePersistentProperty)
- domainClass.getCompositeIdentity() >> ([prop1] as GrailsHibernatePersistentProperty[])
+ def prop1 = Mock(HibernatePersistentProperty)
+ def identifierProp = Mock(HibernatePersistentProperty)
+ domainClass.getCompositeIdentity() >> ([prop1] as HibernatePersistentProperty[])
domainClass.getIdentity() >> identifierProp
domainClass.getName() >> "MyEntity"
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdentifierToManyToOneBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdentifierToManyToOneBinderSpec.groovy
index 1dd788b879..ca337b414b 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdentifierToManyToOneBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CompositeIdentifierToManyToOneBinderSpec.groovy
@@ -6,7 +6,7 @@ import org.grails.datastore.mapping.model.types.ToOne
import org.grails.orm.hibernate.cfg.ColumnConfig
import org.grails.orm.hibernate.cfg.CompositeIdentity
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy
import org.grails.orm.hibernate.cfg.PropertyConfig
import org.hibernate.mapping.SimpleValue
@@ -35,7 +35,7 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification {
// 2. Set up stubs for the method arguments
def association = Mock(ToOne)
- association.asType(GrailsHibernatePersistentProperty) >> association
+ association.asType(HibernatePersistentProperty) >> association
def value = Mock(SimpleValue)
def refDomainClass = Mock(GrailsHibernatePersistentEntity)
def path = "/test"
@@ -52,15 +52,15 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification {
calculator.calculateForeignKeyColumnCount(refDomainClass, propertyNames) >> 2
def nestedEntityProp = Mock(ToOne)
- nestedEntityProp.asType(GrailsHibernatePersistentProperty) >> nestedEntityProp
+ nestedEntityProp.asType(HibernatePersistentProperty) >> nestedEntityProp
refDomainClass.getPropertyByName("nestedEntity") >> nestedEntityProp
nestedEntityProp.name >> "nestedEntity"
def nestedAssociatedEntity = Mock(GrailsHibernatePersistentEntity)
nestedEntityProp.getAssociatedEntity() >> nestedAssociatedEntity
- def nestedPartA = Mock(GrailsHibernatePersistentProperty)
- def nestedPartB = Mock(GrailsHibernatePersistentProperty)
+ def nestedPartA = Mock(HibernatePersistentProperty)
+ def nestedPartB = Mock(HibernatePersistentProperty)
def perArray = [nestedPartA, nestedPartB] as PersistentProperty[]
nestedAssociatedEntity.getCompositeIdentity() >> perArray
@@ -74,7 +74,7 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification {
backticksRemover.apply(_) >> { String s -> s }
when:
- binder.bindCompositeIdentifierToManyToOne(association as GrailsHibernatePersistentProperty, value, compositeId, refDomainClass, path)
+ binder.bindCompositeIdentifierToManyToOne(association as HibernatePersistentProperty, value, compositeId, refDomainClass, path)
then:
// 5. Verify the final generated column names
@@ -84,7 +84,7 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification {
finalColumns[1].getName() == "ref_table_nested_entity_col_part_b_col"
and: // 6. Verify the call to the simple value binder
- 1 * simpleValueBinder.bindSimpleValue(_ as GrailsHibernatePersistentProperty, null, value, path)
+ 1 * simpleValueBinder.bindSimpleValue(_ as HibernatePersistentProperty, null, value, path)
}
def "Test bindCompositeIdentifierToManyToOne when column count matches"() {
@@ -101,7 +101,7 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification {
// 2. Set up arguments
def association = Mock(ToOne)
- association.asType(GrailsHibernatePersistentProperty) >> association
+ association.asType(HibernatePersistentProperty) >> association
def value = Mock(SimpleValue)
def compositeId = new CompositeIdentity()
compositeId.setPropertyNames(["prop1", "prop2"] as String[])
@@ -118,7 +118,7 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification {
calculator.calculateForeignKeyColumnCount(refDomainClass, _ as String[]) >> 2
when:
- binder.bindCompositeIdentifierToManyToOne(association as GrailsHibernatePersistentProperty, value, compositeId, refDomainClass, path)
+ binder.bindCompositeIdentifierToManyToOne(association as HibernatePersistentProperty, value, compositeId, refDomainClass, path)
then:
// 4. Verify the column name generation logic is skipped
@@ -128,6 +128,6 @@ class CompositeIdentifierToManyToOneBinderSpec extends Specification {
0 * backticksRemover._
and: // 5. Verify the simple value binder is still called
- 1 * simpleValueBinder.bindSimpleValue(_ as GrailsHibernatePersistentProperty, null, value, path)
+ 1 * simpleValueBinder.bindSimpleValue(_ as HibernatePersistentProperty, null, value, path)
}
}
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CreateKeyForPropsSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CreateKeyForPropsSpec.groovy
index d802a3a54b..9b5277bcae 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CreateKeyForPropsSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/CreateKeyForPropsSpec.groovy
@@ -1,7 +1,7 @@
package org.grails.orm.hibernate.cfg.domainbinding
import org.grails.datastore.mapping.model.PersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.hibernate.MappingException
import org.hibernate.mapping.Table
import spock.lang.Specification
@@ -19,7 +19,7 @@ class CreateKeyForPropsSpec extends Specification {
def subject = new CreateKeyForProps(columnNameFetcher, uniqueKeyCreator)
def owner = Mock(PersistentEntity)
- def grailsProp = Mock(GrailsHibernatePersistentProperty) {
+ def grailsProp = Mock(HibernatePersistentProperty) {
getOwner() >> owner
}
@@ -30,8 +30,8 @@ class CreateKeyForPropsSpec extends Specification {
}
grailsProp.getMappedForm() >> mappedForm
- def otherProp1 = Mock(GrailsHibernatePersistentProperty)
- def otherProp2 = Mock(GrailsHibernatePersistentProperty)
+ def otherProp1 = Mock(HibernatePersistentProperty)
+ def otherProp2 = Mock(HibernatePersistentProperty)
owner.getPropertyByName("p1") >> otherProp1
owner.getPropertyByName("p2") >> otherProp2
@@ -65,7 +65,7 @@ class CreateKeyForPropsSpec extends Specification {
def subject = new CreateKeyForProps(columnNameFetcher, uniqueKeyCreator)
def owner = Mock(PersistentEntity)
- def grailsProp = Mock(GrailsHibernatePersistentProperty) { getOwner() >> owner }
+ def grailsProp = Mock(HibernatePersistentProperty) { getOwner() >> owner }
def mappedForm = Mock(org.grails.orm.hibernate.cfg.PropertyConfig) {
isUnique() >> false
@@ -92,7 +92,7 @@ class CreateKeyForPropsSpec extends Specification {
def subject = new CreateKeyForProps(columnNameFetcher, uniqueKeyCreator)
def owner = Mock(PersistentEntity)
- def grailsProp = Mock(GrailsHibernatePersistentProperty) { getOwner() >> owner }
+ def grailsProp = Mock(HibernatePersistentProperty) { getOwner() >> owner }
owner.getJavaClass() >> CreateKeyForPropsSpec
def mappedForm = Mock(org.grails.orm.hibernate.cfg.PropertyConfig) {
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/EnumTypeBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/EnumTypeBinderSpec.groovy
index 95e66c9c03..1e7a56db7c 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/EnumTypeBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/EnumTypeBinderSpec.groovy
@@ -3,7 +3,7 @@ package org.grails.orm.hibernate.cfg.domainbinding
import grails.gorm.specs.HibernateGormDatastoreSpec
import grails.persistence.Entity
import org.grails.datastore.mapping.model.PersistentProperty
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.IdentityEnumType
import jakarta.persistence.EnumType
import org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder
@@ -142,7 +142,7 @@ class EnumTypeBinderSpec extends HibernateGormDatastoreSpec {
def table = new Table("person")
when: "the enum is bound using the new signature"
- def result = binder.bindEnumType(property as GrailsHibernatePersistentProperty, Status01, table, "")
+ def result = binder.bindEnumType(property as HibernatePersistentProperty, Status01, table, "")
then: "a BasicValue is returned and bound correctly"
result instanceof BasicValue
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ForeignKeyColumnCountCalculatorSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ForeignKeyColumnCountCalculatorSpec.groovy
index 4a44f1b155..f31ccabc05 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ForeignKeyColumnCountCalculatorSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ForeignKeyColumnCountCalculatorSpec.groovy
@@ -3,7 +3,7 @@ package org.grails.orm.hibernate.cfg.domainbinding
import org.grails.datastore.mapping.model.PersistentEntity
import org.grails.datastore.mapping.model.PersistentProperty
import org.grails.datastore.mapping.model.types.ToOne
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentEntity
import spock.lang.Specification
import spock.lang.Unroll
@@ -32,7 +32,7 @@ class ForeignKeyColumnCountCalculatorSpec extends Specification {
// Mocks for a ToOne association with a composite ID of length 2
def toOneCompositeIdProp = Mock(ToOne)
def associatedEntityCompositeId = Mock(HibernatePersistentEntity)
- def compositeId = [Mock(GrailsHibernatePersistentProperty), Mock(GrailsHibernatePersistentProperty)] as GrailsHibernatePersistentProperty[]
+ def compositeId = [Mock(HibernatePersistentProperty), Mock(HibernatePersistentProperty)] as HibernatePersistentProperty[]
refDomainClass.getPropertyByName("toOneComposite") >> toOneCompositeIdProp
toOneCompositeIdProp.getAssociatedEntity() >> associatedEntityCompositeId
associatedEntityCompositeId.getCompositeIdentity() >> compositeId
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy
index a3cdacfd7e..218abedec7 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/GrailsPropertyBinderSpec.groovy
@@ -4,7 +4,7 @@ import grails.gorm.annotation.Entity
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.datastore.mapping.model.PersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder
import org.grails.orm.hibernate.cfg.Mapping
import org.grails.orm.hibernate.cfg.PropertyConfig
@@ -101,8 +101,8 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
private void setupProperty(PersistentProperty prop, String name, Mapping mapping, PersistentEntity owner) {
prop.getName() >> name
_ * prop.getOwner() >> owner
- if (prop instanceof GrailsHibernatePersistentProperty) {
- _ * ((GrailsHibernatePersistentProperty)prop).getHibernateOwner() >> owner
+ if (prop instanceof HibernatePersistentProperty) {
+ _ * ((HibernatePersistentProperty)prop).getHibernateOwner() >> owner
}
def config = new PropertyConfig()
mapping.getColumns().put(name, config)
@@ -227,7 +227,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
rootClass.setTable(collector.addTable(null, null, "SIMPLE_BOOK", null, false, binder.getMetadataBuildingContext()))
when:
- def titleProp = persistentEntity.getPropertyByName("title") as GrailsHibernatePersistentProperty
+ def titleProp = persistentEntity.getPropertyByName("title") as HibernatePersistentProperty
Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, titleProp, collector)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, titleProp))
@@ -282,7 +282,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
rootClass.setTable(collector.addTable(null, null, "PET", null, false, binder.getMetadataBuildingContext()))
when:
- def ownerProp = petEntity.getPropertyByName("owner") as GrailsHibernatePersistentProperty
+ def ownerProp = petEntity.getPropertyByName("owner") as HibernatePersistentProperty
Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, ownerProp, collector)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, ownerProp))
@@ -305,7 +305,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
rootClass.setTable(collector.addTable(null, null, "EMPLOYEE", null, false, binder.getMetadataBuildingContext()))
when:
- def addressProp = persistentEntity.getPropertyByName("homeAddress") as GrailsHibernatePersistentProperty
+ def addressProp = persistentEntity.getPropertyByName("homeAddress") as HibernatePersistentProperty
Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, addressProp, collector)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, addressProp))
@@ -333,7 +333,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
rootClass.setTable(collector.addTable(null, null, "PERSON", null, false, binder.getMetadataBuildingContext()))
when:
- def petsProp = personEntity.getPropertyByName("pets") as GrailsHibernatePersistentProperty
+ def petsProp = personEntity.getPropertyByName("pets") as HibernatePersistentProperty
Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, petsProp, collector)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, petsProp))
@@ -372,7 +372,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
collector.addEntityBinding(rootClass)
when:
- def booksProp = authorEntity.getPropertyByName("books") as GrailsHibernatePersistentProperty
+ def booksProp = authorEntity.getPropertyByName("books") as HibernatePersistentProperty
Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, booksProp, collector)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, booksProp))
collector.processSecondPasses(binder.getMetadataBuildingContext())
@@ -411,7 +411,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
collector.addEntityBinding(rootClass)
when:
- def booksProp = authorEntity.getPropertyByName("books") as GrailsHibernatePersistentProperty
+ def booksProp = authorEntity.getPropertyByName("books") as HibernatePersistentProperty
Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, booksProp, collector)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, booksProp))
collector.processSecondPasses(binder.getMetadataBuildingContext())
@@ -472,7 +472,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
collector.addEntityBinding(rootClass)
when:
- def childBookProp = authorEntity.getPropertyByName("childBook") as GrailsHibernatePersistentProperty
+ def childBookProp = authorEntity.getPropertyByName("childBook") as HibernatePersistentProperty
Value value = propertyBinder.bindProperty(rootClass, rootClass.table, EMPTY_PATH, null, childBookProp, collector)
rootClass.addProperty(new PropertyFromValueCreator().createProperty(value, childBookProp))
// Process second passes to ensure Hibernate's internal mappings are finalized
@@ -519,7 +519,7 @@ class GrailsPropertyBinderSpec extends HibernateGormDatastoreSpec {
metadataBuildingContext.getMetadataCollector() >> mappings
def rootClass = new RootClass(metadataBuildingContext)
- def currentGrailsProp = Mock(GrailsHibernatePersistentProperty)
+ def currentGrailsProp = Mock(HibernatePersistentProperty)
def table = new org.hibernate.mapping.Table("TEST_TABLE")
rootClass.setTable(table)
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IdentityBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IdentityBinderSpec.groovy
index f3943ca863..df50641f47 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IdentityBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/IdentityBinderSpec.groovy
@@ -1,7 +1,7 @@
package org.grails.orm.hibernate.cfg.domainbinding
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.CompositeIdentity
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
import org.grails.orm.hibernate.cfg.Identity
@@ -32,7 +32,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
def domainClass = Mock(GrailsHibernatePersistentEntity)
def root = new RootClass(getGrailsDomainBinder().getMetadataBuildingContext())
def mappings = Mock(InFlightMetadataCollector)
- def identifierProp = Mock(GrailsHibernatePersistentProperty)
+ def identifierProp = Mock(HibernatePersistentProperty)
domainClass.getIdentity() >> identifierProp
domainClass.getCompositeIdentity() >> null
@@ -48,7 +48,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
def domainClass = Mock(GrailsHibernatePersistentEntity)
def root = new RootClass(getGrailsDomainBinder().getMetadataBuildingContext())
def mappings = Mock(InFlightMetadataCollector)
- def compositeProps = [Mock(GrailsHibernatePersistentProperty)] as GrailsHibernatePersistentProperty[]
+ def compositeProps = [Mock(HibernatePersistentProperty)] as HibernatePersistentProperty[]
domainClass.getCompositeIdentity() >> compositeProps
when:
@@ -82,7 +82,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
def gormMapping = Mock(Mapping)
def identity = new Identity(name: "foo")
gormMapping.getIdentity() >> identity
- def identifierProp = Mock(GrailsHibernatePersistentProperty)
+ def identifierProp = Mock(HibernatePersistentProperty)
domainClass.getPropertyByName("foo") >> identifierProp
domainClass.getIdentity() >> identifierProp
domainClass.getName() >> "MyEntity"
@@ -102,7 +102,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
def gormMapping = Mock(Mapping)
def identity = new Identity(name: "MyEntity")
gormMapping.getIdentity() >> identity
- def identifierProp = Mock(GrailsHibernatePersistentProperty)
+ def identifierProp = Mock(HibernatePersistentProperty)
domainClass.getIdentity() >> identifierProp
domainClass.getName() >> "MyEntity"
@@ -122,7 +122,7 @@ class IdentityBinderSpec extends HibernateGormDatastoreSpec {
def gormMapping = Mock(Mapping)
def identity = new Identity()
gormMapping.getIdentity() >> identity
- def identifierProp = Mock(GrailsHibernatePersistentProperty)
+ def identifierProp = Mock(HibernatePersistentProperty)
domainClass.getIdentity() >> identifierProp
domainClass.getName() >> "MyEntity"
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ManyToOneBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ManyToOneBinderSpec.groovy
index dc5df81691..7b54f81ad3 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ManyToOneBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/ManyToOneBinderSpec.groovy
@@ -5,7 +5,7 @@ import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateAssociation
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToOneProperty
import org.grails.orm.hibernate.cfg.CompositeIdentity
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.Mapping
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy
import org.grails.orm.hibernate.cfg.PropertyConfig
@@ -54,8 +54,8 @@ class ManyToOneBinderSpec extends HibernateGormDatastoreSpec {
then:
result instanceof ManyToOne
1 * manyToOneValuesBinder.bindManyToOneValues(association as HibernateAssociation, _ as ManyToOne)
- compositeBinderCalls * compositeBinder.bindCompositeIdentifierToManyToOne(association as GrailsHibernatePersistentProperty, _ as ManyToOne, _, refDomainClass, path)
- simpleValueBinderCalls * simpleValueBinder.bindSimpleValue(association as GrailsHibernatePersistentProperty, null, _ as ManyToOne, path)
+ compositeBinderCalls * compositeBinder.bindCompositeIdentifierToManyToOne(association as HibernatePersistentProperty, _ as ManyToOne, _, refDomainClass, path)
+ simpleValueBinderCalls * simpleValueBinder.bindSimpleValue(association as HibernatePersistentProperty, null, _ as ManyToOne, path)
where:
scenario | hasCompositeId | compositeBinderCalls | simpleValueBinderCalls
@@ -94,7 +94,7 @@ class ManyToOneBinderSpec extends HibernateGormDatastoreSpec {
then:
result instanceof ManyToOne
1 * manyToOneValuesBinder.bindManyToOneValues(property as HibernateAssociation, _ as ManyToOne)
- 1 * simpleValueBinder.bindSimpleValue(property as GrailsHibernatePersistentProperty, null, _ as ManyToOne, "/test")
+ 1 * simpleValueBinder.bindSimpleValue(property as HibernatePersistentProperty, null, _ as ManyToOne, "/test")
def resultConfig = mapping.getColumns().get("myCircularProp")
resultConfig != null
resultConfig.getJoinTable().getKey().getName() == "my_circular_prop_id"
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy
index 1322fdf7b1..ef997c7d2d 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/NamingStrategyWrapperSpec.groovy
@@ -9,7 +9,7 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment
import spock.lang.Subject
import spock.lang.Unroll
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.util.NamingStrategyWrapper
import static org.grails.orm.hibernate.cfg.domainbinding.binder.GrailsDomainBinder.FOREIGN_KEY_SUFFIX
@@ -115,7 +115,7 @@ class NamingStrategyWrapperSpec extends HibernateGormDatastoreSpec {
def "should correctly generate a foreign key name for a property"() {
given: "A persistent property and a captured argument"
def ownerEntity = createPersistentEntity(Owner, getGrailsDomainBinder())
- def property = ownerEntity.getPropertyByName("someProperty") as GrailsHibernatePersistentProperty
+ def property = ownerEntity.getPropertyByName("someProperty") as HibernatePersistentProperty
def capturedIdentifier
and: "The wrapper's internal call to getColumnName is stubbed to capture its argument"
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/OneToOneBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/OneToOneBinderSpec.groovy
index 8b834b5d76..de96426166 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/OneToOneBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/OneToOneBinderSpec.groovy
@@ -3,7 +3,7 @@ package org.grails.orm.hibernate.cfg.domainbinding
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.datastore.mapping.model.types.OneToOne as GormOneToOne
import org.grails.datastore.mapping.model.PersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.PropertyConfig
import org.hibernate.FetchMode
import org.hibernate.mapping.OneToOne as HibernateOneToOne
@@ -30,7 +30,7 @@ class OneToOneBinderSpec extends HibernateGormDatastoreSpec {
def metadataBuildingContext = getGrailsDomainBinder().getMetadataBuildingContext()
def ownerRoot = new RootClass(metadataBuildingContext)
- def gormOneToOne = Mock(GormOneToOne, additionalInterfaces: [GrailsHibernatePersistentProperty])
+ def gormOneToOne = Mock(GormOneToOne, additionalInterfaces: [HibernatePersistentProperty])
def otherSide = Mock(GormOneToOne)
def owner = Mock(PersistentEntity)
def otherOwner = Mock(PersistentEntity)
@@ -45,7 +45,7 @@ class OneToOneBinderSpec extends HibernateGormDatastoreSpec {
otherOwner.getName() >> "OtherEntity"
- ((GrailsHibernatePersistentProperty)gormOneToOne).getMappedForm() >> new PropertyConfig()
+ ((HibernatePersistentProperty)gormOneToOne).getMappedForm() >> new PropertyConfig()
when:
def hibernateOneToOne = binder.bindOneToOne(gormOneToOne as GormOneToOne, ownerRoot, null, "")
@@ -66,7 +66,7 @@ class OneToOneBinderSpec extends HibernateGormDatastoreSpec {
def metadataBuildingContext = getGrailsDomainBinder().getMetadataBuildingContext()
def ownerRoot = new RootClass(metadataBuildingContext)
- def gormOneToOne = Mock(GormOneToOne, additionalInterfaces: [GrailsHibernatePersistentProperty])
+ def gormOneToOne = Mock(GormOneToOne, additionalInterfaces: [HibernatePersistentProperty])
def otherSide = Mock(GormOneToOne)
def owner = Mock(PersistentEntity)
def otherOwner = Mock(PersistentEntity)
@@ -81,7 +81,7 @@ class OneToOneBinderSpec extends HibernateGormDatastoreSpec {
otherOwner.getName() >> "OtherEntity"
def propertyConfig = new PropertyConfig()
- ((GrailsHibernatePersistentProperty)gormOneToOne).getMappedForm() >> propertyConfig
+ ((HibernatePersistentProperty)gormOneToOne).getMappedForm() >> propertyConfig
when:
def hibernateOneToOne = binder.bindOneToOne(gormOneToOne as GormOneToOne, ownerRoot, null, "")
@@ -97,7 +97,7 @@ class OneToOneBinderSpec extends HibernateGormDatastoreSpec {
def metadataBuildingContext = getGrailsDomainBinder().getMetadataBuildingContext()
def ownerRoot = new RootClass(metadataBuildingContext)
- def gormOneToOne = Mock(GormOneToOne, additionalInterfaces: [GrailsHibernatePersistentProperty])
+ def gormOneToOne = Mock(GormOneToOne, additionalInterfaces: [HibernatePersistentProperty])
def otherSide = Mock(GormOneToOne)
def owner = Mock(PersistentEntity)
def otherOwner = Mock(PersistentEntity)
@@ -110,7 +110,7 @@ class OneToOneBinderSpec extends HibernateGormDatastoreSpec {
otherSide.getOwner() >> otherOwner
otherSide.isHasOne() >> false
- ((GrailsHibernatePersistentProperty)gormOneToOne).getMappedForm() >> propertyConfig
+ ((HibernatePersistentProperty)gormOneToOne).getMappedForm() >> propertyConfig
when:
def hibernateOneToOne = binder.bindOneToOne(gormOneToOne as GormOneToOne, ownerRoot, null, "")
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy
index 1072d0f674..1e4f0ae60a 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyBinderSpec.groovy
@@ -5,7 +5,7 @@ import grails.persistence.Entity
import org.grails.datastore.mapping.model.MappingContext
import org.grails.datastore.mapping.model.PersistentEntity
import org.grails.datastore.mapping.model.types.Association
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateAssociation
import org.grails.orm.hibernate.cfg.PropertyConfig
@@ -18,7 +18,7 @@ import org.grails.orm.hibernate.cfg.domainbinding.util.CascadeBehaviorFetcher
class PropertyBinderSpec extends HibernateGormDatastoreSpec {
- abstract static class TestAssociation extends Association<PropertyConfig> implements GrailsHibernatePersistentProperty {
+ abstract static class TestAssociation extends Association<PropertyConfig> implements HibernatePersistentProperty {
TestAssociation(PersistentEntity owner, MappingContext context, java.beans.PropertyDescriptor descriptor) {
super(owner, context, descriptor)
}
@@ -30,7 +30,7 @@ class PropertyBinderSpec extends HibernateGormDatastoreSpec {
def cascadeBehaviorFetcher = Mock(CascadeBehaviorFetcher)
def binder = new PropertyBinder(cascadeBehaviorFetcher)
- def persistentProperty = Mock(GrailsHibernatePersistentProperty, additionalInterfaces: [HibernateAssociation])
+ def persistentProperty = Mock(HibernatePersistentProperty, additionalInterfaces: [HibernateAssociation])
def value = Mock(Value)
def config = Mock(PropertyConfig)
@@ -80,7 +80,7 @@ class PropertyBinderSpec extends HibernateGormDatastoreSpec {
association.getMappedForm() >> config
config.getAccessType() >> AccessType.PROPERTY
cascadeBehaviorFetcher.getCascadeBehaviour(association as Association) >> "all-delete-orphan"
- def property = binder.bindProperty(association as GrailsHibernatePersistentProperty, value)
+ def property = binder.bindProperty(association as HibernatePersistentProperty, value)
then:
property.getCascade() == "all-delete-orphan"
@@ -91,7 +91,7 @@ class PropertyBinderSpec extends HibernateGormDatastoreSpec {
def cascadeBehaviorFetcher = Mock(CascadeBehaviorFetcher)
def binder = new PropertyBinder(cascadeBehaviorFetcher)
- def persistentProperty = Mock(GrailsHibernatePersistentProperty)
+ def persistentProperty = Mock(HibernatePersistentProperty)
persistentProperty.getName() >> "name"
def value = Mock(Value)
def config = new PropertyConfig()
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyFromValueCreatorSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyFromValueCreatorSpec.groovy
index 3515ecb3df..2730db81f6 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyFromValueCreatorSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/PropertyFromValueCreatorSpec.groovy
@@ -5,7 +5,7 @@ import org.hibernate.mapping.Table
import org.hibernate.mapping.Value
import spock.lang.Specification
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.binder.PropertyBinder
import org.grails.orm.hibernate.cfg.domainbinding.util.PropertyFromValueCreator
@@ -17,7 +17,7 @@ class PropertyFromValueCreatorSpec extends Specification {
def creator = new PropertyFromValueCreator(propertyBinder)
def value = Mock(Value)
- def grailsProperty = Mock(GrailsHibernatePersistentProperty)
+ def grailsProperty = Mock(HibernatePersistentProperty)
def table = new Table("my_table")
grailsProperty.getOwnerClassName() >> "com.example.MyEntity"
@@ -44,7 +44,7 @@ class PropertyFromValueCreatorSpec extends Specification {
def creator = new PropertyFromValueCreator(propertyBinder)
def value = Mock(Value)
- def grailsProperty = Mock(GrailsHibernatePersistentProperty)
+ def grailsProperty = Mock(HibernatePersistentProperty)
grailsProperty.getOwnerClassName() >> "com.example.MyEntity"
grailsProperty.getName() >> "myProp"
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinderSpec.groovy
index a3453fb7e6..15683b1fcf 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleIdBinderSpec.groovy
@@ -1,7 +1,7 @@
package org.grails.orm.hibernate.cfg.domainbinding
import grails.gorm.specs.HibernateGormDatastoreSpec
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
import org.grails.orm.hibernate.cfg.Identity
import org.hibernate.boot.spi.MetadataBuildingContext
@@ -58,7 +58,7 @@ class SimpleIdBinderSpec extends HibernateGormDatastoreSpec {
def mapping = Mock(org.grails.orm.hibernate.cfg.Mapping) {
isTablePerConcreteClass() >> false
}
- def testProperty = Mock(GrailsHibernatePersistentProperty) {
+ def testProperty = Mock(HibernatePersistentProperty) {
getName() >> "id"
}
def domainClass = Mock(GrailsHibernatePersistentEntity) {
@@ -74,7 +74,7 @@ class SimpleIdBinderSpec extends HibernateGormDatastoreSpec {
simpleIdBinder.bindSimpleId(domainClass, rootClass, new Identity(generator: GrailsSequenceGeneratorEnum.IDENTITY.toString()), rootClass.getTable())
then:
- 1 * simpleValueBinder.bindSimpleValue(testProperty as GrailsHibernatePersistentProperty, null, _, "")
+ 1 * simpleValueBinder.bindSimpleValue(testProperty as HibernatePersistentProperty, null, _, "")
1 * propertyBinder.bindProperty(testProperty, _)
rootClass.identifier instanceof BasicValue
@@ -88,7 +88,7 @@ class SimpleIdBinderSpec extends HibernateGormDatastoreSpec {
def mapping = Mock(org.grails.orm.hibernate.cfg.Mapping) {
isTablePerConcreteClass() >> true
}
- def testProperty = Mock(GrailsHibernatePersistentProperty) {
+ def testProperty = Mock(HibernatePersistentProperty) {
getName() >> "id"
}
def domainClass = Mock(GrailsHibernatePersistentEntity) {
@@ -104,7 +104,7 @@ class SimpleIdBinderSpec extends HibernateGormDatastoreSpec {
simpleIdBinder.bindSimpleId(domainClass, rootClass, new Identity(generator: GrailsSequenceGeneratorEnum.SEQUENCE.toString(), params: [sequence: 'SEQ_TEST']), rootClass.getTable())
then:
- 1 * simpleValueBinder.bindSimpleValue(testProperty as GrailsHibernatePersistentProperty, null, _, "")
+ 1 * simpleValueBinder.bindSimpleValue(testProperty as HibernatePersistentProperty, null, _, "")
1 * propertyBinder.bindProperty(testProperty, _)
rootClass.identifier instanceof BasicValue
@@ -118,7 +118,7 @@ class SimpleIdBinderSpec extends HibernateGormDatastoreSpec {
def domainClass = Mock(GrailsHibernatePersistentEntity) {
getName() >> "TestEntity"
getPropertyByName("nonExistent") >> null
- getIdentity() >> Mock(GrailsHibernatePersistentProperty)
+ getIdentity() >> Mock(HibernatePersistentProperty)
}
def rootClass = new RootClass(metadataBuildingContext)
def table = Mock(Table)
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleValueBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleValueBinderSpec.groovy
index ebd102b53b..7d7fe9c55a 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleValueBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/SimpleValueBinderSpec.groovy
@@ -5,7 +5,7 @@ import org.grails.datastore.mapping.model.PersistentEntity
import org.grails.datastore.mapping.model.types.TenantId
import org.grails.orm.hibernate.cfg.ColumnConfig
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.Mapping
import org.grails.orm.hibernate.cfg.PersistentEntityNamingStrategy
import org.grails.orm.hibernate.cfg.PropertyConfig
@@ -20,7 +20,7 @@ import org.grails.orm.hibernate.cfg.domainbinding.binder.SimpleValueBinder
class SimpleValueBinderSpec extends Specification {
- abstract static class TestTenantId extends TenantId<PropertyConfig> implements GrailsHibernatePersistentProperty {
+ abstract static class TestTenantId extends TenantId<PropertyConfig> implements HibernatePersistentProperty {
TestTenantId(PersistentEntity owner, MappingContext context, String name, Class type) {
super(owner, context, name, type)
}
@@ -42,7 +42,7 @@ class SimpleValueBinderSpec extends Specification {
def "sets type from provider when present and applies type params"() {
given:
- def prop = Mock(GrailsHibernatePersistentProperty)
+ def prop = Mock(HibernatePersistentProperty)
def owner = Mock(GrailsHibernatePersistentEntity)
def mapping = Mock(Mapping)
def pc = Mock(PropertyConfig)
@@ -81,7 +81,7 @@ class SimpleValueBinderSpec extends Specification {
def "falls back to property type when provider returns null"() {
given:
- def prop = Mock(GrailsHibernatePersistentProperty)
+ def prop = Mock(HibernatePersistentProperty)
def owner = Mock(GrailsHibernatePersistentEntity)
def mapping = Mock(Mapping)
def pc = Mock(PropertyConfig)
@@ -112,7 +112,7 @@ class SimpleValueBinderSpec extends Specification {
def "derived property adds no columns but adds formula, except TenantId"() {
given:
- def prop = Mock(GrailsHibernatePersistentProperty)
+ def prop = Mock(HibernatePersistentProperty)
def tenantProp = Mock(TestTenantId)
def owner = Mock(GrailsHibernatePersistentEntity)
def mapping = Mock(Mapping)
@@ -157,7 +157,7 @@ class SimpleValueBinderSpec extends Specification {
def "applies generator and maps sequence param to SequenceStyleGenerator.SEQUENCE_PARAM"() {
given:
- def prop = Mock(GrailsHibernatePersistentProperty)
+ def prop = Mock(HibernatePersistentProperty)
def owner = Mock(GrailsHibernatePersistentEntity)
def mapping = Mock(Mapping)
def pc = Mock(PropertyConfig)
@@ -189,8 +189,8 @@ class SimpleValueBinderSpec extends Specification {
def "binds for each provided column config and adds to table and simple value"() {
given:
- def prop = Mock(GrailsHibernatePersistentProperty)
- def parent = Mock(GrailsHibernatePersistentProperty)
+ def prop = Mock(HibernatePersistentProperty)
+ def parent = Mock(HibernatePersistentProperty)
def owner = Mock(GrailsHibernatePersistentEntity)
def mapping = Mock(Mapping)
def pc = Mock(PropertyConfig)
@@ -236,7 +236,7 @@ class SimpleValueBinderSpec extends Specification {
def "bindSimpleValue creates and returns BasicValue"() {
given:
- def prop = Mock(GrailsHibernatePersistentProperty)
+ def prop = Mock(HibernatePersistentProperty)
def owner = Mock(GrailsHibernatePersistentEntity)
def mapping = Mock(Mapping)
def pc = Mock(PropertyConfig)
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/TableForManyCalculatorSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/TableForManyCalculatorSpec.groovy
index daff3cc87c..b1cf2472fe 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/TableForManyCalculatorSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/TableForManyCalculatorSpec.groovy
@@ -3,7 +3,7 @@ package org.grails.orm.hibernate.cfg.domainbinding
import grails.gorm.specs.HibernateGormDatastoreSpec
import grails.persistence.Entity
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.JoinTable
import spock.lang.Unroll
@@ -22,43 +22,43 @@ class TableForManyCalculatorSpec extends HibernateGormDatastoreSpec {
GrailsHibernatePersistentEntity ownerEntityInstance
GrailsHibernatePersistentEntity associatedEntityInstance
- GrailsHibernatePersistentProperty propertyToTest
+ HibernatePersistentProperty propertyToTest
// Setup entities and properties based on scenario
switch (scenario) {
case "an owning OneToMany":
ownerEntityInstance = createPersistentEntity(OwningSide)
associatedEntityInstance = createPersistentEntity(AssociatedSide)
- propertyToTest = ownerEntityInstance.getPropertyByName("associated") as GrailsHibernatePersistentProperty
+ propertyToTest = ownerEntityInstance.getPropertyByName("associated") as HibernatePersistentProperty
break
case "a Basic property":
ownerEntityInstance = createPersistentEntity(BasicCollectionOwner)
- propertyToTest = ownerEntityInstance.getPropertyByName("items") as GrailsHibernatePersistentProperty
+ propertyToTest = ownerEntityInstance.getPropertyByName("items") as HibernatePersistentProperty
break
case "a Map property":
ownerEntityInstance = createPersistentEntity(MapCollectionOwner)
- propertyToTest = ownerEntityInstance.getPropertyByName("data") as GrailsHibernatePersistentProperty
+ propertyToTest = ownerEntityInstance.getPropertyByName("data") as HibernatePersistentProperty
break
case "an owning ManyToMany":
ownerEntityInstance = createPersistentEntity(OwningSide)
associatedEntityInstance = createPersistentEntity(Tag)
- propertyToTest = ownerEntityInstance.getPropertyByName("tags") as GrailsHibernatePersistentProperty
+ propertyToTest = ownerEntityInstance.getPropertyByName("tags") as HibernatePersistentProperty
break
case "an inverse ManyToMany":
ownerEntityInstance = createPersistentEntity(Tag)
associatedEntityInstance = createPersistentEntity(OwningSide)
- propertyToTest = ownerEntityInstance.getPropertyByName("owners") as GrailsHibernatePersistentProperty
+ propertyToTest = ownerEntityInstance.getPropertyByName("owners") as HibernatePersistentProperty
break
case "a ManyToMany with explicit joinTable":
ownerEntityInstance = createPersistentEntity(OwningSide)
associatedEntityInstance = createPersistentEntity(Tag)
- propertyToTest = ownerEntityInstance.getPropertyByName("tags") as GrailsHibernatePersistentProperty
+ propertyToTest = ownerEntityInstance.getPropertyByName("tags") as HibernatePersistentProperty
propertyToTest.getMappedForm().setJoinTable(new JoinTable(name: "my_custom_join_table"))
break
case "a ToMany with supportsJoinColumnMapping":
ownerEntityInstance = createPersistentEntity(UnidirectionalOwner)
associatedEntityInstance = createPersistentEntity(UnidirectionalItem)
- propertyToTest = ownerEntityInstance.getPropertyByName("items") as GrailsHibernatePersistentProperty
+ propertyToTest = ownerEntityInstance.getPropertyByName("items") as HibernatePersistentProperty
break
default:
throw new IllegalArgumentException("Unknown scenario: $scenario")
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/VersionBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/VersionBinderSpec.groovy
index 633fdd9067..f12046e24d 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/VersionBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/VersionBinderSpec.groovy
@@ -4,7 +4,7 @@ import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.datastore.mapping.model.PersistentEntity
import org.grails.datastore.mapping.model.PropertyMapping
import org.grails.datastore.mapping.reflect.EntityReflector
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.PropertyConfig
import org.hibernate.boot.spi.MetadataBuildingContext
import org.hibernate.engine.OptimisticLockStyle
@@ -92,7 +92,7 @@ class VersionBinderSpec extends HibernateGormDatastoreSpec {
basicValue.getTypeName() == "timestamp"
}
- static class StubGrailsHibernatePersistentProperty implements GrailsHibernatePersistentProperty {
+ static class StubGrailsHibernatePersistentProperty implements HibernatePersistentProperty {
String name
StubGrailsHibernatePersistentProperty(String name) { this.name = name }
@Override String getName() { name }
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinderSpec.groovy
index 44b6b0019a..3597e0068c 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ClassPropertiesBinderSpec.groovy
@@ -2,7 +2,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.Mapping
import org.grails.orm.hibernate.cfg.domainbinding.util.PropertyFromValueCreator
import org.hibernate.boot.spi.InFlightMetadataCollector
@@ -25,9 +25,9 @@ class ClassPropertiesBinderSpec extends HibernateGormDatastoreSpec {
def mappings = Mock(InFlightMetadataCollector)
def sessionFactoryBeanName = "sessionFactory"
- def prop1 = Mock(GrailsHibernatePersistentProperty)
+ def prop1 = Mock(HibernatePersistentProperty)
prop1.getName() >> "prop1"
- def prop2 = Mock(GrailsHibernatePersistentProperty)
+ def prop2 = Mock(HibernatePersistentProperty)
prop2.getName() >> "prop2"
domainClass.getPersistentPropertiesToBind() >> [prop1, prop2]
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
index 28fc15c4e2..227cc42f4a 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/binder/ComponentUpdaterSpec.groovy
@@ -2,7 +2,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.binder
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.util.PropertyFromValueCreator
import org.hibernate.mapping.BasicValue
import org.hibernate.mapping.Column
@@ -28,8 +28,8 @@ class ComponentUpdaterSpec extends HibernateGormDatastoreSpec {
def root = new RootClass(metadataBuildingContext)
def component = new Component(metadataBuildingContext, root)
- def componentProperty = Mock(GrailsHibernatePersistentProperty)
- def currentGrailsProp = Mock(GrailsHibernatePersistentProperty)
+ def componentProperty = Mock(HibernatePersistentProperty)
+ def currentGrailsProp = Mock(HibernatePersistentProperty)
def value = new BasicValue(metadataBuildingContext, root.getTable())
def column = new Column("test_col")
value.addColumn(column)
@@ -56,8 +56,8 @@ class ComponentUpdaterSpec extends HibernateGormDatastoreSpec {
def root = new RootClass(metadataBuildingContext)
def component = new Component(metadataBuildingContext, root)
- def componentProperty = Mock(GrailsHibernatePersistentProperty)
- def currentGrailsProp = Mock(GrailsHibernatePersistentProperty)
+ def componentProperty = Mock(HibernatePersistentProperty)
+ def currentGrailsProp = Mock(HibernatePersistentProperty)
def value = new BasicValue(metadataBuildingContext, root.getTable())
def column = new Column("test_col")
column.setNullable(false)
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinderSpec.groovy
index d31069e291..535781933d 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/CollectionSecondPassBinderSpec.groovy
@@ -2,7 +2,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.secondpass
import grails.gorm.annotation.Entity
import grails.gorm.specs.HibernateGormDatastoreSpec
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernateToManyProperty
import org.hibernate.mapping.Bag
@@ -46,9 +46,9 @@ class CollectionSecondPassBinderSpec extends HibernateGormDatastoreSpec {
binder = new CollectionSecondPassBinder(mtob, pkvc, cku, botml, dkvb, uotmb, cwjtb, cfpcb, dcnf, svcb)
}
- protected GrailsHibernatePersistentProperty createTestHibernateToManyProperty(Class<?> domainClass = CSPBTestEntityWithMany, String propertyName = "items") {
+ protected HibernatePersistentProperty createTestHibernateToManyProperty(Class<?> domainClass = CSPBTestEntityWithMany, String propertyName = "items") {
PersistentEntity entity = createPersistentEntity(domainClass)
- GrailsHibernatePersistentProperty property = (GrailsHibernatePersistentProperty) entity.getPropertyByName(propertyName)
+ HibernatePersistentProperty property = (HibernatePersistentProperty) entity.getPropertyByName(propertyName)
return property
}
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy
index 335cc736c5..107e10b20c 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/ListSecondPassBinderSpec.groovy
@@ -2,7 +2,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.secondpass
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.hibernate.mapping.OneToMany
import org.hibernate.mapping.RootClass
import org.hibernate.boot.spi.MetadataBuildingContext
@@ -166,7 +166,7 @@ class ListSecondPassBinderSpec extends HibernateGormDatastoreSpec {
rootClass.setEntityName(personEntity.name)
rootClass.setTable(collector.addTable(null, null, "PERSON", null, false, binder.getMetadataBuildingContext()))
- def petsProp = personEntity.getPropertyByName("pets") as GrailsHibernatePersistentProperty
+ def petsProp = personEntity.getPropertyByName("pets") as HibernatePersistentProperty
when:
def collection = collectionBinder.bindCollection(petsProp, rootClass, collector, "")
diff --git a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy
index 063c5ac1c9..520b87c209 100644
--- a/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy
+++ b/grails-data-hibernate7/core/src/test/groovy/org/grails/orm/hibernate/cfg/domainbinding/secondpass/MapSecondPassBinderSpec.groovy
@@ -2,7 +2,7 @@ package org.grails.orm.hibernate.cfg.domainbinding.secondpass
import grails.gorm.specs.HibernateGormDatastoreSpec
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.hibernate.mapping.OneToMany
import org.hibernate.mapping.RootClass
import org.hibernate.boot.spi.MetadataBuildingContext
@@ -166,7 +166,7 @@ class MapSecondPassBinderSpec extends HibernateGormDatastoreSpec {
rootClass.setEntityName(personEntity.name)
rootClass.setTable(collector.addTable(null, null, "PERSON", null, false, binder.getMetadataBuildingContext()))
- def petsProp = personEntity.getPropertyByName("pets") as GrailsHibernatePersistentProperty
+ def petsProp = personEntity.getPropertyByName("pets") as HibernatePersistentProperty
when:
def collection = collectionBinder.bindCollection(petsProp, rootClass, collector, "")
diff --git a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GormColumnSnapshotGenerator.groovy b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GormColumnSnapshotGenerator.groovy
index bb1108a4d5..aa13d1e2dc 100644
--- a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GormColumnSnapshotGenerator.groovy
+++ b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GormColumnSnapshotGenerator.groovy
@@ -31,7 +31,7 @@ import org.grails.datastore.mapping.model.PersistentEntity
import org.grails.datastore.mapping.model.PersistentProperty
import org.grails.datastore.mapping.model.types.Association
import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentEntity
-import org.grails.orm.hibernate.cfg.domainbinding.hibernate.GrailsHibernatePersistentProperty
+import org.grails.orm.hibernate.cfg.domainbinding.hibernate.HibernatePersistentProperty
import org.grails.orm.hibernate.cfg.Mapping
import org.grails.orm.hibernate.cfg.Identity
import org.hibernate.mapping.PersistentClass
@@ -120,8 +120,8 @@ class GormColumnSnapshotGenerator implements SnapshotGenerator {
protected PersistentProperty resolveGormProperty(GrailsHibernatePersistentEntity gpe, String columnName) {
for (PersistentProperty prop : gpe.hibernatePersistentProperties) {
String propColumnName = null
- if (prop instanceof GrailsHibernatePersistentProperty) {
- propColumnName = ((GrailsHibernatePersistentProperty) prop).mappedColumnName
+ if (prop instanceof HibernatePersistentProperty) {
+ propColumnName = ((HibernatePersistentProperty) prop).mappedColumnName
}
if (propColumnName == null) {
propColumnName = prop.name