Merge pull request #811 from Aeskull/refactor/pull-up-common-variable…

…s-into-dialect refactor(dialect): converted Dialect from an interface into an abstract class
9tigerio · Nov 26, 2024 · 850cf26 · 850cf26
2 parents 352e1a9 + b5a872e
commit 850cf26
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 94 deletions.
diff --git a/mariadb-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MariaDBDialect.java b/mariadb-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MariaDBDialect.java
@@ -14,12 +14,10 @@
 import java.util.Map;
 
 @Slf4j
-@RequiredArgsConstructor
-public class MariaDBDialect implements Dialect {
-
-    private final ObjectMapper objectMapper;
-
-    private String coverChar = "`";
+public class MariaDBDialect extends Dialect {
+    public MariaDBDialect(ObjectMapper objectMapper) {
+        super(objectMapper, "`");
+    }
 
     @Override
     public boolean isSupportedDb(String productName, int majorVersion) {
@@ -37,7 +35,7 @@ public void processTypes(DbTable table, List<String> insertableColumns, Map<Stri
 
                 if (StringUtils.equalsAnyIgnoreCase(columnDataTypeName, "json")) {
 
-                    data.put(columnName, objectMapper.writeValueAsString(value));
+                    data.put(columnName, getObjectMapper().writeValueAsString(value));
                 }
 
             }
@@ -49,7 +47,7 @@ public void processTypes(DbTable table, List<String> insertableColumns, Map<Stri
     }
 
     private String getQuotedName(String name) {
-        return coverChar + name + coverChar;
+        return getCoverChar() + name + getCoverChar();
     }
 
     @Override
@@ -77,6 +75,4 @@ public String getAliasedName(DbColumn dbColumn, boolean deleteOp) {
 
         return dbColumn.tableAlias() + "."+ dbColumn.name();
     }
-
-
 }
diff --git a/mssql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MsSQLServerDialect.java b/mssql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MsSQLServerDialect.java
@@ -5,17 +5,17 @@
 import com.homihq.db2rest.jdbc.config.model.Database;
 import com.homihq.db2rest.jdbc.config.model.DbTable;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Map;
 
-@RequiredArgsConstructor
-public class MsSQLServerDialect implements Dialect {
-
-    private static final String COVER_CHAR = "\"";
-
-    private final ObjectMapper objectMapper;
+@Slf4j
+public class MsSQLServerDialect extends Dialect {
+    public MsSQLServerDialect(ObjectMapper objectMapper) {
+        super(objectMapper, "\"");
+    }
 
     // https://github.com/Microsoft/mssql-jdbc/issues/245
     @Override
@@ -37,7 +37,7 @@ public void processTypes(DbTable table, List<String> insertableColumns, Map<Stri
                 String columnDataTypeName = table.getColumnDataTypeName(columnName);
 
                 if (StringUtils.equalsAnyIgnoreCase(columnDataTypeName, "json")) {
-                    data.put(columnName, objectMapper.writeValueAsString(value));
+                    data.put(columnName, getObjectMapper().writeValueAsString(value));
                 }
             }
         } catch (Exception exception) {
@@ -59,7 +59,7 @@ public String renderTableNameWithoutAlias(DbTable table) {
     }
 
     private String getQuotedName(String name) {
-        return COVER_CHAR + name + COVER_CHAR;
+        return getCoverChar() + name + getCoverChar();
     }
 
     @Override
@@ -81,5 +81,4 @@ public String getReadSqlTemplate() {
     public String getUpdateSqlTemplate() {
         return "update-mssql";
     }
-
 }
diff --git a/mysql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MySQLDialect.java b/mysql-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/MySQLDialect.java
@@ -14,13 +14,10 @@
 import java.util.Map;
 
 @Slf4j
-@RequiredArgsConstructor
-public class MySQLDialect implements Dialect {
-
-    private final ObjectMapper objectMapper;
-
-    private String coverChar = "`";
-
+public class MySQLDialect extends Dialect {
+    public MySQLDialect(ObjectMapper objectMapper) {
+        super(objectMapper, "`");
+    }
 
     @Override
     public boolean isSupportedDb(String productName, int majorVersion) {
@@ -39,7 +36,7 @@ public void processTypes(DbTable table, List<String> insertableColumns, Map<Stri
 
                 if (StringUtils.equalsAnyIgnoreCase(columnDataTypeName, "json")) {
 
-                    data.put(columnName, objectMapper.writeValueAsString(value));
+                    data.put(columnName, getObjectMapper().writeValueAsString(value));
                 }
 
             }
@@ -51,7 +48,7 @@ public void processTypes(DbTable table, List<String> insertableColumns, Map<Stri
     }
 
     private String getQuotedName(String name) {
-        return coverChar + name + coverChar;
+        return getCoverChar() + name + getCoverChar();
     }
 
     @Override
@@ -63,8 +60,4 @@ public String renderTableName(DbTable table, boolean containsWhere, boolean dele
     public String renderTableNameWithoutAlias(DbTable table) {
         return getQuotedName(table.schema()) + "." + getQuotedName(table.name());
     }
-
-
-
-
 }
diff --git a/oracle-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java b/oracle-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java
@@ -14,12 +14,10 @@
 import java.util.Map;
 
 @Slf4j
-@RequiredArgsConstructor
-public class OracleDialect implements Dialect {
-
-    private final ObjectMapper objectMapper;
-
-    private String coverChar = "\"";
+public class OracleDialect extends Dialect {
+    public OracleDialect(ObjectMapper objectMapper) {
+        super(objectMapper, "\"");
+    }
 
     @Override
     public boolean isSupportedDb(String productName, int majorVersion) {
@@ -47,7 +45,7 @@ public void processTypes(DbTable table, List<String> insertableColumns, Map<Stri
 
                 if (StringUtils.equalsAnyIgnoreCase(columnDataTypeName, "json")) {
 
-                    data.put(columnName, objectMapper.writeValueAsString(value));
+                    data.put(columnName, getObjectMapper().writeValueAsString(value));
                 } else if (StringUtils.equalsAnyIgnoreCase(columnDataTypeName, "TIMESTAMP(6)")) {
                     LocalDateTime v = convertToLocalDateTime((String) value);
                     data.put(columnName, v);
@@ -69,7 +67,7 @@ private LocalDateTime convertToLocalDateTime(String value) {
     }
 
     private String getQuotedName(String name) {
-        return coverChar + name + coverChar;
+        return getCoverChar() + name + getCoverChar();
     }
 
     @Override
@@ -81,6 +79,4 @@ public String renderTableName(DbTable table, boolean containsWhere, boolean dele
     public String renderTableNameWithoutAlias(DbTable table) {
         return getQuotedName(table.schema()) + "." + getQuotedName(table.name());
     }
-
-
 }
diff --git a/oracle9i-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java b/oracle9i-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/OracleDialect.java
@@ -12,13 +12,10 @@
 import java.util.Map;
 
 @Slf4j
-@RequiredArgsConstructor
-public class OracleDialect implements Dialect {
-
-    private final ObjectMapper objectMapper;
-
-    private String coverChar = "\"";
-
+public class OracleDialect extends Dialect {
+    public OracleDialect(ObjectMapper objectMapper) {
+        super(objectMapper, "\"");
+    }
 
     @Override
     public boolean isSupportedDb(String productName, int majorVersion) {
@@ -48,7 +45,7 @@ public void processTypes(DbTable table, List<String> insertableColumns, Map<Stri
 
                 if (StringUtils.equalsAnyIgnoreCase(columnDataTypeName, "json")) {
 
-                    data.put(columnName, objectMapper.writeValueAsString(value));
+                    data.put(columnName, getObjectMapper().writeValueAsString(value));
                 }
 
             }
@@ -59,10 +56,8 @@ public void processTypes(DbTable table, List<String> insertableColumns, Map<Stri
 
     }
 
-
-
     private String getQuotedName(String name) {
-        return coverChar + name + coverChar;
+        return getCoverChar() + name + getCoverChar();
     }
 
     @Override
@@ -74,7 +69,4 @@ public String renderTableName(DbTable table, boolean containsWhere, boolean dele
     public String renderTableNameWithoutAlias(DbTable table) {
         return getQuotedName(table.schema()) + "." + getQuotedName(table.name());
     }
-
-
-
 }
diff --git a/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/PostGreSQLDialect.java b/pg-dialect/src/main/java/com/homihq/db2rest/jdbc/config/dialect/PostGreSQLDialect.java
@@ -19,12 +19,11 @@
 import java.util.*;
 
 
-@RequiredArgsConstructor
 @Slf4j
-public class PostGreSQLDialect implements Dialect {
-
-    private final ObjectMapper objectMapper;
-    private String coverChar = "\"";
+public class PostGreSQLDialect extends Dialect {
+    public PostGreSQLDialect(ObjectMapper objectMapper) {
+        super(objectMapper, "\"");
+    }
 
     //Use during insert, bulk-insert, update
     @Override
@@ -100,7 +99,7 @@ private Object convertToJson(Object value, String columnDataTypeName) {
         try {
             PGobject pGobject = new PGobject();
             pGobject.setType(columnDataTypeName);
-            pGobject.setValue(objectMapper.writeValueAsString(value));
+            pGobject.setValue(getObjectMapper().writeValueAsString(value));
 
             return pGobject;
         } catch (Exception e) {
@@ -118,7 +117,7 @@ public Object convertJsonToVO(Object object) {
             String val = pGobject.getValue();
 
             try {
-                return objectMapper.readValue(val, Object.class);
+                return getObjectMapper().readValue(val, Object.class);
             } catch (JsonProcessingException e) {
                 throw new GenericDataAccessException("Error converting to JSON type - " + e.getLocalizedMessage());
             }
@@ -130,7 +129,7 @@ public Object convertJsonToVO(Object object) {
     }
 
     private String getQuotedName(String name) {
-        return coverChar + name + coverChar;
+        return getCoverChar() + name + getCoverChar();
     }
 
     @Override
@@ -160,9 +159,8 @@ public List<String> convertToStringArray(Object object) {
             } catch (Exception e) {
                 throw new GenericDataAccessException("Error converting to Array type - " + e.getLocalizedMessage());
             }
-
         }
 
-        return Dialect.super.convertToStringArray(object);
+        return convertToStringArray(object);
     }
 }