From 4c91fcbc89553db1a4574c9727608aa54086510f Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Wed, 12 Aug 2020 00:00:06 -0500
Subject: [PATCH] organize core endpoints

---
 .../java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java | 2 +-
 .../docsys/{core => endpoints}/DocServerStatusEndpoint.java  | 5 +++--
 .../docsys/{core => endpoints}/DocsysMarkdownEndpoint.java   | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename docsys/src/main/java/io/nosqlbench/docsys/{core => endpoints}/DocServerStatusEndpoint.java (84%)
 rename docsys/src/main/java/io/nosqlbench/docsys/{core => endpoints}/DocsysMarkdownEndpoint.java (97%)

diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java b/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
index 145e76316..8278054bf 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
@@ -1,6 +1,6 @@
 package io.nosqlbench.docsys.api;
 
-import io.nosqlbench.docsys.core.DocsysMarkdownEndpoint;
+import io.nosqlbench.docsys.endpoints.DocsysMarkdownEndpoint;
 
 /**
  * At runtime, any instances of this service will be used to find
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerStatusEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocServerStatusEndpoint.java
similarity index 84%
rename from docsys/src/main/java/io/nosqlbench/docsys/core/DocServerStatusEndpoint.java
rename to docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocServerStatusEndpoint.java
index 5f6cd065c..c5f4f4544 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocServerStatusEndpoint.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocServerStatusEndpoint.java
@@ -1,5 +1,6 @@
-package io.nosqlbench.docsys.core;
+package io.nosqlbench.docsys.endpoints;
 
+import io.nosqlbench.docsys.core.NBWebServer;
 import io.nosqlbench.nb.annotations.Service;
 import io.nosqlbench.docsys.api.WebServiceObject;
 import org.apache.logging.log4j.Logger;
@@ -30,7 +31,7 @@ public class DocServerStatusEndpoint implements WebServiceObject {
     @Path("status")
     @Produces(MediaType.APPLICATION_JSON)
     public String getStats() {
-        DocServer s = (DocServer) config.getProperty("server");
+        NBWebServer s = (NBWebServer) config.getProperty("server");
         return s.toString();
     }
 
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java
similarity index 97%
rename from docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java
rename to docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java
index c48f078db..67267c5f6 100644
--- a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysMarkdownEndpoint.java
+++ b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java
@@ -1,5 +1,7 @@
-package io.nosqlbench.docsys.core;
+package io.nosqlbench.docsys.endpoints;
 
+import io.nosqlbench.docsys.core.DocsysPathLoader;
+import io.nosqlbench.docsys.core.PathWalker;
 import io.nosqlbench.nb.annotations.Service;
 import io.nosqlbench.docsys.api.DocsNameSpace;
 import io.nosqlbench.docsys.api.Docs;