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/04/01 15:56:44 UTC
(grails-core) branch 8.0.x-hibernate7 updated: chore: fix SpotBugs violations in grails-data-hibernate7-dbmigration
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
The following commit(s) were added to refs/heads/8.0.x-hibernate7 by this push:
new 64310a7fc5 chore: fix SpotBugs violations in grails-data-hibernate7-dbmigration
64310a7fc5 is described below
commit 64310a7fc53e02085bf0b7429c9ebc9dadfc9c88
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Wed Apr 1 10:48:37 2026 -0500
chore: fix SpotBugs violations in grails-data-hibernate7-dbmigration
- Rename Liquibase extension classes with 'Hibernate' prefix to avoid shadowing superclass simple names (fixes NM_SAME_SIMPLE_NAME_AS_SUPERCLASS).
- Update service registration files and test sources to reflect class renames.
- Fix NP_NONNULL_RETURN_VIOLATION in HibernateConnection by throwing SQLFeatureNotSupportedException instead of returning null.
- Fix DM_DEFAULT_ENCODING by specifying UTF-8/StandardCharsets.UTF_8 in multiple files.
- Fix potential NP_NULL_ON_SOME_PATH in DatabaseMigrationCommand.groovy with explicit null checks.
---
.../command/DbmListLocksCommand.groovy | 2 +-
.../command/DatabaseMigrationCommand.groovy | 14 +++++++++-----
.../liquibase/GroovyChangeLogSerializer.groovy | 2 +-
.../GroovyDiffToChangeLogCommandStep.groovy | 2 +-
.../GroovyGenerateChangeLogCommandStep.groovy | 2 +-
.../database/connection/HibernateConnection.java | 18 ++++++++++--------
...va => HibernateChangedColumnChangeGenerator.java} | 2 +-
...> HibernateChangedForeignKeyChangeGenerator.java} | 2 +-
...> HibernateChangedPrimaryKeyChangeGenerator.java} | 2 +-
... => HibernateChangedSequenceChangeGenerator.java} | 2 +-
...rnateChangedUniqueConstraintChangeGenerator.java} | 2 +-
... => HibernateMissingSequenceChangeGenerator.java} | 2 +-
... => HibernateUnexpectedIndexChangeGenerator.java} | 2 +-
...r.java => HibernateCatalogSnapshotGenerator.java} | 4 ++--
...or.java => HibernateColumnSnapshotGenerator.java} | 4 ++--
...ava => HibernateForeignKeySnapshotGenerator.java} | 4 ++--
...tor.java => HibernateIndexSnapshotGenerator.java} | 4 ++--
...ava => HibernatePrimaryKeySnapshotGenerator.java} | 4 ++--
...or.java => HibernateSchemaSnapshotGenerator.java} | 4 ++--
....java => HibernateSequenceSnapshotGenerator.java} | 4 ++--
...tor.java => HibernateTableSnapshotGenerator.java} | 4 ++--
... HibernateUniqueConstraintSnapshotGenerator.java} | 7 ++++---
...ator.java => HibernateViewSnapshotGenerator.java} | 4 ++--
.../liquibase.diff.output.changelog.ChangeGenerator | 14 +++++++-------
.../services/liquibase.snapshot.SnapshotGenerator | 20 ++++++++++----------
...HibernateChangedColumnChangeGeneratorSpec.groovy} | 4 ++--
...bernateChangedSequenceChangeGeneratorSpec.groovy} | 4 ++--
... => HibernateCatalogSnapshotGeneratorSpec.groovy} | 4 ++--
... HibernateForeignKeySnapshotGeneratorSpec.groovy} | 4 ++--
...vy => HibernateIndexSnapshotGeneratorSpec.groovy} | 4 ++--
... HibernatePrimaryKeySnapshotGeneratorSpec.groovy} | 4 ++--
...y => HibernateSchemaSnapshotGeneratorSpec.groovy} | 4 ++--
...=> HibernateSequenceSnapshotGeneratorSpec.groovy} | 4 ++--
...vy => HibernateTableSnapshotGeneratorSpec.groovy} | 4 ++--
...nateUniqueConstraintSnapshotGeneratorSpec.groovy} | 4 ++--
...ovy => HibernateViewSnapshotGeneratorSpec.groovy} | 4 ++--
...ava => HibernateColumnSnapshotGeneratorTest.java} | 4 ++--
37 files changed, 93 insertions(+), 86 deletions(-)
diff --git a/grails-data-hibernate7/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmListLocksCommand.groovy b/grails-data-hibernate7/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmListLocksCommand.groovy
index c53d1c9af7..b0895e9a1e 100644
--- a/grails-data-hibernate7/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmListLocksCommand.groovy
+++ b/grails-data-hibernate7/dbmigration/grails-app/commands/org/grails/plugins/databasemigration/command/DbmListLocksCommand.groovy
@@ -52,7 +52,7 @@ class DbmListLocksCommand implements ApplicationCommand, ApplicationContextDatab
outputFile.parentFile.mkdirs()
}
outputFile.withOutputStream { OutputStream out ->
- closure.call(new PrintStream(out))
+ closure.call(new PrintStream(out, false, "UTF-8"))
}
}
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy
index a397467fda..3311b7275c 100644
--- a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy
+++ b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy
@@ -18,6 +18,7 @@
*/
package org.grails.plugins.databasemigration.command
+import java.nio.charset.StandardCharsets
import java.nio.file.Path
import java.text.DateFormat
import java.text.ParseException
@@ -149,19 +150,22 @@ trait DatabaseMigrationCommand {
return (Map<String, String>) (config.getProperty(dataSourceName, Map) ?: [:])
}
- def dataSources = config.getProperty('dataSources', Map) ?: [:]
- if (!dataSources) {
+ Map dataSourcesMap = (Map) config.getProperty('dataSources', Map)
+ if (dataSourcesMap == null) {
+ dataSourcesMap = [:]
+ }
+ if (dataSourcesMap.isEmpty()) {
def defaultDataSource = config.getProperty('dataSource', Map)
if (defaultDataSource) {
- dataSources['dataSource'] = defaultDataSource
+ dataSourcesMap['dataSource'] = defaultDataSource
}
}
- return (Map<String, String>) dataSources.get(dataSourceName)
+ return (Map<String, String>) dataSourcesMap.get(dataSourceName)
}
void withFileOrSystemOutWriter(String filename, @ClosureParams(value = SimpleType, options = 'java.io.Writer') Closure closure) {
if (!filename) {
- closure.call(new PrintWriter(System.out))
+ closure.call(new PrintWriter(new OutputStreamWriter(System.out, StandardCharsets.UTF_8)))
return
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy
index 3e326ddd86..5ddd77264d 100644
--- a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy
+++ b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy
@@ -35,7 +35,7 @@ class GroovyChangeLogSerializer implements ChangeLogSerializer {
<T extends ChangeLogChild> void write(List<T> changesets, OutputStream out) throws IOException {
def xmlOutputStrem = new ByteArrayOutputStream()
xmlChangeLogSerializer.write(changesets, xmlOutputStrem)
- out << ChangelogXml2Groovy.convert(xmlOutputStrem.toString())
+ out << ChangelogXml2Groovy.convert(xmlOutputStrem.toString("UTF-8"))
}
@Override
diff --git a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy
index 84c7b7027e..bd3e0f047b 100644
--- a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy
+++ b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyDiffToChangeLogCommandStep.groovy
@@ -52,7 +52,7 @@ class GroovyDiffToChangeLogCommandStep extends DiffChangelogCommandStep {
DiffResult diffResult = diffCommandStep.createDiffResult(resultsBuilder)
- PrintStream outputStream = new PrintStream(resultsBuilder.getOutputStream())
+ PrintStream outputStream = new PrintStream(resultsBuilder.getOutputStream(), false, "UTF-8")
ObjectQuotingStrategy originalStrategy = referenceDatabase.getObjectQuotingStrategy()
diff --git a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy
index 4247f69ea6..a54341af96 100644
--- a/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy
+++ b/grails-data-hibernate7/dbmigration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyGenerateChangeLogCommandStep.groovy
@@ -79,7 +79,7 @@ class GroovyGenerateChangeLogCommandStep extends GenerateChangelogCommandStep {
if (GrailsStringUtils.trimToNull(changeLogFile) != null) {
changeLogWriter.print(changeLogFile, ChangeLogSerializerFactory.instance.getSerializer(changeLogFile))
} else {
- PrintStream outputStream = new PrintStream(resultsBuilder.getOutputStream())
+ PrintStream outputStream = new PrintStream(resultsBuilder.getOutputStream(), false, "UTF-8")
try {
changeLogWriter.print(outputStream, ChangeLogSerializerFactory.instance.getSerializer('groovy'))
} finally {
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/database/connection/HibernateConnection.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/database/connection/HibernateConnection.java
index 85b51642a5..23240bd2bf 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/database/connection/HibernateConnection.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/database/connection/HibernateConnection.java
@@ -30,6 +30,8 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.NClob;
import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Savepoint;
@@ -133,23 +135,23 @@ public class HibernateConnection implements Connection {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Override
- public Statement createStatement() {
- return null;
+ public Statement createStatement() throws SQLException {
+ throw new SQLFeatureNotSupportedException();
}
@Override
- public PreparedStatement prepareStatement(String sql) {
- return null;
+ public PreparedStatement prepareStatement(String sql) throws SQLException {
+ throw new SQLFeatureNotSupportedException();
}
@Override
- public CallableStatement prepareCall(String sql) {
- return null;
+ public CallableStatement prepareCall(String sql) throws SQLException {
+ throw new SQLFeatureNotSupportedException();
}
@Override
- public String nativeSQL(String sql) {
- return null;
+ public String nativeSQL(String sql) throws SQLException {
+ throw new SQLFeatureNotSupportedException();
}
@Override
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedColumnChangeGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedColumnChangeGenerator.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedColumnChangeGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedColumnChangeGenerator.java
index 17d5f6f65b..88a71cbc1c 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedColumnChangeGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedColumnChangeGenerator.java
@@ -38,7 +38,7 @@ import liquibase.structure.core.DataType;
* Hibernate and database types tend to look different even though they are not.
* The only change that we are handling it size change, and even for this one there are exceptions.
*/
-public class ChangedColumnChangeGenerator extends liquibase.diff.output.changelog.core.ChangedColumnChangeGenerator {
+public class HibernateChangedColumnChangeGenerator extends liquibase.diff.output.changelog.core.ChangedColumnChangeGenerator {
private static final List<String> TYPES_TO_IGNORE_SIZE = List.of("TIMESTAMP", "TIME");
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedForeignKeyChangeGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedForeignKeyChangeGenerator.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedForeignKeyChangeGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedForeignKeyChangeGenerator.java
index 757e55a3b8..3b91abd09b 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedForeignKeyChangeGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedForeignKeyChangeGenerator.java
@@ -31,7 +31,7 @@ import liquibase.structure.core.ForeignKey;
* Hibernate doesn't know about all the variations that occur with foreign keys but just whether the FK exists or not.
* To prevent changing customized foreign keys, we suppress all foreign key changes from hibernate.
*/
-public class ChangedForeignKeyChangeGenerator
+public class HibernateChangedForeignKeyChangeGenerator
extends liquibase.diff.output.changelog.core.ChangedForeignKeyChangeGenerator {
@Override
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedPrimaryKeyChangeGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedPrimaryKeyChangeGenerator.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedPrimaryKeyChangeGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedPrimaryKeyChangeGenerator.java
index 99fda17c1f..768dfad21d 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedPrimaryKeyChangeGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedPrimaryKeyChangeGenerator.java
@@ -31,7 +31,7 @@ import liquibase.structure.core.PrimaryKey;
* Hibernate doesn't know about all the variations that occur with primary keys, especially backing index stuff.
* To prevent changing customized primary keys, we suppress this kind of changes from hibernate side.
*/
-public class ChangedPrimaryKeyChangeGenerator
+public class HibernateChangedPrimaryKeyChangeGenerator
extends liquibase.diff.output.changelog.core.ChangedPrimaryKeyChangeGenerator {
@Override
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedSequenceChangeGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedSequenceChangeGenerator.java
similarity index 98%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedSequenceChangeGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedSequenceChangeGenerator.java
index 1baffcea9d..fdb2921663 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedSequenceChangeGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedSequenceChangeGenerator.java
@@ -35,7 +35,7 @@ import liquibase.structure.core.Sequence;
* Hibernate manages sequences only by the name, startValue and incrementBy fields.
* However, non-hibernate databases might return default values for other fields triggering false positives.
*/
-public class ChangedSequenceChangeGenerator
+public class HibernateChangedSequenceChangeGenerator
extends liquibase.diff.output.changelog.core.ChangedSequenceChangeGenerator {
private static final String FIELD_NAME = "name";
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedUniqueConstraintChangeGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedUniqueConstraintChangeGenerator.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedUniqueConstraintChangeGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedUniqueConstraintChangeGenerator.java
index 8a5ee8b4c8..d85bbea993 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/ChangedUniqueConstraintChangeGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedUniqueConstraintChangeGenerator.java
@@ -32,7 +32,7 @@ import liquibase.structure.core.UniqueConstraint;
* so we suppress all unique constraint changes based on unique constraints.
*
*/
-public class ChangedUniqueConstraintChangeGenerator
+public class HibernateChangedUniqueConstraintChangeGenerator
extends liquibase.diff.output.changelog.core.ChangedUniqueConstraintChangeGenerator {
@Override
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/MissingSequenceChangeGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateMissingSequenceChangeGenerator.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/MissingSequenceChangeGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateMissingSequenceChangeGenerator.java
index dc531f8063..d3e360f27e 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/MissingSequenceChangeGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateMissingSequenceChangeGenerator.java
@@ -26,7 +26,7 @@ import liquibase.ext.hibernate.database.HibernateDatabase;
import liquibase.structure.DatabaseObject;
import liquibase.structure.core.Sequence;
-public class MissingSequenceChangeGenerator
+public class HibernateMissingSequenceChangeGenerator
extends liquibase.diff.output.changelog.core.MissingSequenceChangeGenerator {
@Override
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/UnexpectedIndexChangeGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateUnexpectedIndexChangeGenerator.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/UnexpectedIndexChangeGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateUnexpectedIndexChangeGenerator.java
index d57e83ca7d..a839bdbf95 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/UnexpectedIndexChangeGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/diff/HibernateUnexpectedIndexChangeGenerator.java
@@ -30,7 +30,7 @@ import liquibase.structure.core.Index;
* Indexes tend to be added in the database that don't correspond to what is in Hibernate, so we suppress all dropIndex changes
* based on indexes defined in the database but not in hibernate.
*/
-public class UnexpectedIndexChangeGenerator
+public class HibernateUnexpectedIndexChangeGenerator
extends liquibase.diff.output.changelog.core.UnexpectedIndexChangeGenerator {
@Override
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/CatalogSnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateCatalogSnapshotGenerator.java
similarity index 93%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/CatalogSnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateCatalogSnapshotGenerator.java
index 6cb33f4352..644f1e2c0c 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/CatalogSnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateCatalogSnapshotGenerator.java
@@ -28,9 +28,9 @@ import liquibase.structure.core.Catalog;
/**
* Hibernate doesn't really support Catalogs, so just return the passed example back as if it had all the info it needed.
*/
-public class CatalogSnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateCatalogSnapshotGenerator extends HibernateSnapshotGenerator {
- public CatalogSnapshotGenerator() {
+ public HibernateCatalogSnapshotGenerator() {
super(Catalog.class);
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ColumnSnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateColumnSnapshotGenerator.java
similarity index 99%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ColumnSnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateColumnSnapshotGenerator.java
index 5155923877..42c402bf68 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ColumnSnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateColumnSnapshotGenerator.java
@@ -52,7 +52,7 @@ import org.hibernate.type.SqlTypes;
* Columns are snapshotted along with Tables in {@link TableSnapshotGenerator} but this class needs to be here to keep the default ColumnSnapshotGenerator from running.
* Ideally the column logic would be moved out of the TableSnapshotGenerator to better work in situations where the object types to snapshot are being controlled, but that is not the case yet.
*/
-public class ColumnSnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateColumnSnapshotGenerator extends HibernateSnapshotGenerator {
private static final String SQL_TIMEZONE_SUFFIX = "with time zone";
private static final String LIQUIBASE_TIMEZONE_SUFFIX = "with timezone";
@@ -60,7 +60,7 @@ public class ColumnSnapshotGenerator extends HibernateSnapshotGenerator {
private static final Pattern pattern =
Pattern.compile("([^\\(]*)\\s*\\(?\\s*(\\d*)?\\s*,?\\s*(\\d*)?\\s*([^\\(]*?)\\)?");
- public ColumnSnapshotGenerator() {
+ public HibernateColumnSnapshotGenerator() {
super(Column.class, Table.class);
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ForeignKeySnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateForeignKeySnapshotGenerator.java
similarity index 96%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ForeignKeySnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateForeignKeySnapshotGenerator.java
index b1d5fb1675..17fccf880e 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ForeignKeySnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateForeignKeySnapshotGenerator.java
@@ -27,9 +27,9 @@ import liquibase.structure.core.ForeignKey;
import liquibase.structure.core.Table;
import org.hibernate.mapping.Column;
-public class ForeignKeySnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateForeignKeySnapshotGenerator extends HibernateSnapshotGenerator {
- public ForeignKeySnapshotGenerator() {
+ public HibernateForeignKeySnapshotGenerator() {
super(ForeignKey.class, new Class[] {Table.class});
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/IndexSnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateIndexSnapshotGenerator.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/IndexSnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateIndexSnapshotGenerator.java
index 98d53dfb50..94910a60a9 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/IndexSnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateIndexSnapshotGenerator.java
@@ -31,13 +31,13 @@ import liquibase.structure.core.Relation;
import liquibase.structure.core.Table;
import liquibase.structure.core.UniqueConstraint;
-public class IndexSnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateIndexSnapshotGenerator extends HibernateSnapshotGenerator {
private static final String HIBERNATE_ORDER_ASC = "asc";
private static final String HIBERNATE_ORDER_DESC = "desc";
private static final int SINGLE_COLUMN = 1;
- public IndexSnapshotGenerator() {
+ public HibernateIndexSnapshotGenerator() {
super(Index.class, Table.class, ForeignKey.class, UniqueConstraint.class);
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/PrimaryKeySnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernatePrimaryKeySnapshotGenerator.java
similarity index 96%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/PrimaryKeySnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernatePrimaryKeySnapshotGenerator.java
index 257648771a..be41789c16 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/PrimaryKeySnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernatePrimaryKeySnapshotGenerator.java
@@ -30,13 +30,13 @@ import liquibase.structure.core.PrimaryKey;
import liquibase.structure.core.Table;
import org.hibernate.sql.Alias;
-public class PrimaryKeySnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernatePrimaryKeySnapshotGenerator extends HibernateSnapshotGenerator {
private static final int PK_NAME_LENGTH = 63;
private static final String PK_NAME_SUFFIX = "PK";
private static final Alias PK_NAME_ALIAS = new Alias(PK_NAME_LENGTH, PK_NAME_SUFFIX);
- public PrimaryKeySnapshotGenerator() {
+ public HibernatePrimaryKeySnapshotGenerator() {
super(PrimaryKey.class, new Class[] {Table.class});
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/SchemaSnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSchemaSnapshotGenerator.java
similarity index 94%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/SchemaSnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSchemaSnapshotGenerator.java
index 8bcc352d17..1e9aef4ef1 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/SchemaSnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSchemaSnapshotGenerator.java
@@ -29,9 +29,9 @@ import liquibase.structure.core.Schema;
/**
* Hibernate doesn't really support Schemas, so just return the passed example back as if it had all the info it needed.
*/
-public class SchemaSnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateSchemaSnapshotGenerator extends HibernateSnapshotGenerator {
- public SchemaSnapshotGenerator() {
+ public HibernateSchemaSnapshotGenerator() {
super(Schema.class, new Class[] {Catalog.class});
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/SequenceSnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSequenceSnapshotGenerator.java
similarity index 95%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/SequenceSnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSequenceSnapshotGenerator.java
index 428ca630d2..850fda9688 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/SequenceSnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSequenceSnapshotGenerator.java
@@ -32,9 +32,9 @@ import liquibase.structure.core.Sequence;
/**
* Sequence snapshots are not yet supported, but this class needs to be implemented in order to prevent the default SequenceSnapshotGenerator from running.
*/
-public class SequenceSnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateSequenceSnapshotGenerator extends HibernateSnapshotGenerator {
- public SequenceSnapshotGenerator() {
+ public HibernateSequenceSnapshotGenerator() {
super(Sequence.class, Schema.class);
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/TableSnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateTableSnapshotGenerator.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/TableSnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateTableSnapshotGenerator.java
index a8bcbe929d..dd86246709 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/TableSnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateTableSnapshotGenerator.java
@@ -31,9 +31,9 @@ import org.hibernate.boot.model.relational.Namespace;
import org.hibernate.boot.spi.MetadataImplementor;
import org.hibernate.mapping.ForeignKey;
-public class TableSnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateTableSnapshotGenerator extends HibernateSnapshotGenerator {
- public TableSnapshotGenerator() {
+ public HibernateTableSnapshotGenerator() {
super(Table.class, Schema.class);
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateUniqueConstraintSnapshotGenerator.java
similarity index 96%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateUniqueConstraintSnapshotGenerator.java
index 8579d5ef7f..ab275afa9e 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateUniqueConstraintSnapshotGenerator.java
@@ -19,6 +19,7 @@
package liquibase.ext.hibernate.snapshot;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Locale;
@@ -36,7 +37,7 @@ import liquibase.structure.core.Table;
import liquibase.structure.core.UniqueConstraint;
import org.hibernate.HibernateException;
-public class UniqueConstraintSnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateUniqueConstraintSnapshotGenerator extends HibernateSnapshotGenerator {
private static final int MAX_NAME_LENGTH = 64;
private static final int SHORTENED_NAME_LENGTH = 63;
@@ -45,7 +46,7 @@ public class UniqueConstraintSnapshotGenerator extends HibernateSnapshotGenerato
private static final String SEARCH_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
private static final Random RANDOM = new Random();
- public UniqueConstraintSnapshotGenerator() {
+ public HibernateUniqueConstraintSnapshotGenerator() {
super(UniqueConstraint.class, Table.class);
}
@@ -118,7 +119,7 @@ public class UniqueConstraintSnapshotGenerator extends HibernateSnapshotGenerato
try {
MessageDigest md = MessageDigest.getInstance("MD5");
md.reset();
- md.update(s.getBytes());
+ md.update(s.getBytes(StandardCharsets.UTF_8));
byte[] digest = md.digest();
BigInteger bigInt = new BigInteger(1, digest);
// By converting to base 35 (full alphanumeric), we guarantee
diff --git a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ViewSnapshotGenerator.java b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateViewSnapshotGenerator.java
similarity index 94%
rename from grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ViewSnapshotGenerator.java
rename to grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateViewSnapshotGenerator.java
index 357487228b..bed4f0e64d 100644
--- a/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/ViewSnapshotGenerator.java
+++ b/grails-data-hibernate7/dbmigration/src/main/java/liquibase/ext/hibernate/snapshot/HibernateViewSnapshotGenerator.java
@@ -29,9 +29,9 @@ import liquibase.structure.core.View;
/**
* View snapshots are not supported from hibernate, but this class needs to be implemented in order to prevent the default ViewSnapshotGenerator from running.
*/
-public class ViewSnapshotGenerator extends HibernateSnapshotGenerator {
+public class HibernateViewSnapshotGenerator extends HibernateSnapshotGenerator {
- public ViewSnapshotGenerator() {
+ public HibernateViewSnapshotGenerator() {
super(View.class, new Class[] {Schema.class});
}
diff --git a/grails-data-hibernate7/dbmigration/src/main/resources/META-INF/services/liquibase.diff.output.changelog.ChangeGenerator b/grails-data-hibernate7/dbmigration/src/main/resources/META-INF/services/liquibase.diff.output.changelog.ChangeGenerator
index 7025ee170a..575541b292 100644
--- a/grails-data-hibernate7/dbmigration/src/main/resources/META-INF/services/liquibase.diff.output.changelog.ChangeGenerator
+++ b/grails-data-hibernate7/dbmigration/src/main/resources/META-INF/services/liquibase.diff.output.changelog.ChangeGenerator
@@ -1,7 +1,7 @@
-liquibase.ext.hibernate.diff.ChangedColumnChangeGenerator
-liquibase.ext.hibernate.diff.ChangedForeignKeyChangeGenerator
-liquibase.ext.hibernate.diff.ChangedPrimaryKeyChangeGenerator
-liquibase.ext.hibernate.diff.ChangedSequenceChangeGenerator
-liquibase.ext.hibernate.diff.ChangedUniqueConstraintChangeGenerator
-liquibase.ext.hibernate.diff.MissingSequenceChangeGenerator
-liquibase.ext.hibernate.diff.UnexpectedIndexChangeGenerator
+liquibase.ext.hibernate.diff.HibernateChangedColumnChangeGenerator
+liquibase.ext.hibernate.diff.HibernateChangedForeignKeyChangeGenerator
+liquibase.ext.hibernate.diff.HibernateChangedPrimaryKeyChangeGenerator
+liquibase.ext.hibernate.diff.HibernateChangedSequenceChangeGenerator
+liquibase.ext.hibernate.diff.HibernateChangedUniqueConstraintChangeGenerator
+liquibase.ext.hibernate.diff.HibernateMissingSequenceChangeGenerator
+liquibase.ext.hibernate.diff.HibernateUnexpectedIndexChangeGenerator
diff --git a/grails-data-hibernate7/dbmigration/src/main/resources/META-INF/services/liquibase.snapshot.SnapshotGenerator b/grails-data-hibernate7/dbmigration/src/main/resources/META-INF/services/liquibase.snapshot.SnapshotGenerator
index 614c4a7f44..e36ebd10d4 100644
--- a/grails-data-hibernate7/dbmigration/src/main/resources/META-INF/services/liquibase.snapshot.SnapshotGenerator
+++ b/grails-data-hibernate7/dbmigration/src/main/resources/META-INF/services/liquibase.snapshot.SnapshotGenerator
@@ -1,11 +1,11 @@
-liquibase.ext.hibernate.snapshot.CatalogSnapshotGenerator
-liquibase.ext.hibernate.snapshot.ColumnSnapshotGenerator
-liquibase.ext.hibernate.snapshot.ForeignKeySnapshotGenerator
-liquibase.ext.hibernate.snapshot.IndexSnapshotGenerator
-liquibase.ext.hibernate.snapshot.PrimaryKeySnapshotGenerator
-liquibase.ext.hibernate.snapshot.SchemaSnapshotGenerator
-liquibase.ext.hibernate.snapshot.SequenceSnapshotGenerator
-liquibase.ext.hibernate.snapshot.TableSnapshotGenerator
-liquibase.ext.hibernate.snapshot.UniqueConstraintSnapshotGenerator
-liquibase.ext.hibernate.snapshot.ViewSnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateCatalogSnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateColumnSnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateForeignKeySnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateIndexSnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernatePrimaryKeySnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateSchemaSnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateSequenceSnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateTableSnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateUniqueConstraintSnapshotGenerator
+liquibase.ext.hibernate.snapshot.HibernateViewSnapshotGenerator
org.grails.plugins.databasemigration.liquibase.GormColumnSnapshotGenerator
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/ChangedColumnChangeGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/HibernateChangedColumnChangeGeneratorSpec.groovy
similarity index 96%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/ChangedColumnChangeGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/HibernateChangedColumnChangeGeneratorSpec.groovy
index 753e1d3d69..5f837928a9 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/ChangedColumnChangeGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/HibernateChangedColumnChangeGeneratorSpec.groovy
@@ -30,9 +30,9 @@ import liquibase.structure.core.DataType
import liquibase.structure.core.Table
import spock.lang.Specification
-class ChangedColumnChangeGeneratorSpec extends Specification {
+class HibernateChangedColumnChangeGeneratorSpec extends Specification {
- ChangedColumnChangeGenerator generator = new ChangedColumnChangeGenerator()
+ HibernateChangedColumnChangeGenerator generator = new HibernateChangedColumnChangeGenerator()
def "getPriority returns correct priority for Column and others"() {
expect:
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/ChangedSequenceChangeGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/HibernateChangedSequenceChangeGeneratorSpec.groovy
similarity index 96%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/ChangedSequenceChangeGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/HibernateChangedSequenceChangeGeneratorSpec.groovy
index 8d650f063e..b5ac661b96 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/ChangedSequenceChangeGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/diff/HibernateChangedSequenceChangeGeneratorSpec.groovy
@@ -27,9 +27,9 @@ import liquibase.ext.hibernate.database.HibernateDatabase
import liquibase.structure.core.Sequence
import spock.lang.Specification
-class ChangedSequenceChangeGeneratorSpec extends Specification {
+class HibernateChangedSequenceChangeGeneratorSpec extends Specification {
- ChangedSequenceChangeGenerator generator = new ChangedSequenceChangeGenerator()
+ HibernateChangedSequenceChangeGenerator generator = new HibernateChangedSequenceChangeGenerator()
def "getPriority returns correct priority for Sequence and others"() {
expect:
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/CatalogSnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateCatalogSnapshotGeneratorSpec.groovy
similarity index 87%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/CatalogSnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateCatalogSnapshotGeneratorSpec.groovy
index f7a082446c..8ee5c614c7 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/CatalogSnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateCatalogSnapshotGeneratorSpec.groovy
@@ -21,9 +21,9 @@ package liquibase.ext.hibernate.snapshot
import com.example.ejb3.auction.AuctionItem
import liquibase.structure.core.Catalog
-class CatalogSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernateCatalogSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- CatalogSnapshotGenerator generator = new CatalogSnapshotGenerator()
+ HibernateCatalogSnapshotGenerator generator = new HibernateCatalogSnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/ForeignKeySnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateForeignKeySnapshotGeneratorSpec.groovy
similarity index 88%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/ForeignKeySnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateForeignKeySnapshotGeneratorSpec.groovy
index 399f3b90c6..849414bda7 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/ForeignKeySnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateForeignKeySnapshotGeneratorSpec.groovy
@@ -21,9 +21,9 @@ package liquibase.ext.hibernate.snapshot
import liquibase.structure.core.ForeignKey
import liquibase.structure.core.Table
-class ForeignKeySnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernateForeignKeySnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- ForeignKeySnapshotGenerator generator = new ForeignKeySnapshotGenerator()
+ HibernateForeignKeySnapshotGenerator generator = new HibernateForeignKeySnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/IndexSnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateIndexSnapshotGeneratorSpec.groovy
similarity index 90%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/IndexSnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateIndexSnapshotGeneratorSpec.groovy
index f5039090a4..92944f29a7 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/IndexSnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateIndexSnapshotGeneratorSpec.groovy
@@ -22,9 +22,9 @@ import grails.gorm.annotation.Entity
import liquibase.structure.core.Index as LiquibaseIndex
import liquibase.structure.core.Table as LiquibaseTable
-class IndexSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernateIndexSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- IndexSnapshotGenerator generator = new IndexSnapshotGenerator()
+ HibernateIndexSnapshotGenerator generator = new HibernateIndexSnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/PrimaryKeySnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernatePrimaryKeySnapshotGeneratorSpec.groovy
similarity index 88%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/PrimaryKeySnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernatePrimaryKeySnapshotGeneratorSpec.groovy
index 87ae95410b..cbccc2c10c 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/PrimaryKeySnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernatePrimaryKeySnapshotGeneratorSpec.groovy
@@ -21,9 +21,9 @@ package liquibase.ext.hibernate.snapshot
import liquibase.structure.core.PrimaryKey
import liquibase.structure.core.Table
-class PrimaryKeySnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernatePrimaryKeySnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- PrimaryKeySnapshotGenerator generator = new PrimaryKeySnapshotGenerator()
+ HibernatePrimaryKeySnapshotGenerator generator = new HibernatePrimaryKeySnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/SchemaSnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateSchemaSnapshotGeneratorSpec.groovy
similarity index 87%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/SchemaSnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateSchemaSnapshotGeneratorSpec.groovy
index bc9158e57b..f506002e72 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/SchemaSnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateSchemaSnapshotGeneratorSpec.groovy
@@ -21,9 +21,9 @@ package liquibase.ext.hibernate.snapshot
import com.example.ejb3.auction.AuctionItem
import liquibase.structure.core.Schema
-class SchemaSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernateSchemaSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- SchemaSnapshotGenerator generator = new SchemaSnapshotGenerator()
+ HibernateSchemaSnapshotGenerator generator = new HibernateSchemaSnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/SequenceSnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateSequenceSnapshotGeneratorSpec.groovy
similarity index 90%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/SequenceSnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateSequenceSnapshotGeneratorSpec.groovy
index d1a0755c5d..bc09c181cc 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/SequenceSnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateSequenceSnapshotGeneratorSpec.groovy
@@ -22,9 +22,9 @@ import grails.gorm.annotation.Entity
import liquibase.structure.core.Schema
import liquibase.structure.core.Sequence as LiquibaseSequence
-class SequenceSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernateSequenceSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- SequenceSnapshotGenerator generator = new SequenceSnapshotGenerator()
+ HibernateSequenceSnapshotGenerator generator = new HibernateSequenceSnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/TableSnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateTableSnapshotGeneratorSpec.groovy
similarity index 90%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/TableSnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateTableSnapshotGeneratorSpec.groovy
index d7fe2ab294..ecb9feeabb 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/TableSnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateTableSnapshotGeneratorSpec.groovy
@@ -21,9 +21,9 @@ package liquibase.ext.hibernate.snapshot
import liquibase.structure.core.Schema
import liquibase.structure.core.Table
-class TableSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernateTableSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- TableSnapshotGenerator generator = new TableSnapshotGenerator()
+ HibernateTableSnapshotGenerator generator = new HibernateTableSnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateUniqueConstraintSnapshotGeneratorSpec.groovy
similarity index 88%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateUniqueConstraintSnapshotGeneratorSpec.groovy
index 5e9ae89c57..87183f2855 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/UniqueConstraintSnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateUniqueConstraintSnapshotGeneratorSpec.groovy
@@ -22,9 +22,9 @@ import grails.gorm.annotation.Entity
import liquibase.structure.core.Table
import liquibase.structure.core.UniqueConstraint
-class UniqueConstraintSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernateUniqueConstraintSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- UniqueConstraintSnapshotGenerator generator = new UniqueConstraintSnapshotGenerator()
+ HibernateUniqueConstraintSnapshotGenerator generator = new HibernateUniqueConstraintSnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/ViewSnapshotGeneratorSpec.groovy b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateViewSnapshotGeneratorSpec.groovy
similarity index 88%
rename from grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/ViewSnapshotGeneratorSpec.groovy
rename to grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateViewSnapshotGeneratorSpec.groovy
index 768618698e..445d1be274 100644
--- a/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/ViewSnapshotGeneratorSpec.groovy
+++ b/grails-data-hibernate7/dbmigration/src/test/groovy/liquibase/ext/hibernate/snapshot/HibernateViewSnapshotGeneratorSpec.groovy
@@ -22,9 +22,9 @@ import com.example.ejb3.auction.AuctionItem
import liquibase.exception.DatabaseException
import liquibase.structure.core.View
-class ViewSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
+class HibernateViewSnapshotGeneratorSpec extends HibernateSnapshotIntegrationSpec {
- ViewSnapshotGenerator generator = new ViewSnapshotGenerator()
+ HibernateViewSnapshotGenerator generator = new HibernateViewSnapshotGenerator()
@Override
List<Class> getEntityClasses() {
diff --git a/grails-data-hibernate7/dbmigration/src/test/java/liquibase/ext/hibernate/snapshot/ColumnSnapshotGeneratorTest.java b/grails-data-hibernate7/dbmigration/src/test/java/liquibase/ext/hibernate/snapshot/HibernateColumnSnapshotGeneratorTest.java
similarity index 97%
rename from grails-data-hibernate7/dbmigration/src/test/java/liquibase/ext/hibernate/snapshot/ColumnSnapshotGeneratorTest.java
rename to grails-data-hibernate7/dbmigration/src/test/java/liquibase/ext/hibernate/snapshot/HibernateColumnSnapshotGeneratorTest.java
index 9d508074d8..6c034c0227 100644
--- a/grails-data-hibernate7/dbmigration/src/test/java/liquibase/ext/hibernate/snapshot/ColumnSnapshotGeneratorTest.java
+++ b/grails-data-hibernate7/dbmigration/src/test/java/liquibase/ext/hibernate/snapshot/HibernateColumnSnapshotGeneratorTest.java
@@ -27,11 +27,11 @@ import java.sql.Types;
import static org.junit.Assert.*;
-public class ColumnSnapshotGeneratorTest {
+public class HibernateColumnSnapshotGeneratorTest {
@Test
public void toDataType() throws DatabaseException {
- ColumnSnapshotGenerator columnSnapshotGenerator = new ColumnSnapshotGenerator();
+ HibernateColumnSnapshotGenerator columnSnapshotGenerator = new HibernateColumnSnapshotGenerator();
DataType varchar = columnSnapshotGenerator.toDataType("varchar(255)", Types.VARCHAR);
assertEquals("varchar", varchar.getTypeName());
assertEquals(255, varchar.getColumnSize().intValue());