MOTECH-2705: Corrections after review.

Author: pkornowski

modules/tasks/tasks-test-bundle/pom.xml

@@ -36,6 +36,21 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Context-Path>testmodule/api</Context-Path>
+                        <Resource-Path>testmodule</Resource-Path>
+                        <Blueprint-Enabled>true</Blueprint-Enabled>
+                        <Export-Package>
+                            org.motechproject.testmodule.service;version=${project.version},
+                            org.motechproject.testmodule.domain;version=${project.version}
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -47,4 +62,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

modules/tasks/tasks-test-bundle/src/main/resources/META-INF/spring/blueprint.xml

@@ -10,7 +10,6 @@
     <context:annotation-config/>
     <context:component-scan base-package="org.motechproject.testmodule"/>
 
-    
-    <osgi:service id="tasksTestServiceOsgi" ref="tasksTestService"  interface="org.motechproject.testmodule.service.TasksTestService" auto-export="interfaces" />
+    <osgi:service ref="tasksTestService"  interface="org.motechproject.testmodule.service.TasksTestService" auto-export="interfaces" />
 
 </beans>

modules/tasks/tasks/src/main/java/org/motechproject/tasks/service/impl/TaskTriggerHandler.java

@@ -166,7 +166,6 @@ private void handleTask(Task task, Map<String, Object> parameters, boolean isRet
         Map<String, Object> metadata = prepareTaskMetadata(task.getId(), activityId, isRetry);
 
         TaskContext taskContext = new TaskContext(task, parameters, metadata, activityService);
-
         TaskInitializer initializer = new TaskInitializer(taskContext);
 
         try {

modules/tasks/tasks/src/main/resources/META-INF/spring/blueprint.xml

@@ -58,7 +58,6 @@
     <osgi:reference id="tasksDataServiceOSGi"
                     interface="org.motechproject.tasks.repository.TasksDataService"/>
 
-
     <osgi:reference id="triggerEventDataService"
                     interface="org.motechproject.tasks.repository.TriggerEventsDataService"/>
 

modules/tasks/tasks/src/test/java/org/motechproject/tasks/it/ActionParametersBundleIT.java

@@ -120,6 +120,12 @@ public void setUp() throws IOException, InterruptedException {
         waitForChannel(MDS_CHANNEL_NAME);
     }
 
+    @After
+    public void clean() {
+        deleteTask(taskID);
+        removeChannels(channelsDataService.retrieveAll());
+    }
+
     @Test
     public void testActionWithPostActionParameters() throws InterruptedException, IOException, ActionNotFoundException {
         taskID = createTestTask();
@@ -136,13 +142,6 @@ public void testActionWithPostActionParameters() throws InterruptedException, IO
         assertTrue(fetchedTaskTestObjects.contains(expectedTaskTestObject.get(2)));
     }
 
-    @After
-    public void clean() {
-        deleteTask(taskID);
-        removeChannels(channelsDataService.retrieveAll());
-    }
-
-
     private Long createTestTask() {
         TaskTriggerInformation triggerInformation = new TaskTriggerInformation("CREATE SettingsRecord", "data-services", MDS_CHANNEL_NAME,
                 VERSION, TRIGGER_SUBJECT, TRIGGER_SUBJECT);
@@ -255,7 +254,7 @@ private void removeChannels(List<Channel> channels) {
         Iterator<Channel> it = channels.iterator();
         while (it.hasNext()) {
             Channel channel = it.next();
-            if(channel.getModuleName() != null) {
+            if (StringUtils.equals(TASK_TEST_CHANNEL_NAME, channel.getModuleName()) || StringUtils.equals(MDS_CHANNEL_NAME, channel.getModuleName()) ) {
                 channelService.unregisterChannel(channel.getModuleName());
             }
         }

modules/tasks/tasks/src/test/java/org/motechproject/tasks/it/TasksIntegrationTests.java

@@ -4,7 +4,7 @@
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({TasksBundleIT.class, ActionParametersBundleIT.class, ChannelsDataServiceBundleIT.class, TaskDataServiceBundleIT.class,
-        TaskActivitiesDataServiceBundleIT.class})
+@Suite.SuiteClasses({ActionParametersBundleIT.class, ChannelsDataServiceBundleIT.class,  TaskDataServiceBundleIT.class, TaskActivitiesDataServiceBundleIT.class,
+        TasksBundleIT.class})
 public class TasksIntegrationTests {
 }