feat: Enhance Spring Bean API Definition - MEED-7576 - Meeds-io/meeds…

…#2469 This change will allow to define API/Impl Spring Beans without having to declare the API as a Service Bean and the Implementation as Primary.
Meeds-io · Oct 10, 2024 · 66cc9a8 · 66cc9a8
1 parent 93d9804
commit 66cc9a8
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 12 deletions.
diff --git a/...b-services/src/main/java/io/meeds/github/gamification/services/GithubConsumerService.java b/...b-services/src/main/java/io/meeds/github/gamification/services/GithubConsumerService.java
@@ -19,14 +19,12 @@
 
 import io.meeds.github.gamification.model.RemoteOrganization;
 import io.meeds.github.gamification.model.WebHook;
-import org.cometd.annotation.Service;
 import org.exoplatform.commons.exception.ObjectNotFoundException;
 import io.meeds.github.gamification.model.RemoteRepository;
 import io.meeds.github.gamification.model.TokenStatus;
 
 import java.util.List;
 
-@Service
 public interface GithubConsumerService {
 
   /**

diff --git a/...ub-services/src/main/java/io/meeds/github/gamification/services/GithubTriggerService.java b/...ub-services/src/main/java/io/meeds/github/gamification/services/GithubTriggerService.java
@@ -18,9 +18,7 @@
 package io.meeds.github.gamification.services;
 
 import io.meeds.github.gamification.plugin.GithubTriggerPlugin;
-import org.cometd.annotation.Service;
 
-@Service
 public interface GithubTriggerService {
 
   /**

diff --git a/...n-github-services/src/main/java/io/meeds/github/gamification/services/WebhookService.java b/...n-github-services/src/main/java/io/meeds/github/gamification/services/WebhookService.java
@@ -19,7 +19,6 @@
 package io.meeds.github.gamification.services;
 
 import io.meeds.github.gamification.model.WebHook;
-import org.cometd.annotation.Service;
 import org.exoplatform.commons.ObjectAlreadyExistsException;
 import org.exoplatform.commons.exception.ObjectNotFoundException;
 import io.meeds.github.gamification.model.RemoteRepository;
@@ -28,7 +27,6 @@
 
 import java.util.List;
 
-@Service
 public interface WebhookService {
 
   /**

diff --git a/...s/src/main/java/io/meeds/github/gamification/services/impl/GithubConsumerServiceImpl.java b/...s/src/main/java/io/meeds/github/gamification/services/impl/GithubConsumerServiceImpl.java
@@ -25,12 +25,10 @@
 import io.meeds.github.gamification.services.GithubConsumerService;
 import io.meeds.github.gamification.storage.GithubConsumerStorage;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-@Primary
 @Service
 public class GithubConsumerServiceImpl implements GithubConsumerService {
 

diff --git a/...es/src/main/java/io/meeds/github/gamification/services/impl/GithubTriggerServiceImpl.java b/...es/src/main/java/io/meeds/github/gamification/services/impl/GithubTriggerServiceImpl.java
@@ -37,7 +37,6 @@
 import org.exoplatform.social.core.manager.IdentityManager;
 import org.picocontainer.Startable;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -46,7 +45,6 @@
 
 import static io.meeds.github.gamification.utils.Utils.*;
 
-@Primary
 @Service
 public class GithubTriggerServiceImpl implements GithubTriggerService, Startable {
 

diff --git a/...services/src/main/java/io/meeds/github/gamification/services/impl/WebhookServiceImpl.java b/...services/src/main/java/io/meeds/github/gamification/services/impl/WebhookServiceImpl.java
@@ -43,14 +43,12 @@
 import org.exoplatform.services.log.Log;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import static io.meeds.github.gamification.utils.Utils.*;
 
-@Primary
 @Service
 public class WebhookServiceImpl implements WebhookService {