From 362e8c268a9c4536ae96f659aea7b4ac8ce94ea1 Mon Sep 17 00:00:00 2001 From: Abbas Nurie Date: Fri, 9 Jan 2026 10:25:07 -0800 Subject: [PATCH 1/4] fresh commit for upgrade spring --- cantor-grpc-protos/pom.xml | 2 +- cantor-http-service/pom.xml | 2 +- .../http/filters/GenericExceptionMapper.java | 18 +++++++------- .../cantor/http/resources/EventsResource.java | 24 +++++++++---------- .../http/resources/FunctionsResource.java | 12 +++++----- .../http/resources/ObjectsResource.java | 20 ++++++++-------- .../cantor/http/resources/SetsResource.java | 22 ++++++++--------- cantor-s3/pom.xml | 2 +- 8 files changed, 51 insertions(+), 51 deletions(-) diff --git a/cantor-grpc-protos/pom.xml b/cantor-grpc-protos/pom.xml index 23b32b294..65cd4d6a8 100644 --- a/cantor-grpc-protos/pom.xml +++ b/cantor-grpc-protos/pom.xml @@ -88,7 +88,7 @@ protobuf-maven-plugin 0.5.0 - com.google.protobuf:protoc:3.0.0:exe:${os.detected.classifier} + com.google.protobuf:protoc:3.21.12:exe:${os.detected.classifier} grpc-java io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier} diff --git a/cantor-http-service/pom.xml b/cantor-http-service/pom.xml index 080126b5b..42a60ae35 100644 --- a/cantor-http-service/pom.xml +++ b/cantor-http-service/pom.xml @@ -17,7 +17,7 @@ cantor-http-service - 2.7.13 + 4.0.1 2.1.11 4.8.131 diff --git a/cantor-http-service/src/main/java/com/salesforce/cantor/http/filters/GenericExceptionMapper.java b/cantor-http-service/src/main/java/com/salesforce/cantor/http/filters/GenericExceptionMapper.java index ab95ca1d8..8f7da527c 100644 --- a/cantor-http-service/src/main/java/com/salesforce/cantor/http/filters/GenericExceptionMapper.java +++ b/cantor-http-service/src/main/java/com/salesforce/cantor/http/filters/GenericExceptionMapper.java @@ -6,15 +6,15 @@ import org.slf4j.LoggerFactory; import javax.naming.AuthenticationException; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.NotAuthorizedException; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/EventsResource.java b/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/EventsResource.java index dd7d2bbcc..e891872e4 100644 --- a/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/EventsResource.java +++ b/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/EventsResource.java @@ -24,18 +24,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.lang.reflect.Type; import java.util.Base64; diff --git a/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/FunctionsResource.java b/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/FunctionsResource.java index 216999588..3f9b4d2d3 100644 --- a/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/FunctionsResource.java +++ b/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/FunctionsResource.java @@ -24,12 +24,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/ObjectsResource.java b/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/ObjectsResource.java index 50e57f07e..1d56f34d5 100644 --- a/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/ObjectsResource.java +++ b/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/ObjectsResource.java @@ -24,16 +24,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Base64; import java.util.Collection; diff --git a/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/SetsResource.java b/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/SetsResource.java index 4ea7fe793..445571090 100644 --- a/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/SetsResource.java +++ b/cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/SetsResource.java @@ -24,17 +24,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.ws.rs.BeanParam; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.Collection; import java.util.HashMap; diff --git a/cantor-s3/pom.xml b/cantor-s3/pom.xml index cda5ad9ef..edf83818e 100644 --- a/cantor-s3/pom.xml +++ b/cantor-s3/pom.xml @@ -27,7 +27,7 @@ 1.12.638 2.21.0 - 2.1.28 + 4.11.0 From ca2dddec13be7f59bbc01f28370d0b194e35f7b6 Mon Sep 17 00:00:00 2001 From: Abbas Nurie Date: Fri, 9 Jan 2026 13:44:40 -0800 Subject: [PATCH 2/4] fix server issues --- cantor-http-server/pom.xml | 14 ++++++++- .../http/jersey/EmbeddedHttpServer.java | 30 ++++++++----------- cantor-http-service/pom.xml | 4 +-- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/cantor-http-server/pom.xml b/cantor-http-server/pom.xml index bf3605eec..4a274fc9b 100644 --- a/cantor-http-server/pom.xml +++ b/cantor-http-server/pom.xml @@ -17,7 +17,8 @@ cantor-http-server - 2.40 + 4.0.0 + 12.1.5 3.0.8 2.3.30 @@ -77,6 +78,17 @@ jersey-container-jetty-servlet ${jersey.version} + + + org.eclipse.jetty + jetty-server + ${jetty.version} + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + ${jetty.version} + org.glassfish.jersey.inject diff --git a/cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java b/cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java index 985243202..f4d385f13 100644 --- a/cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java +++ b/cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java @@ -12,18 +12,16 @@ import com.salesforce.cantor.h2.CantorOnH2; import com.salesforce.cantor.h2.H2DataSourceProperties; import com.salesforce.cantor.h2.H2DataSourceProvider; -import com.salesforce.cantor.http.resources.FunctionsResource; import com.salesforce.cantor.http.resources.EventsResource; +import com.salesforce.cantor.http.resources.FunctionsResource; import com.salesforce.cantor.http.resources.ObjectsResource; import com.salesforce.cantor.http.resources.SetsResource; import com.salesforce.cantor.misc.loggable.LoggableCantor; - import com.salesforce.cantor.mysql.CantorOnMysql; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.glassfish.jersey.internal.inject.AbstractBinder; +import org.eclipse.jetty.ee10.servlet.DefaultServlet; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.slf4j.Logger; @@ -39,25 +37,23 @@ Server createServer(final int port, final String basePath) { // bind resources with required constructor parameters final Cantor cantor = getCantorOnGrpc(); - config.register(new AbstractBinder() { - @Override - protected void configure() { - bind(new EventsResource(cantor)); - bind(new ObjectsResource(cantor)); - bind(new SetsResource(cantor)); - bind(new FunctionsResource(cantor)); - } - }); + config.registerInstances( + new EventsResource(cantor), + new ObjectsResource(cantor), + new SetsResource(cantor), + new FunctionsResource(cantor) + ); final Server server = new Server(port); // load jersey servlets final ServletHolder jerseyServlet = new ServletHolder(new ServletContainer(config)); - final ServletContextHandler context = new ServletContextHandler(server, "/"); + final ServletContextHandler context = new ServletContextHandler("/"); + server.setHandler(context); context.addServlet(jerseyServlet, basePath); // serve static resources - context.setResourceBase("cantor-http-server/src/main/resources/static"); + context.setBaseResourceAsString("cantor-http-server/src/main/resources/static"); context.addServlet(DefaultServlet.class, "/"); return server; diff --git a/cantor-http-service/pom.xml b/cantor-http-service/pom.xml index 42a60ae35..887e74288 100644 --- a/cantor-http-service/pom.xml +++ b/cantor-http-service/pom.xml @@ -18,7 +18,7 @@ 4.0.1 - 2.1.11 + 2.2.41 4.8.131 @@ -44,7 +44,7 @@ io.swagger.core.v3 - swagger-jaxrs2 + swagger-jaxrs2-jakarta ${swagger.version} From 79d76266d12b42eba922c74fc7a455641f2a3736 Mon Sep 17 00:00:00 2001 From: Abbas Nurie Date: Fri, 9 Jan 2026 13:45:38 -0800 Subject: [PATCH 3/4] clean imports --- .../com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java b/cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java index f4d385f13..c1d88af33 100644 --- a/cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java +++ b/cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java @@ -18,10 +18,10 @@ import com.salesforce.cantor.http.resources.SetsResource; import com.salesforce.cantor.misc.loggable.LoggableCantor; import com.salesforce.cantor.mysql.CantorOnMysql; -import org.eclipse.jetty.server.Server; import org.eclipse.jetty.ee10.servlet.DefaultServlet; import org.eclipse.jetty.ee10.servlet.ServletContextHandler; import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.server.Server; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.slf4j.Logger; From b364169ac94aa59c674dcdac4305aac8d66ae8be Mon Sep 17 00:00:00 2001 From: Abbas Nurie Date: Fri, 9 Jan 2026 13:46:30 -0800 Subject: [PATCH 4/4] remove comment --- cantor-http-server/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/cantor-http-server/pom.xml b/cantor-http-server/pom.xml index 4a274fc9b..d67828f5a 100644 --- a/cantor-http-server/pom.xml +++ b/cantor-http-server/pom.xml @@ -78,7 +78,6 @@ jersey-container-jetty-servlet ${jersey.version} - org.eclipse.jetty jetty-server