0002425: SymmetricDS Android has a dependency on MySQL libraries

JumpMind · Oct 29, 2015 · a052d04 · a052d04
1 parent 3f3c27a
commit a052d04
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteSymmetricDialect.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteSymmetricDialect.java
@@ -20,6 +20,9 @@
  */
 package org.jumpmind.symmetric.db.sqlite;
 
+import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.commons.lang.StringUtils.isNotBlank;
+
 import org.jumpmind.db.model.Table;
 import org.jumpmind.db.platform.IDatabasePlatform;
 import org.jumpmind.db.sql.ISqlTransaction;
@@ -30,8 +33,6 @@
 import org.jumpmind.symmetric.service.IParameterService;
 import org.jumpmind.util.AppUtils;
 
-import com.mysql.jdbc.StringUtils;
-
 public class SqliteSymmetricDialect extends AbstractSymmetricDialect {
 
     public static final String CONTEXT_TABLE_NAME = "context";
@@ -55,7 +56,7 @@ public SqliteSymmetricDialect(IParameterService parameterService, IDatabasePlatf
 
     @Override
     public void createRequiredDatabaseObjects() {
-    	if(!StringUtils.isNullOrEmpty(sqliteFunctionToOverride)){
+    	if(isNotBlank(sqliteFunctionToOverride)){
     		return;
     	}
 
@@ -85,7 +86,7 @@ protected void setSqliteFunctionResult(ISqlTransaction transaction, final String
     }
 
     public void disableSyncTriggers(ISqlTransaction transaction, String nodeId) {
-    	if(StringUtils.isNullOrEmpty(sqliteFunctionToOverride)){
+    	if(isBlank(sqliteFunctionToOverride)){
     		String contextTableName = parameterService.getTablePrefix() + "_" + CONTEXT_TABLE_NAME;
             transaction.prepareAndExecute(String.format(CONTEXT_TABLE_INSERT, contextTableName), new Object[] {
                 SYNC_TRIGGERS_DISABLED_USER_VARIABLE, "1" });
@@ -105,7 +106,7 @@ public void disableSyncTriggers(ISqlTransaction transaction, String nodeId) {
     }
 
     public void enableSyncTriggers(ISqlTransaction transaction) {
-    	if(StringUtils.isNullOrEmpty(sqliteFunctionToOverride)){
+    	if(isBlank(sqliteFunctionToOverride)){
     		String contextTableName = parameterService.getTablePrefix() + "_" + CONTEXT_TABLE_NAME;
             transaction.prepareAndExecute("delete from " + contextTableName);
     	}else{
@@ -114,7 +115,7 @@ public void enableSyncTriggers(ISqlTransaction transaction) {
     }
 
     public String getSyncTriggersExpression() {
-        if(StringUtils.isNullOrEmpty(sqliteFunctionToOverride)){
+        if(isBlank(sqliteFunctionToOverride)){
         	String contextTableName = parameterService.getTablePrefix() + "_" + CONTEXT_TABLE_NAME;
         	return "(not exists (select context_value from "+contextTableName+" where id = 'sync_triggers_disabled'))";
     	}else{