Misc code cleanup

Author: bbimber

cluster/src/org/labkey/cluster/PipelineStartup.java

@@ -35,7 +35,7 @@ private void registerPipelineSteps()
     {
         if (PipelineJobService.get().getLocationType() == PipelineJobService.LocationType.WebServer)
         {
-            for (RemoteExecutionEngine engine : PipelineJobService.get().getRemoteExecutionEngines())
+            for (RemoteExecutionEngine<?> engine : PipelineJobService.get().getRemoteExecutionEngines())
             {
                 try
                 {

cluster/src/org/labkey/cluster/pipeline/ClusterPipelineJob.java

@@ -54,7 +54,7 @@ private ClusterPipelineJob(Container c, User user, PipeRoot pipeRoot, String des
         _location = location;
     }
 
-    public static ClusterPipelineJob createJob(Container c, User user, String jobName, ClusterService.ClusterRemoteTask runnable, RemoteExecutionEngine engine, File logFile) throws PipelineValidationException
+    public static ClusterPipelineJob createJob(Container c, User user, String jobName, ClusterService.ClusterRemoteTask runnable, RemoteExecutionEngine<?> engine, File logFile) throws PipelineValidationException
     {
         if (!logFile.exists())
         {
@@ -134,7 +134,7 @@ public ClusterService.ClusterRemoteTask getRunnable()
     }
 
     @Override
-    public TaskPipeline getTaskPipeline()
+    public TaskPipeline<?> getTaskPipeline()
     {
         return PipelineJobService.get().getTaskPipeline(_taskPipelineId);
     }
@@ -161,9 +161,9 @@ public ClusterTaskFactory(TaskId id, String location)
         }
 
         @Override
-        public Task createTask(PipelineJob job)
+        public Task<ClusterTaskFactory> createTask(PipelineJob job)
         {
-            return new Task<ClusterTaskFactory>(this, job)
+            return new Task<>(this, job)
             {
                 @NotNull
                 @Override

cluster/src/org/labkey/cluster/pipeline/TestCase.java

@@ -53,8 +53,7 @@ public static void initialSetUp() throws Exception
         if (project == null)
         {
             project = ContainerManager.createContainer(ContainerManager.getRoot(), PROJECT_NAME);
-            Set<Module> modules = new HashSet<>();
-            modules.addAll(project.getActiveModules());
+            Set<Module> modules = new HashSet<>(project.getActiveModules());
             modules.add(ModuleLoader.getInstance().getModule(ClusterModule.class));
             project.setActiveModules(modules);
         }
@@ -102,12 +101,12 @@ protected static void doCleanup(String projectName)
     public void basicTest() throws Exception
     {
         Container c = ContainerManager.getForPath(PROJECT_NAME);
-        for (RemoteExecutionEngine engine : PipelineJobService.get().getRemoteExecutionEngines())
+        for (RemoteExecutionEngine<?> engine : PipelineJobService.get().getRemoteExecutionEngines())
         {
             _log.info("testing engine: " + engine.getType());
             if (engine instanceof AbstractClusterExecutionEngine)
             {
-                runTestJob(c, TestContext.get().getUser(), (AbstractClusterExecutionEngine) engine);
+                runTestJob(c, TestContext.get().getUser(), (AbstractClusterExecutionEngine<?>) engine);
             }
         }
     }
@@ -140,7 +139,7 @@ public void run(Logger log)
         }
     }
 
-    public static void runTestJob(Container c, User u, AbstractClusterExecutionEngine engine) throws PipelineJobException
+    public static void runTestJob(Container c, User u, AbstractClusterExecutionEngine<?> engine) throws PipelineJobException
     {
         boolean orig = engine.isDebug();
         try