feat: Rename Analytics Artifacts - MEED-6999 - Meeds-io/meeds#2097

Meeds-io · Jun 7, 2024 · 0b539c8 · 0b539c8
1 parent 260f87f
commit 0b539c8
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,7 +68,7 @@
       </dependency>
       <!-- Import versions from analytics project -->
       <dependency>
-        <groupId>org.exoplatform.addons.analytics</groupId>
+        <groupId>io.meeds.analytics</groupId>
         <artifactId>analytics-parent</artifactId>
         <version>${addon.exo.analytics.version}</version>
         <type>pom</type>

diff --git a/services/pom.xml b/services/pom.xml
@@ -47,12 +47,12 @@
 
     <!--Analytics API -->
     <dependency>
-      <groupId>org.exoplatform.addons.analytics</groupId>
+      <groupId>io.meeds.analytics</groupId>
       <artifactId>analytics-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.addons.analytics</groupId>
+      <groupId>io.meeds.analytics</groupId>
       <artifactId>analytics-listeners</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/...c/main/java/org/exoplatform/tasks/listener/analytics/TaskAttachmentAnalyticsListener.java b/...c/main/java/org/exoplatform/tasks/listener/analytics/TaskAttachmentAnalyticsListener.java
@@ -18,18 +18,36 @@
  */
 package org.exoplatform.tasks.listener.analytics;
 
-import org.exoplatform.analytics.model.StatisticData;
+import java.util.List;
+
 import org.exoplatform.container.xml.InitParams;
 import org.exoplatform.services.listener.Asynchronous;
 import org.exoplatform.social.attachment.AttachmentService;
 import org.exoplatform.social.attachment.model.ObjectAttachmentId;
 import org.exoplatform.social.core.space.spi.SpaceService;
-import org.exoplatform.analytics.listener.social.BaseAttachmentAnalyticsListener;
+
+import io.meeds.analytics.listener.social.BaseAttachmentAnalyticsListener;
+
+import lombok.Getter;
 
 @Asynchronous
 public class TaskAttachmentAnalyticsListener extends BaseAttachmentAnalyticsListener {
-  public TaskAttachmentAnalyticsListener(AttachmentService attachmentService, SpaceService spaceService, InitParams initParam) {
-    super(attachmentService, spaceService, initParam);
+
+  @Getter
+  private AttachmentService attachmentService;
+
+  @Getter
+  private SpaceService      spaceService;
+
+  @Getter
+  private List<String>      supportedObjectType;
+
+  public TaskAttachmentAnalyticsListener(AttachmentService attachmentService,
+                                         SpaceService spaceService,
+                                         InitParams initParam) {
+    this.attachmentService = attachmentService;
+    this.spaceService = spaceService;
+    this.supportedObjectType = initParam.getValuesParam("supported-type").getValues();
   }
 
   @Override
@@ -40,9 +58,9 @@ protected String getModule(ObjectAttachmentId objectAttachment) {
   @Override
   protected String getSubModule(ObjectAttachmentId objectAttachment) {
     return switch (objectAttachment.getObjectType()) {
-      case "task" -> "taskDescription";
-      case "taskComment" -> "taskComment";
-      default -> "task";
+    case "task" -> "taskDescription";
+    case "taskComment" -> "taskComment";
+    default -> "task";
     };
   }
 }
diff --git a/services/src/main/java/org/exoplatform/tasks/listener/analytics/TaskCommentListener.java b/services/src/main/java/org/exoplatform/tasks/listener/analytics/TaskCommentListener.java
@@ -18,15 +18,15 @@
  */
 package org.exoplatform.tasks.listener.analytics;
 
-import static org.exoplatform.analytics.utils.AnalyticsUtils.addSpaceStatistics;
+import static io.meeds.analytics.utils.AnalyticsUtils.addSpaceStatistics;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.component.RequestLifeCycle;

diff --git a/services/src/main/java/org/exoplatform/tasks/listener/analytics/TaskLabelListener.java b/services/src/main/java/org/exoplatform/tasks/listener/analytics/TaskLabelListener.java
@@ -18,8 +18,8 @@
  */
 package org.exoplatform.tasks.listener.analytics;
 
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.commons.api.persistence.ExoTransactional;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;

diff --git a/services/src/main/java/org/exoplatform/tasks/listener/analytics/TaskSavedListener.java b/services/src/main/java/org/exoplatform/tasks/listener/analytics/TaskSavedListener.java
@@ -18,16 +18,16 @@
  */
 package org.exoplatform.tasks.listener.analytics;
 
-import static org.exoplatform.analytics.utils.AnalyticsUtils.addSpaceStatistics;
+import static io.meeds.analytics.utils.AnalyticsUtils.addSpaceStatistics;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.component.RequestLifeCycle;