From 9f1878372b010f7390589cb1ae46d0e25cea838e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 15 Jan 2020 16:52:39 +0100 Subject: [PATCH] [jOOQ/jOOQ#8528] Rename class to Interpreter The interpretation is not strictly about DDL. DML statements can be interpreted as well --- .../main/java/org/jooq/impl/DefaultDSLContext.java | 2 +- .../impl/{DDLInterpreter.java => Interpreter.java} | 6 +++--- ...etaProvider.java => InterpreterMetaProvider.java} | 12 ++++++------ .../main/java/org/jooq/impl/SourceMetaProvider.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename jOOQ/src/main/java/org/jooq/impl/{DDLInterpreter.java => Interpreter.java} (99%) rename jOOQ/src/main/java/org/jooq/impl/{DDLInterpreterMetaProvider.java => InterpreterMetaProvider.java} (87%) diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java index 50205b458e..99b4e521eb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java @@ -468,7 +468,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri @Override public Meta meta(Query... queries) { - return new DDLInterpreterMetaProvider(configuration(), queries).provide(); + return new InterpreterMetaProvider(configuration(), queries).provide(); } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java b/jOOQ/src/main/java/org/jooq/impl/Interpreter.java similarity index 99% rename from jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java rename to jOOQ/src/main/java/org/jooq/impl/Interpreter.java index 290241b7e4..00557e94e0 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java +++ b/jOOQ/src/main/java/org/jooq/impl/Interpreter.java @@ -102,9 +102,9 @@ import org.jooq.impl.ConstraintImpl.Action; import org.jooq.tools.JooqLogger; @SuppressWarnings("serial") -final class DDLInterpreter { +final class Interpreter { - private static final JooqLogger log = JooqLogger.getLogger(DDLInterpreter.class); + private static final JooqLogger log = JooqLogger.getLogger(Interpreter.class); private final Configuration configuration; private final InterpreterNameLookupCaseSensitivity caseSensitivity; @@ -123,7 +123,7 @@ final class DDLInterpreter { private final Map interpretedIndexes = new HashMap<>(); private final Map interpretedSequences = new HashMap<>(); - DDLInterpreter(Configuration configuration) { + Interpreter(Configuration configuration) { this.configuration = configuration; this.caseSensitivity = caseSensitivity(configuration); this.locale = interpreterLocale(configuration.settings()); diff --git a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreterMetaProvider.java b/jOOQ/src/main/java/org/jooq/impl/InterpreterMetaProvider.java similarity index 87% rename from jOOQ/src/main/java/org/jooq/impl/DDLInterpreterMetaProvider.java rename to jOOQ/src/main/java/org/jooq/impl/InterpreterMetaProvider.java index c21cca6cb9..180cea4ec1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreterMetaProvider.java +++ b/jOOQ/src/main/java/org/jooq/impl/InterpreterMetaProvider.java @@ -60,21 +60,21 @@ import org.jooq.tools.JooqLogger; * * @author Knut Wannheden */ -final class DDLInterpreterMetaProvider implements MetaProvider { +final class InterpreterMetaProvider implements MetaProvider { - private static final JooqLogger log = JooqLogger.getLogger(DDLInterpreterMetaProvider.class); + private static final JooqLogger log = JooqLogger.getLogger(InterpreterMetaProvider.class); private final Configuration configuration; private final Source[] sources; private final Query[] queries; - public DDLInterpreterMetaProvider(Configuration configuration, Source... sources) { + public InterpreterMetaProvider(Configuration configuration, Source... sources) { this.configuration = configuration == null ? new DefaultConfiguration() : configuration; this.sources = sources; this.queries = null; } - public DDLInterpreterMetaProvider(Configuration configuration, Query... queries) { + public InterpreterMetaProvider(Configuration configuration, Query... queries) { this.configuration = configuration == null ? new DefaultConfiguration() : configuration; this.sources = null; this.queries = queries; @@ -82,7 +82,7 @@ final class DDLInterpreterMetaProvider implements MetaProvider { @Override public Meta provide() { - final DDLInterpreter interpreter = new DDLInterpreter(configuration); + final Interpreter interpreter = new Interpreter(configuration); Configuration localConfiguration = configuration.derive(); DSLContext ctx = DSL.using(localConfiguration); @@ -96,7 +96,7 @@ final class DDLInterpreterMetaProvider implements MetaProvider { return interpreter.meta(); } - private final void loadSource(DSLContext ctx, Source source, DDLInterpreter interpreter) { + private final void loadSource(DSLContext ctx, Source source, Interpreter interpreter) { Reader reader = null; try { diff --git a/jOOQ/src/main/java/org/jooq/impl/SourceMetaProvider.java b/jOOQ/src/main/java/org/jooq/impl/SourceMetaProvider.java index 711641f484..0ebc30b23b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/SourceMetaProvider.java +++ b/jOOQ/src/main/java/org/jooq/impl/SourceMetaProvider.java @@ -77,7 +77,7 @@ final class SourceMetaProvider implements MetaProvider { SQLDialect dialect = configuration.settings().getInterpreterDialect(); switch (defaultIfNull(dialect, DEFAULT)) { case DEFAULT: - return new DDLInterpreterMetaProvider(configuration, sources).provide(); + return new InterpreterMetaProvider(configuration, sources).provide(); case DERBY: case H2: