merge

CoreMedia · Dec 14, 2023 · ea3b9c6 · ea3b9c6
1 parent c748e4f
commit ea3b9c6
Show file tree

Hide file tree

Showing 7 changed files with 183 additions and 191 deletions.
diff --git a/studio-server/pom.xml b/studio-server/pom.xml
@@ -68,11 +68,6 @@
       <artifactId>feedback-hub-searchmetrics-lib</artifactId>
       <version>2.0.5-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>com.coremedia.cms</groupId>
-      <artifactId>common.beans-for-plugins-container</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.coremedia.ui</groupId>
       <artifactId>cap-rest-service</artifactId>

diff --git a/...labs/plugins/feedbackhub/adapter/searchmetrics/SearchmetricsFeedbackHubConfiguration.java b/...labs/plugins/feedbackhub/adapter/searchmetrics/SearchmetricsFeedbackHubConfiguration.java
@@ -1,6 +1,5 @@
 package com.coremedia.labs.plugins.feedbackhub.adapter.searchmetrics;
 
-import com.coremedia.cms.common.plugins.beans_for_plugins2.CommonBeansForPluginsConfiguration;
 import com.coremedia.feedbackhub.beans_for_plugins.FeedbackHubBeansForPluginsConfiguration;
 import com.coremedia.feedbackhub.settings.FeedbackSettingsProvider;
 import com.coremedia.labs.plugins.feedbackhub.adapter.searchmetrics.jobs.AssignBriefingJobFactory;
@@ -15,36 +14,35 @@
 
 @Configuration
 @Import({SearchmetricsServiceConfiguration.class,
-        CommonBeansForPluginsConfiguration.class,
-        FeedbackHubBeansForPluginsConfiguration.class
-})
+    FeedbackHubBeansForPluginsConfiguration.class})
 public class SearchmetricsFeedbackHubConfiguration {
 
-    @Bean
-    public SearchmetricsFeedbackAdapterFactory searchmetricsContentFeedbackProviderFactory(@NonNull SearchmetricsService searchmetricsService) {
-        return new SearchmetricsFeedbackAdapterFactory(searchmetricsService);
-    }
-
-    @Bean
-    public SearchmetricsSettingsProvider searchmetricsFeedbackSettingsProvider(FeedbackSettingsProvider feedbackSettingsProvider) {
-        return new SearchmetricsSettingsProvider(feedbackSettingsProvider, SearchmetricsFeedbackAdapterFactory.TYPE);
-    }
-
-    @Bean
-    public GetBriefingDetailsJobFactory getBriefingDetailsPageJobFactory(@NonNull SearchmetricsService searchmetricsService,
-                                                                         @NonNull SearchmetricsSettingsProvider searchmetricsFeedbackSettingsProvider) {
-        return new GetBriefingDetailsJobFactory(searchmetricsFeedbackSettingsProvider, searchmetricsService);
-    }
-
-    @Bean
-    public GetBriefingsJobFactory getBriefingsPageJobFactory(@NonNull SearchmetricsService searchmetricsService,
-                                                             @NonNull SearchmetricsSettingsProvider searchmetricsFeedbackSettingsProvider) {
-        return new GetBriefingsJobFactory(searchmetricsService, searchmetricsFeedbackSettingsProvider);
-    }
-
-    @Bean
-    public AssignBriefingJobFactory assignBriefingJobFactory(@NonNull SearchmetricsService searchmetricsService,
-                                                             @NonNull SearchmetricsSettingsProvider searchmetricsFeedbackSettingsProvider) {
-        return new AssignBriefingJobFactory(searchmetricsService, searchmetricsFeedbackSettingsProvider);
-    }
+  @Bean
+  public SearchmetricsFeedbackAdapterFactory searchmetricsContentFeedbackProviderFactory(@NonNull SearchmetricsService searchmetricsService) {
+    return new SearchmetricsFeedbackAdapterFactory(searchmetricsService);
+  }
+
+  @Bean
+  public SearchmetricsSettingsProvider searchmetricsSettingsProvider(FeedbackSettingsProvider feedbackSettingsProvider) {
+    return new SearchmetricsSettingsProvider(feedbackSettingsProvider, SearchmetricsFeedbackAdapterFactory.TYPE);
+  }
+
+
+  @Bean
+  public GetBriefingDetailsJobFactory getBriefingDetailsPageJobFactory(@NonNull SearchmetricsService searchmetricsService,
+                                                                       @NonNull SearchmetricsSettingsProvider searchmetricsFeedbackSettingsProvider) {
+    return new GetBriefingDetailsJobFactory(searchmetricsFeedbackSettingsProvider, searchmetricsService);
+  }
+
+  @Bean
+  public GetBriefingsJobFactory getBriefingsPageJobFactory(@NonNull SearchmetricsService searchmetricsService,
+                                                           @NonNull SearchmetricsSettingsProvider searchmetricsFeedbackSettingsProvider) {
+    return new GetBriefingsJobFactory(searchmetricsService, searchmetricsFeedbackSettingsProvider);
+  }
+
+  @Bean
+  public AssignBriefingJobFactory assignBriefingJobFactory(@NonNull SearchmetricsService searchmetricsService,
+                                                           @NonNull SearchmetricsSettingsProvider searchmetricsFeedbackSettingsProvider) {
+    return new AssignBriefingJobFactory(searchmetricsService, searchmetricsFeedbackSettingsProvider);
+  }
 }
