From 61778a432e918a70cb976a5a4929e0a73efd285f Mon Sep 17 00:00:00 2001 From: fabrizzio-dotCMS Date: Mon, 28 Oct 2024 17:21:03 -0600 Subject: [PATCH] #30187 --- .../content/ContentAnalyticsResource.java | 18 ++++++------------ .../rest/api/v1/job/JobQueueResource.java | 2 -- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/analytics/content/ContentAnalyticsResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/analytics/content/ContentAnalyticsResource.java index 8e68b00f4956..ca36973aad2c 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/analytics/content/ContentAnalyticsResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/analytics/content/ContentAnalyticsResource.java @@ -5,13 +5,11 @@ import com.dotcms.analytics.model.ResultSetItem; import com.dotcms.analytics.track.collectors.WebEventsCollectorServiceFactory; import com.dotcms.analytics.track.matchers.UserCustomDefinedRequestMatcher; -import com.dotcms.cdi.CDIUtils; import com.dotcms.rest.InitDataObject; import com.dotcms.rest.ResponseEntityStringView; import com.dotcms.rest.WebResource; import com.dotcms.rest.annotation.NoCache; import com.dotcms.util.DotPreconditions; -import com.dotmarketing.business.APILocator; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UUIDUtil; import com.google.common.annotations.VisibleForTesting; @@ -21,10 +19,11 @@ import io.swagger.v3.oas.annotations.media.ExampleObject; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; -import javax.enterprise.context.ApplicationScoped; +import java.io.Serializable; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; import javax.inject.Inject; -import org.glassfish.jersey.server.JSONP; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.Consumes; @@ -33,12 +32,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; +import org.glassfish.jersey.server.JSONP; /** * Resource class that exposes endpoints to query content analytics data. @@ -49,7 +43,7 @@ * @author Jose Castro * @since Sep 13th, 2024 */ -@ApplicationScoped + @Path("/v1/analytics/content") @Tag(name = "Content Analytics", description = "Endpoints that exposes information related to how dotCMS content is accessed and interacted with by users.") diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/job/JobQueueResource.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/job/JobQueueResource.java index fc934b8a74c1..e3816a015529 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/job/JobQueueResource.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/job/JobQueueResource.java @@ -13,7 +13,6 @@ import java.io.IOException; import java.util.Map; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.BeanParam; @@ -32,7 +31,6 @@ import org.glassfish.jersey.media.sse.OutboundEvent; import org.glassfish.jersey.media.sse.SseFeature; -@ApplicationScoped @Path("/v1/jobs") public class JobQueueResource {