From 45e77f8db82171826b78d082d3f076f055ea45f9 Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Fri, 7 Aug 2020 12:38:34 -0500
Subject: [PATCH] endpoint organization

---
 ...ice.java => ScenarioExecutorEndpoint.java} |  4 ++--
 .../resources/ScenarioTemplateService.java    | 24 -------------------
 .../resources}/WorkloadFinderEndpoint.java    |  2 +-
 3 files changed, 3 insertions(+), 27 deletions(-)
 rename engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/{ScenarioExecutorService.java => ScenarioExecutorEndpoint.java} (98%)
 delete mode 100644 engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioTemplateService.java
 rename {engine-core/src/main/java/io/nosqlbench/engine/core/services => engine-rest/src/main/java/io/nosqlbench/engine/rest/resources}/WorkloadFinderEndpoint.java (97%)

diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorService.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
similarity index 98%
rename from engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorService.java
rename to engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
index 15d5bbedf..3de1594a3 100644
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorService.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
@@ -28,7 +28,7 @@ import java.util.*;
 @Service(WebServiceObject.class)
 @Singleton
 @Path("/services/executor/")
-public class ScenarioExecutorService implements WebServiceObject {
+public class ScenarioExecutorEndpoint implements WebServiceObject {
 
     private ScenariosExecutor executor = new ScenariosExecutor("executor-service", 1);
 
@@ -73,7 +73,7 @@ public class ScenarioExecutorService implements WebServiceObject {
 
         executor.execute(scenario);
 
-        return Response.created(UriBuilder.fromResource(ScenarioExecutorService.class).path(
+        return Response.created(UriBuilder.fromResource(ScenarioExecutorEndpoint.class).path(
                 "scenario/" + rq.getScenarioName()).build()).build();
 
     }
diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioTemplateService.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioTemplateService.java
deleted file mode 100644
index f7fbe205e..000000000
--- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioTemplateService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.nosqlbench.engine.rest.resources;
-
-import io.nosqlbench.docsys.api.WebServiceObject;
-import io.nosqlbench.nb.annotations.Service;
-
-import javax.inject.Singleton;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-
-@Service(WebServiceObject.class)
-@Singleton
-@Path("/services/namedscenarios/")
-public class ScenarioTemplateService implements WebServiceObject {
-
-    public ScenarioTemplateService() {
-        super();
-    }
-
-    @GET
-    @Path("service-status")
-    public String status() {
-        return "Here at " + System.nanoTime();
-    }
-}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/services/WorkloadFinderEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkloadFinderEndpoint.java
similarity index 97%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/services/WorkloadFinderEndpoint.java
rename to engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkloadFinderEndpoint.java
index 41f520311..4a5610c6a 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/services/WorkloadFinderEndpoint.java
+++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkloadFinderEndpoint.java
@@ -1,4 +1,4 @@
-package io.nosqlbench.engine.core.services;
+package io.nosqlbench.engine.rest.resources;
 
 import io.nosqlbench.docsys.api.WebServiceObject;
 import io.nosqlbench.engine.api.scenarios.NBCLIScenarioParser;