diff --git a/.../com/coremedia/labs/plugins/feedbackhub/adapter/searchmetrics/jobs/AssignBriefingJob.java b/.../com/coremedia/labs/plugins/feedbackhub/adapter/searchmetrics/jobs/AssignBriefingJob.java
@@ -1,9 +1,9 @@
 package com.coremedia.labs.plugins.feedbackhub.adapter.searchmetrics.jobs;
 
-import com.coremedia.cap.common.IdHelper;
 import com.coremedia.labs.plugins.feedbackhub.adapter.searchmetrics.SearchmetricsSettingsProvider;
 import com.coremedia.labs.plugins.searchmetrics.SearchmetricsService;
 import com.coremedia.labs.plugins.searchmetrics.SearchmetricsSettings;
+import com.coremedia.cap.common.IdHelper;
 import com.coremedia.rest.cap.jobs.GenericJobErrorCode;
 import com.coremedia.rest.cap.jobs.Job;
 import com.coremedia.rest.cap.jobs.JobContext;
@@ -15,59 +15,58 @@
 import org.slf4j.LoggerFactory;
 
 public class AssignBriefingJob implements Job {
-    private static final Logger LOG = LoggerFactory.getLogger(AssignBriefingJob.class);
+  private static final Logger LOG = LoggerFactory.getLogger(AssignBriefingJob.class);
 
-    private final SearchmetricsService service;
-    private final SearchmetricsSettingsProvider feedbackSettingsProvider;
+  private final SearchmetricsService service;
+  private final SearchmetricsSettingsProvider feedbackSettingsProvider;
 
-    private String siteId;
-    private String briefingId;
-    private String contentId;
-    private String groupId;
+  private String siteId;
+  private String briefingId;
+  private String contentId;
+  private String groupId;
 
-    public AssignBriefingJob(SearchmetricsService service, SearchmetricsSettingsProvider feedbackSettingsProvider) {
-        this.service = service;
-        this.feedbackSettingsProvider = feedbackSettingsProvider;
-    }
+  public AssignBriefingJob(SearchmetricsService service, SearchmetricsSettingsProvider feedbackSettingsProvider) {
+    this.service = service;
+    this.feedbackSettingsProvider = feedbackSettingsProvider;
+  }
 
-    @SerializedName("siteId")
-    public void setSiteId(String siteId) {
-        this.siteId = siteId;
-    }
+  @SerializedName("siteId")
+  public void setSiteId(String siteId) {
+    this.siteId = siteId;
+  }
 
-    @SerializedName("groupId")
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
+  @SerializedName("groupId")
+  public void setGroupId(String groupId) {
+    this.groupId = groupId;
+  }
 
-    @SerializedName("briefingId")
-    public void setBriefingId(String briefingId) {
-        this.briefingId = briefingId;
-    }
+  @SerializedName("briefingId")
+  public void setBriefingId(String briefingId) {
+    this.briefingId = briefingId;
+  }
 
-    @SerializedName("contentId")
-    public void setContentId(String contentId) {
-        this.contentId = contentId;
-    }
+  @SerializedName("contentId")
+  public void setContentId(String contentId) {
+    this.contentId = contentId;
+  }
 
-    @Nullable
-    @Override
-    public Object call(@NonNull JobContext jobContext) throws JobExecutionException {
-        try {
-            String id = contentId.substring(contentId.lastIndexOf('/') + 1);
-            String capId = IdHelper.formatContentId(id);
+  @Nullable
+  @Override
+  public Object call(@NonNull JobContext jobContext) throws JobExecutionException {
+    try {
+      String id = contentId.substring(contentId.lastIndexOf('/') + 1);
+      String capId = IdHelper.formatContentId(id);
 
-            SearchmetricsSettings settings = getSettings();
-            service.setContentBriefing(settings, capId, briefingId);
-            return true;
-        } catch (Exception e) {
-            LOG.error("Failed to assign briefing {} to content {}: {}", briefingId, contentId, e.getMessage());
-            throw new JobExecutionException(GenericJobErrorCode.FAILED);
-        }
+      SearchmetricsSettings settings = getSettings();
+      service.setContentBriefing(settings, capId, briefingId);
+      return true;
+    } catch (Exception e) {
+      LOG.error("Failed to assign briefing {} to content {}: {}", briefingId, contentId, e.getMessage());
+      throw new JobExecutionException(GenericJobErrorCode.FAILED);
     }
+  }
 
-
-    private SearchmetricsSettings getSettings() {
-        return feedbackSettingsProvider.getSettings(groupId, siteId);
-    }
+  private SearchmetricsSettings getSettings() {
+    return feedbackSettingsProvider.getSettings(groupId, siteId);
+  }
 }
diff --git a/.../coremedia/labs/plugins/feedbackhub/adapter/searchmetrics/jobs/GetBriefingDetailsJob.java b/.../coremedia/labs/plugins/feedbackhub/adapter/searchmetrics/jobs/GetBriefingDetailsJob.java
@@ -14,50 +14,50 @@
 import org.slf4j.LoggerFactory;
 
 public class GetBriefingDetailsJob implements Job {
-    private static final Logger LOG = LoggerFactory.getLogger(GetBriefingDetailsJob.class);
-
-    private final SearchmetricsSettingsProvider feedbackSettingsProvider;
-    private final SearchmetricsService service;
-
-    private String siteId;
-    private String groupId;
-    private String briefingId;
-
-    public GetBriefingDetailsJob(@NonNull SearchmetricsSettingsProvider feedbackSettingsProvider, SearchmetricsService service) {
-        this.feedbackSettingsProvider = feedbackSettingsProvider;
-        this.service = service;
-    }
-
-    @SerializedName("siteId")
-    public void setSiteId(String siteId) {
-        this.siteId = siteId;
-    }
-
-    @SerializedName("groupId")
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
+  private static final Logger LOG = LoggerFactory.getLogger(GetBriefingDetailsJob.class);
+
+  private final SearchmetricsSettingsProvider feedbackSettingsProvider;
+  private final SearchmetricsService service;
+
+  private String siteId;
+  private String groupId;
+  private String briefingId;
+
+  public GetBriefingDetailsJob(@NonNull SearchmetricsSettingsProvider feedbackSettingsProvider, SearchmetricsService service) {
+    this.feedbackSettingsProvider = feedbackSettingsProvider;
+    this.service = service;
+  }
+
+  @SerializedName("siteId")
+  public void setSiteId(String siteId) {
+    this.siteId = siteId;
+  }
+
+  @SerializedName("groupId")
+  public void setGroupId(String groupId) {
+    this.groupId = groupId;
+  }
+
+
+  @SerializedName("briefingId")
+  public void setBriefingId(String briefingId) {
+    this.briefingId = briefingId;
+  }
+
+  @Nullable
+  @Override
+  public Object call(@NonNull JobContext jobContext) throws JobExecutionException {
+    try {
+      SearchmetricsSettings settings = getSettings();
+      service.refreshBriefing(settings, briefingId);
+      return service.getBriefing(settings, briefingId);
+    } catch (Exception e) {
+      LOG.error("Failed to get briefing details for briefing " + briefingId + ": " + e.getMessage(), e);
+      throw new JobExecutionException(GenericJobErrorCode.FAILED);
     }
+  }
 
-
-    @SerializedName("briefingId")
-    public void setBriefingId(String briefingId) {
-        this.briefingId = briefingId;
-    }
-
-    @Nullable
-    @Override
-    public Object call(@NonNull JobContext jobContext) throws JobExecutionException {
-        try {
-            SearchmetricsSettings settings = getSettings();
-            service.refreshBriefing(settings, briefingId);
-            return service.getBriefing(settings, briefingId);
-        } catch (Exception e) {
-            LOG.error("Failed to get briefing details for briefing " + briefingId + ": " + e.getMessage(), e);
-            throw new JobExecutionException(GenericJobErrorCode.FAILED);
-        }
-    }
-
-    private SearchmetricsSettings getSettings() {
-        return feedbackSettingsProvider.getSettings(groupId, siteId);
-    }
+  private SearchmetricsSettings getSettings() {
+    return feedbackSettingsProvider.getSettings(groupId, siteId);
+  }
 }
diff --git a/...dia/labs/plugins/feedbackhub/adapter/searchmetrics/jobs/GetBriefingDetailsJobFactory.java b/...dia/labs/plugins/feedbackhub/adapter/searchmetrics/jobs/GetBriefingDetailsJobFactory.java
@@ -8,22 +8,22 @@
 
 public class GetBriefingDetailsJobFactory implements JobFactory {
 
-    private SearchmetricsSettingsProvider feedbackSettingsProvider;
-    private SearchmetricsService service;
+  private SearchmetricsSettingsProvider feedbackSettingsProvider;
+  private SearchmetricsService service;
 
-    public GetBriefingDetailsJobFactory(@NonNull SearchmetricsSettingsProvider feedbackSettingsProvider, SearchmetricsService service) {
-        this.feedbackSettingsProvider = feedbackSettingsProvider;
-        this.service = service;
-    }
+  public GetBriefingDetailsJobFactory(@NonNull SearchmetricsSettingsProvider feedbackSettingsProvider, SearchmetricsService service) {
+    this.feedbackSettingsProvider = feedbackSettingsProvider;
+    this.service = service;
+  }
 
-    @Override
-    public boolean accepts(@NonNull String jobType) {
-        return jobType.equals("getBriefingDetails");
-    }
+  @Override
+  public boolean accepts(@NonNull String jobType) {
+    return jobType.equals("getBriefingDetails");
+  }
 
-    @NonNull
-    @Override
-    public Job createJob() {
-        return new GetBriefingDetailsJob(feedbackSettingsProvider, service);
-    }
+  @NonNull
+  @Override
+  public Job createJob() {
+    return new GetBriefingDetailsJob(feedbackSettingsProvider, service);
+  }
 }