move some doc apis to core API layer

docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.docsys;
 
-import io.nosqlbench.docsys.api.Docs;
-import io.nosqlbench.docsys.api.DocsBinder;
+import io.nosqlbench.docapi.Docs;
+import io.nosqlbench.docapi.DocsBinder;
 import io.nosqlbench.docsys.api.DocsysStaticManifest;
 
 //@Service(DocsysStaticManifest.class)

docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java

@@ -1,5 +1,6 @@
 package io.nosqlbench.docsys.api;
 
+import io.nosqlbench.docapi.DocsBinder;
 import io.nosqlbench.docsys.endpoints.DocsysMarkdownEndpoint;
 
 /**

docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java

@@ -1,5 +1,7 @@
 package io.nosqlbench.docsys.api;
 
+import io.nosqlbench.docapi.DocsBinder;
+
 /**
  * At runtime, any instances of this service will be used to find
  * paths to be hosted as static content.

docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java

@@ -1,6 +1,8 @@
 package io.nosqlbench.docsys.core;
 
-import io.nosqlbench.docsys.api.*;
+import io.nosqlbench.docapi.*;
+import io.nosqlbench.docsys.api.DocsysDynamicManifest;
+import io.nosqlbench.docsys.api.DocsysStaticManifest;
 
 import java.util.ServiceLoader;
 
@@ -29,4 +31,6 @@ public class DocsysPathLoader {
         }
         return docs;
     }
+
+
 }

docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.docsys.core;
 
 import io.nosqlbench.docsys.DocsysDefaultAppPath;
-import io.nosqlbench.docsys.api.Docs;
+import io.nosqlbench.docapi.Docs;
 import io.nosqlbench.docsys.api.WebServiceObject;
 import io.nosqlbench.docsys.handlers.FavIconHandler;
 import io.nosqlbench.nb.annotations.Maturity;

docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java

@@ -1,8 +1,8 @@
 package io.nosqlbench.docsys.endpoints;
 
-import io.nosqlbench.docsys.api.Docs;
-import io.nosqlbench.docsys.api.DocsBinder;
-import io.nosqlbench.docsys.api.DocsNameSpace;
+import io.nosqlbench.docapi.Docs;
+import io.nosqlbench.docapi.DocsBinder;
+import io.nosqlbench.docapi.DocsNameSpace;
 import io.nosqlbench.docsys.api.WebServiceObject;
 import io.nosqlbench.docsys.core.DocsysPathLoader;
 import io.nosqlbench.docsys.core.PathWalker;

engine-docs/src/main/java/io/nosqlbench/engine/docs/NosqlbenchMarkdownManifest.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.engine.docs;
 
-import io.nosqlbench.docsys.api.Docs;
-import io.nosqlbench.docsys.api.DocsBinder;
+import io.nosqlbench.docapi.Docs;
+import io.nosqlbench.docapi.DocsBinder;
 import io.nosqlbench.docsys.api.DocsysDynamicManifest;
 import io.nosqlbench.nb.annotations.Service;
 

nb-api/src/main/java/io/nosqlbench/docapi/DocsBinder.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.docsys.api;
+package io.nosqlbench.docapi;
 
 import java.nio.file.Path;
 import java.util.List;

nb-api/src/main/java/io/nosqlbench/docapi/DocsNameSpace.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.docsys.api;
+package io.nosqlbench.docapi;
 
 import java.nio.file.Path;
 import java.util.List;

nb-api/src/main/java/io/nosqlbench/docapi/DocsNameSpaceImpl.java

@@ -1,4 +1,4 @@
-package io.nosqlbench.docsys.api;
+package io.nosqlbench.docapi;
 
 import java.nio.file.Path;
 import java.util.*;
@@ -42,7 +42,7 @@ public class DocsNameSpaceImpl implements DocsNameSpace {
     public String toString() {
         return "DocPath{" +
                 "namespace='" + namespace + '\'' +
-                ",paths=" + paths.toString() +
+                ",paths=" + paths +
                 '}';
     }
 

virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java

@@ -1,7 +1,7 @@
 package io.nosqlbench.virtdata.userlibs.docinfo;
 
-import io.nosqlbench.docsys.api.Docs;
-import io.nosqlbench.docsys.api.DocsBinder;
+import io.nosqlbench.docapi.Docs;
+import io.nosqlbench.docapi.DocsBinder;
 import io.nosqlbench.docsys.api.DocsysDynamicManifest;
 import io.nosqlbench.nb.annotations.Service;