diff --git a/docsys/pom.xml b/docsys/pom.xml index 625cc27e4..0a59d8b5e 100644 --- a/docsys/pom.xml +++ b/docsys/pom.xml @@ -31,71 +31,86 @@ org.eclipse.jetty jetty-server + 11.0.1 org.eclipse.jetty jetty-servlets - 9.4.35.v20201120 + 11.0.1 org.eclipse.jetty jetty-servlet + 11.0.1 org.eclipse.jetty jetty-rewrite + 11.0.1 + org.glassfish.jersey.core jersey-server + 3.0.1 + org.glassfish.jersey.core jersey-common + 3.0.1 org.glassfish.jersey.containers jersey-container-jetty-servlet + 3.0.1 org.glassfish.jersey.inject jersey-hk2 + 3.0.1 org.apache.commons commons-compress + 1.20 - - javax.ws.rs - javax.ws.rs-api - + org.glassfish.jersey.media jersey-media-json-jackson + 3.0.1 com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider + 2.12.2 + + + + com.sun.xml.bind + jaxb-core + 2.3.0.1 + + + com.sun.xml.bind + jaxb-impl + 2.4.0-b180830.0438 javax.xml.bind jaxb-api - - - com.sun.xml.bind - jaxb-core - - - com.sun.xml.bind - jaxb-impl + 2.4.0-b180830.0359 javax.activation activation + 1.1.1 + io.nosqlbench virtdata-api diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java b/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java index acc703ff2..f19946a37 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java @@ -5,6 +5,8 @@ import io.nosqlbench.docsys.api.Docs; import io.nosqlbench.docsys.api.WebServiceObject; import io.nosqlbench.docsys.handlers.FavIconHandler; import io.nosqlbench.nb.api.spi.SimpleServiceLoader; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.ServletRegistration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.jetty.rewrite.handler.RewriteHandler; @@ -26,8 +28,6 @@ import org.glassfish.jersey.server.ServerProperties; import org.glassfish.jersey.server.model.ResourceMethod; import org.glassfish.jersey.servlet.ServletContainer; -import javax.servlet.DispatcherType; -import javax.servlet.ServletRegistration; import java.awt.*; import java.net.MalformedURLException; import java.net.URI; diff --git a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocServerStatusEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocServerStatusEndpoint.java index 04f3eff7f..d16b088b4 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocServerStatusEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocServerStatusEndpoint.java @@ -1,18 +1,17 @@ package io.nosqlbench.docsys.endpoints; +import io.nosqlbench.docsys.api.WebServiceObject; import io.nosqlbench.docsys.core.NBWebServer; import io.nosqlbench.nb.annotations.Service; -import io.nosqlbench.docsys.api.WebServiceObject; -import org.apache.logging.log4j.Logger; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; import org.apache.logging.log4j.LogManager; - -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; +import org.apache.logging.log4j.Logger; @Service(value = WebServiceObject.class, selector = "docserver-status") @Singleton diff --git a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java index eff4dd873..a4a544927 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/endpoints/DocsysMarkdownEndpoint.java @@ -7,13 +7,13 @@ import io.nosqlbench.docsys.api.WebServiceObject; import io.nosqlbench.docsys.core.DocsysPathLoader; import io.nosqlbench.docsys.core.PathWalker; import io.nosqlbench.nb.annotations.Service; +import jakarta.inject.Singleton; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.inject.Singleton; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -128,13 +128,6 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { return list; } -// @GET -// @Path("file") -// @Produces(MediaType.TEXT_PLAIN) -// public String getFileByPath(@QueryParam("path") String pathspec) { -// return getFile(pathspec); -// } -// /** * @param pathspec the path as known to the manifest * @return The contents of a file @@ -153,25 +146,6 @@ public class DocsysMarkdownEndpoint implements WebServiceObject { } } -// private String getFile(String pathspec) { -// pathspec = URLDecoder.decode(pathspec, StandardCharsets.UTF_8); -// for (java.nio.file.Path path : enabled.getPaths()) { -// java.nio.file.Path resolved = path.resolve(pathspec); -// if (Files.isDirectory(resolved)) { -// throw new RuntimeException("Path is a directory: '" + pathspec + "'"); -// } -// if (Files.exists(resolved)) { -// try { -// String content = Files.readString(resolved, StandardCharsets.UTF_8); -// return content; -// } catch (IOException e) { -// throw new RuntimeException(e); -// } -// } -// } -// throw new RuntimeException("Unable to find any valid file at '" + pathspec + "'"); -// } - public java.nio.file.Path findPath(String pathspec) { pathspec = URLDecoder.decode(pathspec, StandardCharsets.UTF_8); for (java.nio.file.Path path : enabled.getPaths()) { diff --git a/docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java b/docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java index dc7ca90e3..a9ebbb44e 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java @@ -1,12 +1,12 @@ package io.nosqlbench.docsys.handlers; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.servlet.ServletHandler; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; public class EndpointsHandler extends ServletHandler { diff --git a/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java b/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java index 659004bd8..752501ed5 100644 --- a/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java +++ b/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java @@ -1,17 +1,17 @@ package io.nosqlbench.docsys.handlers; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.resource.Resource; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URL; import java.nio.file.Path; diff --git a/docsys/src/test/java/io/nosqlbench/docsys/core/TestServlet1.java b/docsys/src/test/java/io/nosqlbench/docsys/core/TestServlet1.java index 7c9040882..ecefd7f38 100644 --- a/docsys/src/test/java/io/nosqlbench/docsys/core/TestServlet1.java +++ b/docsys/src/test/java/io/nosqlbench/docsys/core/TestServlet1.java @@ -1,14 +1,14 @@ package io.nosqlbench.docsys.core; import io.nosqlbench.docsys.api.WebServiceObject; -import org.apache.logging.log4j.Logger; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/driver-cql-shaded/src/main/java/io/nosqlbench/endpoints/cql/CqlWorkloadGeneratorEndpoint.java b/driver-cql-shaded/src/main/java/io/nosqlbench/endpoints/cql/CqlWorkloadGeneratorEndpoint.java index a666daf55..dfdb603fc 100644 --- a/driver-cql-shaded/src/main/java/io/nosqlbench/endpoints/cql/CqlWorkloadGeneratorEndpoint.java +++ b/driver-cql-shaded/src/main/java/io/nosqlbench/endpoints/cql/CqlWorkloadGeneratorEndpoint.java @@ -1,14 +1,13 @@ package io.nosqlbench.endpoints.cql; -import io.nosqlbench.generators.cql.lang.CqlWorkloadGen; import io.nosqlbench.docsys.api.WebServiceObject; +import io.nosqlbench.generators.cql.lang.CqlWorkloadGen; import io.nosqlbench.nb.annotations.Service; - -import javax.inject.Singleton; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.inject.Singleton; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Service(value = WebServiceObject.class, selector = "cql-workload-generator") @Path("/services/cql/") diff --git a/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/HttpFormatParserTest.java b/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/HttpFormatParserTest.java new file mode 100644 index 000000000..49b2489af --- /dev/null +++ b/driver-http/src/test/java/io/nosqlbench/activitytype/cmds/HttpFormatParserTest.java @@ -0,0 +1,33 @@ +package io.nosqlbench.activitytype.cmds; + +import org.junit.Test; + +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; + +public class HttpFormatParserTest { + + @Test + public void testSimpleFormat() { + Map map = HttpFormatParser.parseInline("GET http://host:12345/path/{\"v\":{\"name\":\"value\"}"); + assertThat(map).containsAllEntriesOf( + Map.of("method", "GET", "uri", "http://host:12345/path/{\"v\":{\"name\":\"value\"}") + ); + } + + @Test + public void testUrlEncodeBasic() { + Map map2 = HttpFormatParser.parseInline("GET http://host:12345/path/E[[{\"v\":{\"name\":\"value\"}]]"); + assertThat(map2).containsAllEntriesOf( + Map.of("method", "GET", "uri", "http://host:12345/path/%7B%22v%22%3A%7B%22name%22%3A%22value%22%7D")); + } + + @Test + public void testUrlEncodeExceptBindings() { + Map map3 = HttpFormatParser.parseInline("GET http://host:12345/path/E[[{\"v\":{\"{name}\":\"{value}\"}]]"); + assertThat(map3).containsAllEntriesOf( + Map.of("method", "GET", "uri", "http://host:12345/path/%7B%22v%22%3A%7B%22{name}%22%3A%22{value}%22%7D")); + } + +} diff --git a/engine-docker/pom.xml b/engine-docker/pom.xml index e0382c36d..3fb84081e 100644 --- a/engine-docker/pom.xml +++ b/engine-docker/pom.xml @@ -20,15 +20,6 @@ - - javax.activation - activation - - - javax.xml.bind - jaxb-api - - io.netty netty-handler diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/OpenApiEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/OpenApiEndpoint.java index 59c892a1f..57e6fa761 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/OpenApiEndpoint.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/OpenApiEndpoint.java @@ -8,11 +8,11 @@ import io.nosqlbench.nb.annotations.Service; import io.swagger.parser.OpenAPIParser; import io.swagger.parser.v2.SwaggerConverter; import io.swagger.util.Json; +import jakarta.inject.Singleton; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; -import javax.inject.Singleton; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import java.util.Map; @Service(value = WebServiceObject.class, selector = "openapi") diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java index 272b66d57..c4b0b22ee 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java @@ -13,14 +13,14 @@ import io.nosqlbench.engine.rest.services.WorkspaceFinder; import io.nosqlbench.engine.rest.transfertypes.LiveScenarioView; import io.nosqlbench.engine.rest.transfertypes.RunScenarioRequest; import io.nosqlbench.nb.annotations.Service; +import jakarta.inject.Singleton; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; -import javax.inject.Singleton; -import javax.ws.rs.*; -import javax.ws.rs.core.*; import java.io.CharArrayWriter; import java.io.PrintWriter; import java.util.*; diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ServiceStatusEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ServiceStatusEndpoint.java index dd3f86de7..f1b703ea3 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ServiceStatusEndpoint.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ServiceStatusEndpoint.java @@ -4,18 +4,18 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.nosqlbench.docsys.api.WebServiceObject; import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.virtdata.userlibs.apps.docsapp.AutoDocsWebService; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import java.util.Map; @Service(value = WebServiceObject.class, selector = "service-status") diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkloadFinderEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkloadFinderEndpoint.java index c4b0794a0..750821e93 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkloadFinderEndpoint.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkloadFinderEndpoint.java @@ -6,19 +6,22 @@ import io.nosqlbench.engine.api.scenarios.WorkloadDesc; import io.nosqlbench.engine.rest.services.WorkspaceFinder; import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.virtdata.userlibs.apps.docsapp.AutoDocsWebService; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; @Service(value = WebServiceObject.class, selector = "workload-finder") diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkspacesEndpoint.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkspacesEndpoint.java index 421f51816..effdf5f66 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkspacesEndpoint.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/WorkspacesEndpoint.java @@ -6,13 +6,13 @@ import io.nosqlbench.engine.rest.services.WorkspaceFinder; import io.nosqlbench.engine.rest.transfertypes.WorkspaceItemView; import io.nosqlbench.engine.rest.transfertypes.WorkspaceView; import io.nosqlbench.nb.annotations.Service; +import jakarta.inject.Singleton; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.inject.Singleton; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; -import javax.ws.rs.core.*; import java.nio.ByteBuffer; import java.nio.file.Paths; import java.util.List; diff --git a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java index 2957b2ab3..4012ee6e7 100644 --- a/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java +++ b/engine-rest/src/main/java/io/nosqlbench/engine/rest/services/WorkspaceFinder.java @@ -1,11 +1,11 @@ package io.nosqlbench.engine.rest.services; import io.nosqlbench.engine.rest.transfertypes.WorkspaceView; +import jakarta.ws.rs.core.Configuration; +import jakarta.ws.rs.core.MediaType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.ws.rs.core.Configuration; -import javax.ws.rs.core.MediaType; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.file.*; diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml index 571634a1e..060b25ab1 100644 --- a/mvn-defaults/pom.xml +++ b/mvn-defaults/pom.xml @@ -23,16 +23,10 @@ 1.9.0 0.61.6 3.0.0-RC1 - 2.9.8 1.11.1 - 1.1.1 - 2.1 2.4.0-b180830.0359 2.3.0.1 2.4.0-b180830.0438 - 2.29 - 2.27 - 9.4.7.v20170914 1.22 2.9.9 5.3.2 @@ -101,13 +95,6 @@ test - - - javax.activation - activation - ${javax.activation.version} - - org.mpierce.metrics.reservoir hdrhistogram-metrics-reservoir @@ -138,12 +125,6 @@ ${commons.text.version} - - - - - - org.openjdk.jmh jmh-core @@ -321,76 +302,16 @@ 4.8 - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlets - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - org.eclipse.jetty - jetty-rewrite - ${jetty.version} - - - org.glassfish.jersey.core - jersey-server - ${jersey.version} - - - org.glassfish.jersey.core - jersey-common - ${jersey.version} - - - org.glassfish.jersey.containers - jersey-container-jetty-servlet - ${jersey.version} - - - org.glassfish.jersey.inject - jersey-hk2 - ${jersey.version} - - org.apache.commons commons-compress ${commons.compress.version} - - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs.version} - - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.media.version} - - - com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - ${jackson.jaxrs.version} - - - - javax.xml.bind - jaxb-api - ${jaxb.api.version} + 2.9.8 @@ -539,17 +460,18 @@ - - - always - - **/*Integrated*Test*.java - **/*IntegrationTest.java - **/*IntegrationTests.java - - - - + + + 1 + false + + **/*Integrated*Test*.java + **/*IntegrationTest.java + **/*IntegrationTests.java + + + + diff --git a/nb/pom.xml b/nb/pom.xml index 79896bb8e..aebfba0e4 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -51,12 +51,6 @@ 4.15.20-SNAPSHOT - - - - - - io.nosqlbench driver-web @@ -129,38 +123,12 @@ 4.15.20-SNAPSHOT - - - - - - io.nosqlbench driver-cockroachdb 4.15.20-SNAPSHOT - - javax.activation - activation - - - - javax.xml.bind - jaxb-api - - - - - - - - - - - - @@ -200,17 +168,6 @@ - - - - - - - - - - - org.codehaus.mojo exec-maven-plugin diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java index 8a17db0c8..279bf83b3 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java @@ -1,17 +1,16 @@ package io.nosqlbench.virtdata.userlibs.apps; +import io.nosqlbench.docsys.api.WebServiceObject; import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.virtdata.core.bindings.DataMapper; import io.nosqlbench.virtdata.core.bindings.ResolverDiagnostics; import io.nosqlbench.virtdata.core.bindings.VirtData; -import io.nosqlbench.docsys.api.WebServiceObject; - -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; @Service(value = WebServiceObject.class, selector = "virtdata") @Singleton diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java index caa358c21..895f70211 100644 --- a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java +++ b/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java @@ -2,19 +2,19 @@ package io.nosqlbench.virtdata.userlibs.apps.docsapp; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures; -import io.nosqlbench.nb.annotations.Service; -import io.nosqlbench.virtdata.core.bindings.VirtDataDocs; import io.nosqlbench.docsys.api.WebServiceObject; +import io.nosqlbench.nb.annotations.Service; import io.nosqlbench.virtdata.api.processors.DocFuncData; +import io.nosqlbench.virtdata.core.bindings.VirtDataDocs; +import jakarta.inject.Singleton; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.inject.Singleton; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; import java.util.List; import java.util.stream.Collectors;