Skip to content

@W-20641523 upgrade spring #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abbasn785 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

@W-20641523 upgrade spring #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
362e8c2
fresh commit for upgrade spring
abbasn785 Jan 9, 2026
ca2ddde
fix server issues
abbasn785 Jan 9, 2026
79d7626
clean imports
abbasn785 Jan 9, 2026
b364169
remove comment
abbasn785 Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cantor-grpc-protos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.5.0</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.0.0:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:3.21.12:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
Expand Down
13 changes: 12 additions & 1 deletion cantor-http-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<artifactId>cantor-http-server</artifactId>

<properties>
<jersey.version>2.40</jersey.version>
<jersey.version>4.0.0</jersey.version>
<jetty.version>12.1.5</jetty.version>
<groovy.version>3.0.8</groovy.version>
<freemarker.version>2.3.30</freemarker.version>
</properties>
Expand Down Expand Up @@ -77,6 +78,16 @@
<artifactId>jersey-container-jetty-servlet</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<!--JERSEY HK2-->
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
Expand Down
30 changes: 13 additions & 17 deletions cantor-http-server/src/main/java/com/salesforce/cantor/http/jersey/EmbeddedHttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.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.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;
import org.slf4j.Logger;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions cantor-http-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<artifactId>cantor-http-service</artifactId>

<properties>
<spring.jersey.version>2.7.13</spring.jersey.version>
<swagger.version>2.1.11</swagger.version>
<spring.jersey.version>4.0.1</spring.jersey.version>
<swagger.version>2.2.41</swagger.version>
<swagger.classgraph.version>4.8.131</swagger.classgraph.version>
</properties>

Expand All @@ -44,7 +44,7 @@
<!--SWAGGER-->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<artifactId>swagger-jaxrs2-jakarta</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
Expand Down
18 changes: 9 additions & 9 deletions ...http-service/src/main/java/com/salesforce/cantor/http/filters/GenericExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
24 changes: 12 additions & 12 deletions cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/EventsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...or-http-service/src/main/java/com/salesforce/cantor/http/resources/FunctionsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
20 changes: 10 additions & 10 deletions cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/ObjectsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
22 changes: 11 additions & 11 deletions cantor-http-service/src/main/java/com/salesforce/cantor/http/resources/SetsResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cantor-s3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<properties>
<s3-sdk.version>1.12.638</s3-sdk.version>
<mockito.version>2.21.0</mockito.version>
<s3mock.version>2.1.28</s3mock.version>
<s3mock.version>4.11.0</s3mock.version>
</properties>

<dependencies>
Expand Down