core: remove DbFacade.getDbEngineDialect method

Change-Id: Ia37f19dc052c416483674fb8160c8376543cd392 Signed-off-by: Yevgeny Zaspitsky <yzaspits@redhat.com>
oVirt · Jun 30, 2016 · 05e6eb1 · 05e6eb1
1 parent 9d2f9da
commit 05e6eb1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/...in/java/org/ovirt/engine/core/dal/dbbroker/BatchProcedureExecutionConnectionCallback.java b/...in/java/org/ovirt/engine/core/dal/dbbroker/BatchProcedureExecutionConnectionCallback.java
@@ -30,16 +30,18 @@ public final class BatchProcedureExecutionConnectionCallback implements Connecti
     private static ConcurrentMap<String, StoredProcedureMetaData> storedProceduresMap =
             new ConcurrentHashMap<>();
 
-    private String procName;
-    private List<MapSqlParameterSource> executions;
-    private SimpleJdbcCallsHandler handler;
+    private final String procName;
+    private final List<MapSqlParameterSource> executions;
+    private final SimpleJdbcCallsHandler handler;
+    private final DbEngineDialect dbEngineDialect;
 
     public BatchProcedureExecutionConnectionCallback(SimpleJdbcCallsHandler handler,
             String procName,
             List<MapSqlParameterSource> executions) {
         this.handler = handler;
         this.procName = procName;
         this.executions = executions;
+        this.dbEngineDialect = handler.getDialect();
     }
 
     @Override
@@ -164,12 +166,8 @@ private void mapParams(PreparedStatement stmt,
         for (Map.Entry<String, SqlCallParameter> paramOrderEntry : paramOrder.entrySet()) {
             String paramName = paramOrderEntry.getKey();
             Object value = values.get(paramName);
-            if (value == null && paramName.startsWith(DbFacade.getInstance().getDbEngineDialect().getParamNamePrefix())) {
-                value =
-                        values.get(paramName.substring(DbFacade.getInstance()
-                                .getDbEngineDialect()
-                                .getParamNamePrefix()
-                                .length()));
+            if (value == null && paramName.startsWith(dbEngineDialect.getParamNamePrefix())) {
+                value = values.get(paramName.substring(dbEngineDialect.getParamNamePrefix().length()));
             }
 
             SqlCallParameter sqlParam = paramOrderEntry.getValue();

diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacade.java
@@ -290,10 +290,6 @@ private void init() {
         instance = this;
     }
 
-    public DbEngineDialect getDbEngineDialect() {
-        return dbEngineDialect;
-    }
-
     public SimpleJdbcCallsHandler getCallsHandler() {
         return callsHandler;
     }

diff --git a/...d/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BatchProcedureCallTest.java b/...d/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BatchProcedureCallTest.java
@@ -7,17 +7,23 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.ovirt.engine.core.common.businessentities.Tags;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dal.dbbroker.CustomMapSqlParameterSource;
+import org.ovirt.engine.core.dal.dbbroker.DbEngineDialect;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 
 public class BatchProcedureCallTest extends BaseDaoTestCase {
 
     private TagDao dao;
 
+    @Inject
+    private DbEngineDialect dbEngineDialect;
+
     public BatchProcedureCallTest() {
     }
 
@@ -28,8 +34,7 @@ public void setUp() throws Exception {
     }
 
     protected CustomMapSqlParameterSource getParamsSource(Tags tag) {
-        CustomMapSqlParameterSource paramsSource = new CustomMapSqlParameterSource(
-                dbFacade.getDbEngineDialect());
+        CustomMapSqlParameterSource paramsSource = new CustomMapSqlParameterSource(dbEngineDialect);
         paramsSource.addValue("description", tag.getDescription())
                 .addValue("tag_id", tag.getTagId())
                 .addValue("tag_name", tag.getTagName())