fix misaligned versions from github PR

This commit is contained in:
Jonathan Shook 2021-06-25 19:26:42 -05:00
parent 6403fcaf7f
commit c3a6ba0de7
2 changed files with 27 additions and 5 deletions

View File

@ -5,6 +5,9 @@
<packaging>jar</packaging>
<name>docsys</name>
<url>http://nosqlbench.io/</url>
<properties>
<jersey.version>3.0.2</jersey.version>
</properties>
<parent>
<artifactId>mvn-defaults</artifactId>
@ -52,23 +55,23 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>3.0.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>3.0.2</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-jetty-servlet</artifactId>
<version>3.0.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>3.0.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>

View File

@ -64,6 +64,15 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
}
/**
* Run a NoSQLBench command just as you would on the command line. Certain parameters are translated
* (virtualized) into the workspace view for you automatically. That is, any path which would otherwise
* be resolved on the local file system will now be resolved in that same way but with the designated workspace
* as the base directory. All filesystem interaction which would otherwise happen in the current working
* directory should also be done relative to the designated workspace.
* @param rq
* @return
*/
@POST
@Path("cli")
@Consumes(MediaType.APPLICATION_JSON)
@ -95,7 +104,6 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
}
}
args = substituteFilenames(rq, args);
NBCLICommandParser.parse(args, cmdList, workspace.asIncludes());
ScriptBuffer buffer = new BasicScriptBuffer();
@ -193,6 +201,12 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
// return Response.created(scenarioUri).build();
// }
/**
* Return a view of a named scenario, just as with {@link #getScenarios()}}.
* If the named scenario is not present, an error will be returned instead.
* @param scenarioName
* @return
*/
@GET
@Path("scenario/{scenarioName}")
@Produces(MediaType.APPLICATION_JSON)
@ -207,6 +221,11 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
}
}
/**
* @return a view of all the scenarios known to the scenarios executor, whether starting,
* running, errored or otherwise. If the scenario is completed, then the result,
* including the IO log will be provided, otherwise an exception to explain why it failed.
*/
@GET
@Path("scenarios")
@Produces(MediaType.APPLICATION_JSON)