From 93465dd17fd653edc035f0c3779fe9a832fe2a5c Mon Sep 17 00:00:00 2001 From: elong Date: Mon, 11 Jul 2016 09:44:53 -0400 Subject: [PATCH] fix reference to context service and sqlite dialect --- .../android/AndroidSymmetricEngine.java | 11 ----------- .../symmetric/ClientSymmetricEngine.java | 2 +- .../db/JdbcSymmetricDialectFactory.java | 7 ++----- .../db/sqlite/SqliteJdbcSymmetricDialect.java | 4 +--- .../db/sqlite/SqliteSymmetricDialect.java | 17 +++-------------- 5 files changed, 7 insertions(+), 34 deletions(-) diff --git a/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java b/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java index 5ea26f3814..07278d67cb 100644 --- a/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java +++ b/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java @@ -22,7 +22,6 @@ import java.io.File; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Properties; @@ -35,7 +34,6 @@ import org.jumpmind.symmetric.ITypedPropertiesFactory; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.db.sqlite.SqliteSymmetricDialect; -import org.jumpmind.symmetric.io.stage.IStagedResource; import org.jumpmind.symmetric.io.stage.IStagingManager; import org.jumpmind.symmetric.io.stage.StagingManager; import org.jumpmind.symmetric.job.IJobManager; @@ -84,15 +82,6 @@ public AndroidSymmetricEngine(String registrationUrl, String externalId, String init(); } - protected void init() { - super.init(); - if (symmetricDialect instanceof SqliteSymmetricDialect) { - // - SqliteSymmetricDialect sqliteDialect = (SqliteSymmetricDialect)symmetricDialect; - sqliteDialect.setContextService(contextService); - } - } - @Override protected SecurityServiceType getSecurityServiceType() { return SecurityServiceType.CLIENT; diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java index 3a30d20d52..a4c26357d2 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java @@ -265,7 +265,7 @@ public static BasicDataSource createBasicDataSource(File propsFile) { @Override protected ISymmetricDialect createSymmetricDialect() { - return new JdbcSymmetricDialectFactory(parameterService, contextService, platform).create(); + return new JdbcSymmetricDialectFactory(parameterService, platform).create(); } @Override diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java index 38beb535a0..c08b9f8302 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java @@ -68,7 +68,6 @@ import org.jumpmind.symmetric.db.redshift.RedshiftSymmetricDialect; import org.jumpmind.symmetric.db.sqlanywhere.SqlAnywhereSymmetricDialect; import org.jumpmind.symmetric.db.sqlite.SqliteJdbcSymmetricDialect; -import org.jumpmind.symmetric.service.IContextService; import org.jumpmind.symmetric.db.voltdb.VoltDbSymmetricDialect; import org.jumpmind.symmetric.service.IParameterService; import org.slf4j.Logger; @@ -84,11 +83,9 @@ public class JdbcSymmetricDialectFactory { private IParameterService parameterService; - private IContextService contextService; - private IDatabasePlatform platform; - public JdbcSymmetricDialectFactory(IParameterService parameterService, IContextService contextService, IDatabasePlatform platform) { + public JdbcSymmetricDialectFactory(IParameterService parameterService, IDatabasePlatform platform) { this.parameterService = parameterService; this.platform = platform; } @@ -154,7 +151,7 @@ public ISymmetricDialect create() { } else if (platform instanceof InterbaseDatabasePlatform) { dialect = new InterbaseSymmetricDialect(parameterService, platform); } else if (platform instanceof SqliteDatabasePlatform) { - dialect = new SqliteJdbcSymmetricDialect(parameterService, contextService, platform); + dialect = new SqliteJdbcSymmetricDialect(parameterService, platform); } else if (platform instanceof VoltDbDatabasePlatform) { dialect = new VoltDbSymmetricDialect(parameterService, platform); } else { diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteJdbcSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteJdbcSymmetricDialect.java index 021cd2f78e..d1c5f70749 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteJdbcSymmetricDialect.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteJdbcSymmetricDialect.java @@ -7,14 +7,12 @@ import org.jumpmind.db.sql.IConnectionCallback; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.sql.JdbcSqlTransaction; -import org.jumpmind.symmetric.service.IContextService; import org.jumpmind.symmetric.service.IParameterService; public class SqliteJdbcSymmetricDialect extends SqliteSymmetricDialect { - public SqliteJdbcSymmetricDialect(IParameterService parameterService, IContextService contextService, IDatabasePlatform platform) { + public SqliteJdbcSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { super(parameterService, platform); - setContextService(contextService); } @Override 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 index 0dc47da98d..1a441717d8 100644 --- 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 @@ -27,12 +27,12 @@ import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.sql.SqlException; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.symmetric.SymmetricException; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.common.TableConstants; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.service.IContextService; import org.jumpmind.symmetric.service.IParameterService; +import org.jumpmind.symmetric.service.impl.ContextService; import org.jumpmind.util.AppUtils; public class SqliteSymmetricDialect extends AbstractSymmetricDialect { @@ -47,13 +47,10 @@ public class SqliteSymmetricDialect extends AbstractSymmetricDialect { public SqliteSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { super(parameterService, platform); this.triggerTemplate = new SqliteTriggerTemplate(this); + this.contextService = new ContextService(parameterService, this); sqliteFunctionToOverride = parameterService.getString(ParameterConstants.SQLITE_TRIGGER_FUNCTION_TO_USE); } - - public void setContextService(IContextService contextService) { - this.contextService = contextService; - } - + @Override public void createRequiredDatabaseObjects() { } @@ -70,10 +67,6 @@ protected void setSqliteFunctionResult(ISqlTransaction transaction, final String public void disableSyncTriggers(ISqlTransaction transaction, String nodeId) { if (isBlank(sqliteFunctionToOverride)) { - if (contextService == null) { - throw new SymmetricException("contextService can't be null by this point. " - + "Please provide a non-null contextService before using this functionality."); - } contextService.insert(transaction, SYNC_TRIGGERS_DISABLED_USER_VARIABLE, "1"); if (nodeId != null) { contextService.insert(transaction, SYNC_TRIGGERS_DISABLED_NODE_VARIABLE, nodeId); @@ -86,10 +79,6 @@ public void disableSyncTriggers(ISqlTransaction transaction, String nodeId) { public void enableSyncTriggers(ISqlTransaction transaction) { if (isBlank(sqliteFunctionToOverride)) { - if (contextService == null) { - throw new SymmetricException("contextService can't be null by this point. " - + "Please provide a non-null contextService before using this functionality."); - } contextService.delete(transaction, SYNC_TRIGGERS_DISABLED_USER_VARIABLE); contextService.delete(transaction, SYNC_TRIGGERS_DISABLED_NODE_VARIABLE); } else {