From 52f0b1ade4d48f8a555678b30c4868b7931cb63d Mon Sep 17 00:00:00 2001 From: chenson42 Date: Wed, 21 Mar 2012 19:07:27 +0000 Subject: [PATCH] --- .../symmetric/service/IDataLoaderService.java | 10 ++++--- .../service/impl/DataLoaderService.java | 27 ++++++++++++------- .../src/main/resources/symmetric-schema.xml | 4 +-- .../impl/AbstractDataLoaderServiceTest.java | 4 +-- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IDataLoaderService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IDataLoaderService.java index 0f843dda59..89fb2097ec 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IDataLoaderService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IDataLoaderService.java @@ -33,7 +33,7 @@ import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.NodeGroupLink; import org.jumpmind.symmetric.model.RemoteNodeStatus; -import org.jumpmind.symmetric.service.impl.DataLoaderService.ConflictSettingsNodeGroupLink; +import org.jumpmind.symmetric.service.impl.DataLoaderService.ConflictSettingNodeGroupLink; /** * This service provides an API to load data into a SymmetricDS node's database @@ -57,11 +57,13 @@ public interface IDataLoaderService { public List loadDataBatch(String batchData) throws IOException; - public List getConflictSettingsNodeGroupLinks(NodeGroupLink link, boolean refreshCache); + public List getConflictSettingsNodeGroupLinks(NodeGroupLink link, boolean refreshCache); - public void delete(ConflictSettingsNodeGroupLink settings); + public List getConflictSettingsNodeGroupLinks(); - public void save(ConflictSettingsNodeGroupLink settings); + public void delete(ConflictSettingNodeGroupLink settings); + + public void save(ConflictSettingNodeGroupLink settings); public List getIncomingErrors(long batchId, String nodeId); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java index ab61c0108c..ab634a6f3d 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java @@ -129,7 +129,7 @@ public class DataLoaderService extends AbstractService implements IDataLoaderSer private Map dataLoaderFactories = new HashMap(); - private Map> conflictSettingsCache = new HashMap>(); + private Map> conflictSettingsCache = new HashMap>(); private long lastConflictCacheResetTimeInMs = 0; @@ -441,8 +441,15 @@ protected IDataLoaderFactory getFactory(String channelId) { return factory; } + + public List getConflictSettingsNodeGroupLinks() { + List list = new ArrayList(); + list = sqlTemplate.query(getSql("selectConflictSettingsSql"), + new ConflictSettingsNodeGroupLinkMapper()); + return list; + } - public List getConflictSettingsNodeGroupLinks( + public List getConflictSettingsNodeGroupLinks( NodeGroupLink link, boolean refreshCache) { if (link != null) { long cacheTime = parameterService @@ -455,7 +462,7 @@ public List getConflictSettingsNodeGroupLinks( } } - List list = conflictSettingsCache.get(link); + List list = conflictSettingsCache.get(link); if (list == null) { list = sqlTemplate.query( getSql("selectConflictSettingsSql", @@ -469,15 +476,15 @@ public List getConflictSettingsNodeGroupLinks( return list; } else { - return new ArrayList(0); + return new ArrayList(0); } } - public void delete(ConflictSettingsNodeGroupLink settings) { + public void delete(ConflictSettingNodeGroupLink settings) { sqlTemplate.update(getSql("deleteConflictSettingsSql"), settings.getConflictSettingId()); } - public void save(ConflictSettingsNodeGroupLink setting) { + public void save(ConflictSettingNodeGroupLink setting) { this.lastConflictCacheResetTimeInMs = 0; if (sqlTemplate.update(getSql("updateConflictSettingsSql"), setting.getNodeGroupLink() .getSourceNodeGroupId(), setting.getNodeGroupLink().getTargetNodeGroupId(), setting @@ -537,9 +544,9 @@ protected void setTransportManager(ITransportManager transportManager) { } class ConflictSettingsNodeGroupLinkMapper implements - ISqlRowMapper { - public ConflictSettingsNodeGroupLink mapRow(Row rs) { - ConflictSettingsNodeGroupLink setting = new ConflictSettingsNodeGroupLink(); + ISqlRowMapper { + public ConflictSettingNodeGroupLink mapRow(Row rs) { + ConflictSettingNodeGroupLink setting = new ConflictSettingNodeGroupLink(); setting.setNodeGroupLink(new NodeGroupLink(rs.getString("source_node_group_id"), rs .getString("target_node_group_id"))); setting.setTargetChannelId(rs.getString("target_channel_id")); @@ -773,7 +780,7 @@ public IncomingBatch getCurrentBatch() { } } - public static class ConflictSettingsNodeGroupLink extends ConflictSetting { + public static class ConflictSettingNodeGroupLink extends ConflictSetting { private static final long serialVersionUID = 1L; protected NodeGroupLink nodeGroupLink; diff --git a/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml b/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml index 8c5947d93d..f6ce96c248 100644 --- a/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml +++ b/symmetric/symmetric-core/src/main/resources/symmetric-schema.xml @@ -431,8 +431,8 @@ - - + + diff --git a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractDataLoaderServiceTest.java b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractDataLoaderServiceTest.java index cdc2a33973..4ea1121ecb 100644 --- a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractDataLoaderServiceTest.java +++ b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractDataLoaderServiceTest.java @@ -27,7 +27,7 @@ import org.jumpmind.symmetric.model.IncomingBatch; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.service.IDataLoaderService; -import org.jumpmind.symmetric.service.impl.DataLoaderService.ConflictSettingsNodeGroupLink; +import org.jumpmind.symmetric.service.impl.DataLoaderService.ConflictSettingNodeGroupLink; import org.jumpmind.symmetric.transport.MockTransportManager; import org.jumpmind.symmetric.transport.internal.InternalIncomingTransport; import org.junit.After; @@ -340,7 +340,7 @@ public void testDataIntregrityError() throws Exception { String[] values = { getNextId(), "string3", "string not null3", "char3", "char not null3", "2007-01-02 00:00:00.0", "2007-02-03 04:05:06.0", "0", "47", "67.89", "0.474" }; - ConflictSettingsNodeGroupLink conflictSettings = new ConflictSettingsNodeGroupLink(); + ConflictSettingNodeGroupLink conflictSettings = new ConflictSettingNodeGroupLink(); conflictSettings.setNodeGroupLink(TestConstants.TEST_2_ROOT); conflictSettings.setConflictSettingId("dont_fallback"); conflictSettings.setResolveInsertType(ResolveInsertConflict.MANUAL);