Rename /processes to /stages

Author: dustalov

src/main/java/mtsar/dropwizard/MechanicalTsarApplication.java

@@ -63,7 +63,7 @@ public class MechanicalTsarApplication extends Application<MechanicalTsarConfigu
      * The application-wide map that contains stages. Since it is convenient to preserve the database
      * row order, it is implemented as a <tt>LinkedHashMap</tt>.
      */
-    private final Map<String, Stage> processes = new LinkedHashMap<>();
+    private final Map<String, Stage> stages = new LinkedHashMap<>();
 
     private DBI jdbi;
     private ServiceLocator locator;
@@ -82,7 +82,7 @@ public ServiceLocator getLocator() {
     }
 
     public Map<String, Stage> getStages() {
-        return processes;
+        return stages;
     }
 
     @Override
@@ -105,24 +105,24 @@ public void initialize(Bootstrap<MechanicalTsarConfiguration> bootstrap) {
     }
 
     private void bootstrap(MechanicalTsarConfiguration configuration, Environment environment) throws ClassNotFoundException {
-        synchronized (processes) {
+        synchronized (stages) {
             if (jdbi == null)
                 jdbi = new DBIFactory().build(environment, configuration.getDataSourceFactory(), "postgresql");
 
             if (locator == null)
-                locator = Injections.createLocator(new ApplicationBinder(jdbi, processes));
+                locator = Injections.createLocator(new ApplicationBinder(jdbi, stages));
 
             final StageDAO stageDAO = requireNonNull(locator.getService(StageDAO.class));
             final List<Stage.Definition> definitions = stageDAO.select();
-            processes.clear();
+            stages.clear();
 
             for (final Stage.Definition definition : definitions) {
                 final Class<? extends WorkerRanker> workerRankerClass = Class.forName(definition.getWorkerRanker()).asSubclass(WorkerRanker.class);
                 final Class<? extends TaskAllocator> taskAllocatorClass = Class.forName(definition.getTaskAllocator()).asSubclass(TaskAllocator.class);
                 final Class<? extends AnswerAggregator> answerAggregatorClass = Class.forName(definition.getAnswerAggregator()).asSubclass(AnswerAggregator.class);
                 final ServiceLocator processLocator = Injections.createLocator(locator, new StageBinder(definition, workerRankerClass, taskAllocatorClass, answerAggregatorClass));
                 final Stage stage = requireNonNull(processLocator.getService(Stage.class));
-                processes.put(definition.getId(), stage);
+                stages.put(definition.getId(), stage);
             }
         }
     }

src/main/java/mtsar/resources/AnswerResource.java

@@ -133,7 +133,7 @@ private Answer fetchAnswer(Integer id) {
 
     private URI getAnswersURI(UriInfo uriInfo) {
         return uriInfo.getBaseUriBuilder().
-                path("processes").path(stage.getId()).
+                path("stages").path(stage.getId()).
                 path("answers").
                 build();
     }

src/main/java/mtsar/resources/MetaResource.java

@@ -37,15 +37,15 @@
 @Produces(mtsar.util.MediaType.APPLICATION_JSON)
 public class MetaResource {
     private final MechanicalTsarVersion version;
-    private final Map<String, Stage> processes;
+    private final Map<String, Stage> stages;
     private final TaskDAO taskDAO;
     private final WorkerDAO workerDAO;
     private final AnswerDAO answerDAO;
 
     @Inject
-    public MetaResource(MechanicalTsarVersion version, @Named("stages") Map<String, Stage> processes, TaskDAO taskDAO, WorkerDAO workerDAO, AnswerDAO answerDAO) {
+    public MetaResource(MechanicalTsarVersion version, @Named("stages") Map<String, Stage> stages, TaskDAO taskDAO, WorkerDAO workerDAO, AnswerDAO answerDAO) {
         this.version = version;
-        this.processes = processes;
+        this.stages = stages;
         this.taskDAO = taskDAO;
         this.workerDAO = workerDAO;
         this.answerDAO = answerDAO;
@@ -54,7 +54,7 @@ public MetaResource(MechanicalTsarVersion version, @Named("stages") Map<String,
     @GET
     @Produces(MediaType.TEXT_HTML)
     public DashboardView getDashboardView() {
-        return new DashboardView(version, processes, taskDAO, workerDAO, answerDAO);
+        return new DashboardView(version, stages, taskDAO, workerDAO, answerDAO);
     }
 
     @GET

src/main/java/mtsar/resources/StageResource.java

@@ -41,7 +41,7 @@
 import java.util.Map;
 
 @Singleton
-@Path("/processes")
+@Path("/stages")
 @Produces(mtsar.util.MediaType.APPLICATION_JSON)
 public class StageResource {
     private final Map<String, Stage> stages;

src/main/java/mtsar/resources/TaskResource.java

@@ -144,14 +144,14 @@ private Task fetchTask(Integer id) {
 
     private URI getTasksURI(UriInfo uriInfo) {
         return uriInfo.getBaseUriBuilder().
-                path("processes").path(stage.getId()).
+                path("stages").path(stage.getId()).
                 path("tasks").
                 build();
     }
 
     private URI getTaskURI(UriInfo uriInfo, Task task) {
         return uriInfo.getBaseUriBuilder().
-                path("processes").path(stage.getId()).
+                path("stages").path(stage.getId()).
                 path("tasks").path(task.getId().toString()).
                 build();
     }

src/main/java/mtsar/resources/WorkerResource.java

@@ -274,14 +274,14 @@ private Task fetchTask(Integer id) {
 
     private URI getWorkersURI(UriInfo uriInfo) {
         return uriInfo.getBaseUriBuilder().
-                path("processes").path(stage.getId()).
+                path("stages").path(stage.getId()).
                 path("workers").
                 build();
     }
 
     private URI getWorkerURI(UriInfo uriInfo, Worker worker) {
         return uriInfo.getBaseUriBuilder().
-                path("processes").path(stage.getId()).
+                path("stages").path(stage.getId()).
                 path("workers").path(worker.getId().toString()).
                 build();
     }

src/main/java/mtsar/views/AnswersView.java

@@ -56,15 +56,15 @@ public int getAnswerCount() {
     @SuppressWarnings("unused")
     public String getStagePath() {
         return uriInfo.getBaseUriBuilder().
-                path("processes").
+                path("stages").
                 path(stage.getId()).
                 toString();
     }
 
     @SuppressWarnings("unused")
     public String getPath() {
         return uriInfo.getBaseUriBuilder().
-                path("processes").
+                path("stages").
                 path(stage.getId()).
                 path("answers").
                 toString();

src/main/java/mtsar/views/TasksView.java

@@ -56,15 +56,15 @@ public int getTaskCount() {
     @SuppressWarnings("unused")
     public String getStagePath() {
         return uriInfo.getBaseUriBuilder().
-                path("processes").
+                path("stages").
                 path(stage.getId()).
                 toString();
     }
 
     @SuppressWarnings("unused")
     public String getPath() {
         return uriInfo.getBaseUriBuilder().
-                path("processes").
+                path("stages").
                 path(stage.getId()).
                 path("tasks").
                 toString();

src/main/java/mtsar/views/WorkersView.java

@@ -56,15 +56,15 @@ public int getWorkerCount() {
     @SuppressWarnings("unused")
     public String getStagePath() {
         return uriInfo.getBaseUriBuilder().
-                path("processes").
+                path("stages").
                 path(stage.getId()).
                 toString();
     }
 
     @SuppressWarnings("unused")
     public String getPath() {
         return uriInfo.getBaseUriBuilder().
-                path("processes").
+                path("stages").
                 path(stage.getId()).
                 path("workers").
                 toString();

src/main/resources/mtsar/views/layout.mustache

@@ -23,7 +23,7 @@
         </a>
     </div>
     <div class="pure-u-1-3">
-        <a href="/processes" class="pure-button height-large width-max">
+        <a href="/stages" class="pure-button height-large width-max">
             <i class="fa fa-cog"></i> Stages
         </a>
     </div>