diff --git a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java index 577687fa6f..74d8080101 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java @@ -18,12 +18,12 @@ import org.hibernate.exception.spi.ViolatedConstraintNameExtractor; */ @Deprecated public class SQLStateConverter extends StandardSQLExceptionConverter implements SQLExceptionConverter { - public SQLStateConverter(final ViolatedConstraintNameExtractor extracter) { + public SQLStateConverter(final ViolatedConstraintNameExtractor extractor) { super(); final ConversionContext conversionContext = new ConversionContext() { @Override public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { - return extracter; + return extractor; } }; addDelegate( new SQLStateConversionDelegate( conversionContext ) ); diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/MultipleLinesSqlCommandExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/MultipleLinesSqlCommandExtractor.java index 49960b2eeb..51bee28171 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/MultipleLinesSqlCommandExtractor.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/MultipleLinesSqlCommandExtractor.java @@ -6,7 +6,7 @@ */ package org.hibernate.tool.hbm2ddl; -import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtracter; +import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; /** * Class responsible for extracting SQL statements from import script. Supports instructions/comments and quoted @@ -14,8 +14,8 @@ import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtracter; * * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) * - * @deprecated Use {@link MultiLineSqlScriptExtracter} instead + * @deprecated Use {@link MultiLineSqlScriptExtractor} instead */ @Deprecated -public class MultipleLinesSqlCommandExtractor extends MultiLineSqlScriptExtracter { +public class MultipleLinesSqlCommandExtractor extends MultiLineSqlScriptExtractor { } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java index bc1cc000b6..d6d89cf686 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/AbstractScriptSourceInput.java @@ -31,13 +31,13 @@ public abstract class AbstractScriptSourceInput implements ScriptSourceInput { protected abstract void releaseReader(Reader reader); @Override - public List extract(Function> extracter) { + public List extract(Function> extractor) { log.executingImportScript( getScriptDescription() ); final Reader inputReader = prepareReader(); try { - return extracter.apply( inputReader ); + return extractor.apply( inputReader ); } finally { releaseReader( inputReader ); diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java index 0fe6b1e511..11798887ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ScriptSourceInputNonExistentImpl.java @@ -25,7 +25,7 @@ public class ScriptSourceInputNonExistentImpl implements ScriptSourceInput { public static final ScriptSourceInputNonExistentImpl INSTANCE = new ScriptSourceInputNonExistentImpl(); @Override - public List extract(Function> extracter) { + public List extract(Function> extractor) { return Collections.emptyList(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtracter.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java similarity index 95% rename from hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtracter.java rename to hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java index 6e38a99a00..c604279884 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtracter.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/MultiLineSqlScriptExtractor.java @@ -34,10 +34,10 @@ import org.antlr.v4.runtime.misc.ParseCancellationException; * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) * @author Steve Ebersole */ -public class MultiLineSqlScriptExtracter implements SqlScriptCommandExtractor { +public class MultiLineSqlScriptExtractor implements SqlScriptCommandExtractor { public static final String SHORT_NAME = "multi-line"; - public static final MultiLineSqlScriptExtracter INSTANCE = new MultiLineSqlScriptExtracter(); + public static final MultiLineSqlScriptExtractor INSTANCE = new MultiLineSqlScriptExtractor(); @Override public List extractCommands(Reader reader, Dialect dialect) { diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptExtractorInitiator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptExtractorInitiator.java index 6c68f4cd81..030c626612 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptExtractorInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/script/SqlScriptExtractorInitiator.java @@ -43,8 +43,8 @@ public class SqlScriptExtractorInitiator implements StandardServiceInitiator extract(Function> extracter); + List extract(Function> extractor); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java index fdb9b36cb2..7ccaff1626 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/schema/SchemaManagementScriptTests.java @@ -13,7 +13,7 @@ import java.io.StringReader; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; -import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtracter; +import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.junit.jupiter.api.Test; @@ -44,7 +44,7 @@ public class SchemaManagementScriptTests { final String commands = firstCommand + "; " + secondCommand + "; " + thirdCommand + ";"; final Reader reader = new BufferedReader( new StringReader( commands ) ); - final MultiLineSqlScriptExtracter extractor = new MultiLineSqlScriptExtracter(); + final MultiLineSqlScriptExtractor extractor = new MultiLineSqlScriptExtractor(); final String[] extractedCommands = extractor.extractCommands( reader, dialect ).toArray( new String[0] ); assertThat( extractedCommands.length, is( 3 ) ); @@ -62,7 +62,7 @@ public class SchemaManagementScriptTests { final String commands = firstCommand + "; " + secondCommand + "; " + thirdCommand + ";"; final Reader reader = new BufferedReader( new StringReader( commands ) ); - final MultiLineSqlScriptExtracter extractor = new MultiLineSqlScriptExtracter(); + final MultiLineSqlScriptExtractor extractor = new MultiLineSqlScriptExtractor(); final String[] extractedCommands = extractor.extractCommands( reader, dialect ).toArray( new String[0] ); assertThat( extractedCommands.length, is( 3 ) ); @@ -84,7 +84,7 @@ public class SchemaManagementScriptTests { final String commands = firstCommand + "; " + secondCommand + "; " + thirdCommand + ";"; final Reader reader = new BufferedReader( new StringReader( commands ) ); - final MultiLineSqlScriptExtracter extractor = new MultiLineSqlScriptExtracter(); + final MultiLineSqlScriptExtractor extractor = new MultiLineSqlScriptExtractor(); final String[] extractedCommands = extractor.extractCommands( reader, dialect ).toArray( new String[0] ); assertThat( extractedCommands.length, is( 3 ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java index 8329a0e072..b8c3f80214 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/CommandExtractorServiceTest.java @@ -10,7 +10,7 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; -import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtracter; +import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.hibernate.tool.schema.spi.SqlScriptCommandExtractor; import org.hibernate.testing.RequiresDialect; @@ -36,6 +36,6 @@ public class CommandExtractorServiceTest extends MultiLineImportFileTest { @Override protected void prepareBasicRegistryBuilder(StandardServiceRegistryBuilder serviceRegistryBuilder) { super.prepareBasicRegistryBuilder( serviceRegistryBuilder ); - serviceRegistryBuilder.addService( SqlScriptCommandExtractor.class, MultiLineSqlScriptExtracter.INSTANCE ); + serviceRegistryBuilder.addService( SqlScriptCommandExtractor.class, MultiLineSqlScriptExtractor.INSTANCE ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java index 126c61cb10..d33a447217 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tool/schema/scripts/StatementsWithoutTerminalCharsImportFileTest.java @@ -23,7 +23,7 @@ import org.hibernate.tool.schema.SourceType; import org.hibernate.tool.schema.TargetType; import org.hibernate.tool.schema.internal.ExceptionHandlerLoggedImpl; import org.hibernate.tool.schema.internal.SchemaCreatorImpl; -import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtracter; +import org.hibernate.tool.schema.internal.script.MultiLineSqlScriptExtractor; import org.hibernate.tool.schema.spi.ContributableMatcher; import org.hibernate.tool.schema.spi.ExceptionHandler; import org.hibernate.tool.schema.spi.ExecutionOptions; @@ -76,7 +76,7 @@ public class StatementsWithoutTerminalCharsImportFileTest extends BaseUnitTestCa // specify anything as single-line is the default .applySetting( Environment.HBM2DDL_IMPORT_FILES_SQL_EXTRACTOR, - MultiLineSqlScriptExtracter.INSTANCE + MultiLineSqlScriptExtractor.INSTANCE ) .build(); }