From 82f1e1321d684d118349ac1700ad786272213217 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Mon, 12 Jun 2023 23:09:25 +0200 Subject: [PATCH] Rename Dialect interface --- .../de/bluecolored/bluemap/core/storage/sql/SQLStorage.java | 6 +++--- .../sql/dialect/{SQLQueryDialect.java => Dialect.java} | 2 +- .../bluemap/core/storage/sql/dialect/MySQLDialect.java | 2 +- .../bluemap/core/storage/sql/dialect/PostgresDialect.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/{SQLQueryDialect.java => Dialect.java} (97%) diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/SQLStorage.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/SQLStorage.java index d633d73f..8ea329f6 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/SQLStorage.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/SQLStorage.java @@ -31,7 +31,7 @@ import de.bluecolored.bluemap.core.BlueMap; import de.bluecolored.bluemap.core.logger.Logger; import de.bluecolored.bluemap.core.storage.*; import de.bluecolored.bluemap.core.storage.sql.dialect.DialectType; -import de.bluecolored.bluemap.core.storage.sql.dialect.SQLQueryDialect; +import de.bluecolored.bluemap.core.storage.sql.dialect.Dialect; import de.bluecolored.bluemap.core.util.WrappedOutputStream; import org.apache.commons.dbcp2.*; import org.apache.commons.pool2.ObjectPool; @@ -54,7 +54,7 @@ public abstract class SQLStorage extends Storage { private final DataSource dataSource; - protected final SQLQueryDialect dialect; + protected final Dialect dialect; protected final Compression hiresCompression; private final LoadingCache mapFKs = Caffeine.newBuilder() @@ -66,7 +66,7 @@ public abstract class SQLStorage extends Storage { private volatile boolean closed; - public SQLStorage(SQLQueryDialect dialect, SQLStorageSettings config) throws MalformedURLException, SQLDriverException { + public SQLStorage(Dialect dialect, SQLStorageSettings config) throws MalformedURLException, SQLDriverException { this.dialect = dialect; this.closed = false; try { diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/SQLQueryDialect.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/Dialect.java similarity index 97% rename from BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/SQLQueryDialect.java rename to BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/Dialect.java index da0d3a50..4406e7d2 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/SQLQueryDialect.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/Dialect.java @@ -2,7 +2,7 @@ package de.bluecolored.bluemap.core.storage.sql.dialect; import org.intellij.lang.annotations.Language; -public interface SQLQueryDialect { +public interface Dialect { @Language("sql") String writeMapTile(); diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/MySQLDialect.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/MySQLDialect.java index c7fd5d5f..1d2f49f9 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/MySQLDialect.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/MySQLDialect.java @@ -2,7 +2,7 @@ package de.bluecolored.bluemap.core.storage.sql.dialect; import org.intellij.lang.annotations.Language; -public class MySQLDialect implements SQLQueryDialect { +public class MySQLDialect implements Dialect { public static final MySQLDialect INSTANCE = new MySQLDialect(); diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/PostgresDialect.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/PostgresDialect.java index 6f5a930e..8f4b69c8 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/PostgresDialect.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/storage/sql/dialect/PostgresDialect.java @@ -2,7 +2,7 @@ package de.bluecolored.bluemap.core.storage.sql.dialect; import org.intellij.lang.annotations.Language; -public class PostgresDialect implements SQLQueryDialect { +public class PostgresDialect implements Dialect { public static final PostgresDialect INSTANCE = new PostgresDialect();