Small refactoring, renaming a class

jettro · Oct 1, 2012 · 4e9daf6 · 4e9daf6
1 parent 20d9ed5
commit 4e9daf6
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 28 deletions.
diff --git a/src/main/java/nl/gridshore/integration/Constants.java b/src/main/java/nl/gridshore/integration/Constants.java
@@ -5,4 +5,5 @@
  */
 public interface Constants {
     String START_TIME_HEADER_KEY = "START_TIME";
+    String DISCARD_CHANNEL_HEADER_KEY = "DISCARD_CHANNEL"; // Beware value is used in xml as well
 }
diff --git a/src/main/java/nl/gridshore/integration/GatherStatisticsAggregator.java b/src/main/java/nl/gridshore/integration/GatherStatisticsAggregator.java
@@ -7,19 +7,22 @@
 
 import java.util.List;
 
+import static nl.gridshore.integration.Constants.DISCARD_CHANNEL_HEADER_KEY;
+import static nl.gridshore.integration.Constants.START_TIME_HEADER_KEY;
+
 /**
  * @author Jettro Coenradie
  */
 public class GatherStatisticsAggregator {
 
     @Aggregator
-    public Statistics aggregate(List<Message> messages, @Header(value = "START_TIME") DateTime startTime) {
+    public Statistics aggregate(List<Message> messages, @Header(value = START_TIME_HEADER_KEY) DateTime startTime) {
         DateTime endTime = new DateTime();
 
         int success = 0;
         int failure = 0;
         for (Message message : messages) {
-            if (null == message.getHeaders().get("DISCARD_CHANNEL")) {
+            if (null == message.getHeaders().get(DISCARD_CHANNEL_HEADER_KEY)) {
                 success++;
             } else {
                 failure++;

diff --git a/src/main/resources/sync-context.xml b/src/main/resources/sync-context.xml
@@ -46,7 +46,6 @@
     <!-- helpers -->
     <bean id="statisticsEndpoint" class="nl.gridshore.integration.StatisticsEndpoint"/>
     <bean id="gatherStatisticsAggregator" class="nl.gridshore.integration.GatherStatisticsAggregator"/>
-    <!--<bean id="storeSyncResultsEndpoint" class="nl.gridshore.integration.StoreSyncResultsEndpoint"/>-->
 
     <!-- Logging -->
     <!--<int:wire-tap pattern="sync*" channel="logger"/>-->

diff --git a/...a/nl/gridshore/integration/DummyItem.java → ...ridshore/integration/DummyTargetItem.java b/...a/nl/gridshore/integration/DummyItem.java → ...ridshore/integration/DummyTargetItem.java
@@ -3,10 +3,10 @@
 /**
  * @author Jettro Coenradie
  */
-public class DummyItem {
+public class DummyTargetItem {
     private String name;
 
-    public DummyItem(String name) {
+    public DummyTargetItem(String name) {
         this.name = name;
     }
 
@@ -16,7 +16,7 @@ public String getName() {
 
     @Override
     public String toString() {
-        return "DummyItem{" +
+        return "DummyTargetItem{" +
                 "name='" + name + '\'' +
                 '}';
     }

diff --git a/src/test/java/nl/gridshore/integration/DummyTargetSystem.java b/src/test/java/nl/gridshore/integration/DummyTargetSystem.java
@@ -10,31 +10,31 @@
  * @author Jettro Coenradie
  */
 @Component(value = "targetApi")
-public class DummyTargetSystem implements TargetApi<DummyItem, String> {
-    private List<DummyItem> items;
+public class DummyTargetSystem implements TargetApi<DummyTargetItem, String> {
+    private List<DummyTargetItem> targetItems;
 
     {
-        items = new ArrayList<DummyItem>();
-        items.add(new DummyItem("name 1"));
-        items.add(new DummyItem("name 2"));
-        items.add(new DummyItem("name 3"));
-        items.add(new DummyItem("name 4"));
-        items.add(new DummyItem("name 5"));
-        items.add(new DummyItem("name 6"));
-        items.add(new DummyItem("name 7"));
-        items.add(new DummyItem("name 8"));
-        items.add(new DummyItem("name 9"));
+        targetItems = new ArrayList<DummyTargetItem>();
+        targetItems.add(new DummyTargetItem("name 1"));
+        targetItems.add(new DummyTargetItem("name 2"));
+        targetItems.add(new DummyTargetItem("name 3"));
+        targetItems.add(new DummyTargetItem("name 4"));
+        targetItems.add(new DummyTargetItem("name 5"));
+        targetItems.add(new DummyTargetItem("name 6"));
+        targetItems.add(new DummyTargetItem("name 7"));
+        targetItems.add(new DummyTargetItem("name 8"));
+        targetItems.add(new DummyTargetItem("name 9"));
     }
 
-    public List<DummyItem> obtainItemsToSync() {
-        return items;
+    public List<DummyTargetItem> obtainItemsToSync() {
+        return targetItems;
     }
 
-    public List<DummyItem> obtainItemsToSyncSince(DateTime time) {
-        return items.subList(5, 8);
+    public List<DummyTargetItem> obtainItemsToSyncSince(DateTime time) {
+        return targetItems.subList(5, 8);
     }
 
-    public List<DummyItem> obtainItemsToSync(List<String> identifiers) {
-        return items.subList(2, 3);
+    public List<DummyTargetItem> obtainItemsToSync(List<String> identifiers) {
+        return targetItems.subList(2, 3);
     }
 }
diff --git a/src/test/java/nl/gridshore/integration/DummyTargetToSourceTransformer.java b/src/test/java/nl/gridshore/integration/DummyTargetToSourceTransformer.java
@@ -6,13 +6,13 @@
  * @author Jettro Coenradie
  */
 @Component(value = "targetToSourceTransformer")
-public class DummyTargetToSourceTransformer extends TargetToSourceTransformer<DummySourceItem, DummyItem> {
+public class DummyTargetToSourceTransformer extends TargetToSourceTransformer<DummySourceItem, DummyTargetItem> {
 
     @Override
-    protected DummySourceItem doTransform(DummyItem targetItem) {
-        if (targetItem.getName().equals("name 4")) {
+    protected DummySourceItem doTransform(DummyTargetItem targetTargetItem) {
+        if (targetTargetItem.getName().equals("name 4")) {
             throw new RuntimeException("error in transformer");
         }
-        return new DummySourceItem(targetItem.getName());
+        return new DummySourceItem(targetTargetItem.getName());
     }
 }