Fix v2 resources not being discovered after openapi-generator update

As of v7.17.0 of the generator, `@Path` annotations are no longer added at the interface-level: OpenAPITools/openapi-generator#22169

Without them, Jersey can not discover them anymore. Add the annotations on the implementing classes to restore correct discovery.

Signed-off-by: nscuro <[email protected]>

Author: nscuro

apiserver/src/main/java/org/dependencytrack/resources/v2/ComponentsResource.java

@@ -23,10 +23,10 @@
 import jakarta.ws.rs.ClientErrorException;
 import jakarta.ws.rs.NotAuthorizedException;
 import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.ext.Provider;
 import org.apache.commons.lang3.StringUtils;
 import org.dependencytrack.api.v2.ComponentsApi;
 import org.dependencytrack.api.v2.model.CreateComponentRequest;
@@ -64,7 +64,7 @@
 import static org.dependencytrack.resources.v2.mapping.ModelMapper.mapOrganizationalContacts;
 import static org.dependencytrack.util.PersistenceUtil.isUniqueConstraintViolation;
 
-@Provider
+@Path("/")
 public class ComponentsResource extends AbstractApiResource implements ComponentsApi {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ComponentsResource.class);

apiserver/src/main/java/org/dependencytrack/resources/v2/ExtensionsResource.java

@@ -21,8 +21,8 @@
 import alpine.server.auth.PermissionRequired;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.ext.Provider;
 import org.dependencytrack.api.v2.ExtensionsApi;
 import org.dependencytrack.api.v2.model.ExtensionConfig;
 import org.dependencytrack.api.v2.model.ExtensionConfigType;
@@ -59,7 +59,7 @@
 /**
  * @since 5.7.0
  */
-@Provider
+@Path("/")
 public class ExtensionsResource implements ExtensionsApi {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExtensionsResource.class);

apiserver/src/main/java/org/dependencytrack/resources/v2/MetricsResource.java

@@ -20,6 +20,10 @@
 
 import alpine.server.auth.PermissionRequired;
 import alpine.server.resources.AlpineResource;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 import org.dependencytrack.api.v2.MetricsApi;
 import org.dependencytrack.api.v2.model.ListVulnerabilityMetricsResponse;
 import org.dependencytrack.api.v2.model.ListVulnerabilityMetricsResponseItem;
@@ -29,16 +33,11 @@
 import org.dependencytrack.persistence.jdbi.MetricsDao;
 import org.dependencytrack.persistence.pagination.Page;
 
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.ext.Provider;
-
 import static org.dependencytrack.persistence.jdbi.JdbiFactory.inJdbiTransaction;
 import static org.dependencytrack.persistence.jdbi.JdbiFactory.withJdbiHandle;
 import static org.dependencytrack.persistence.pagination.PageUtil.createPaginationMetadata;
 
-@Provider
+@Path("/")
 public class MetricsResource extends AlpineResource implements MetricsApi {
 
     @Context

apiserver/src/main/java/org/dependencytrack/resources/v2/ProjectsResource.java

@@ -20,10 +20,10 @@
 
 import alpine.server.auth.PermissionRequired;
 import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.ext.Provider;
 import org.dependencytrack.api.v2.ProjectsApi;
 import org.dependencytrack.api.v2.model.CloneProjectInclude;
 import org.dependencytrack.api.v2.model.CloneProjectRequest;
@@ -48,7 +48,7 @@
 import static org.dependencytrack.resources.v2.mapping.ModelMapper.mapHashes;
 import static org.dependencytrack.resources.v2.mapping.ModelMapper.mapLicense;
 
-@Provider
+@Path("/")
 public class ProjectsResource extends AbstractApiResource implements ProjectsApi {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ProjectsResource.class);

apiserver/src/main/java/org/dependencytrack/resources/v2/TeamsResource.java

@@ -23,10 +23,10 @@
 import alpine.model.User;
 import alpine.server.auth.PermissionRequired;
 import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriInfo;
-import jakarta.ws.rs.ext.Provider;
 import org.dependencytrack.api.v2.TeamsApi;
 import org.dependencytrack.api.v2.model.CreateTeamMembershipRequest;
 import org.dependencytrack.api.v2.model.CreateTeamRequest;
@@ -52,7 +52,7 @@
 import static org.dependencytrack.persistence.pagination.PageUtil.createPaginationMetadata;
 import static org.dependencytrack.util.PersistenceUtil.isUniqueConstraintViolation;
 
-@Provider
+@Path("/")
 public class TeamsResource implements TeamsApi {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TeamsResource.class);

apiserver/src/main/java/org/dependencytrack/resources/v2/WorkflowsResource.java

@@ -19,21 +19,21 @@
 package org.dependencytrack.resources.v2;
 
 import alpine.server.auth.PermissionRequired;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
 import org.dependencytrack.api.v2.WorkflowsApi;
 import org.dependencytrack.api.v2.model.ListWorkflowStatesResponse;
 import org.dependencytrack.api.v2.model.ListWorkflowStatesResponseItem;
 import org.dependencytrack.auth.Permissions;
 import org.dependencytrack.model.WorkflowState;
 import org.dependencytrack.persistence.QueryManager;
 
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.ext.Provider;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-@Provider
+@Path("/")
 public class WorkflowsResource implements WorkflowsApi {
 
     @Override