From 13bcc3da3acce5492e52da0452ae6708eb0c915e Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <bkhanfir@exoplatform.com>
Date: Wed, 9 Oct 2024 09:27:20 +0100
Subject: [PATCH] Apply recommendation on WalletAccountService and delete
 Kernel Startable Interface

---
 .../wallet/service/WalletAccountService.java  | 12 ++++-----
 .../service/WalletAccountServiceImpl.java     | 27 ++++++++++---------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java b/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
index da33ee84f..184a169b5 100644
--- a/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
+++ b/wallet-api/src/main/java/io/meeds/wallet/service/WalletAccountService.java
@@ -22,16 +22,16 @@
 
 import org.exoplatform.social.core.identity.model.Identity;
 
-import io.meeds.wallet.model.*;
-
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
+import io.meeds.wallet.model.ContractDetail;
+import io.meeds.wallet.model.Wallet;
+import io.meeds.wallet.model.WalletAddressLabel;
+import io.meeds.wallet.model.WalletProvider;
+import io.meeds.wallet.model.WalletState;
+import io.meeds.wallet.model.WalletType;
 
 /**
  * A service to manage wallets of different types: user, space, admin
  */
-@Service
-@Primary
 public interface WalletAccountService {
 
   /**
diff --git a/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
index 55690aa9a..485af8242 100644
--- a/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
+++ b/wallet-services/src/main/java/io/meeds/wallet/service/WalletAccountServiceImpl.java
@@ -46,13 +46,17 @@
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.security.SignatureException;
-import java.util.*;
-
-import jakarta.servlet.ServletContext;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.picocontainer.Startable;
+import org.springframework.stereotype.Service;
 import org.web3j.crypto.Keys;
 import org.web3j.crypto.Sign;
 import org.web3j.crypto.Sign.SignatureData;
@@ -78,14 +82,16 @@
 import io.meeds.wallet.model.WalletProvider;
 import io.meeds.wallet.model.WalletState;
 import io.meeds.wallet.model.WalletType;
-import io.meeds.wallet.service.WalletAccountService;
-import io.meeds.wallet.service.WalletTokenAdminService;
 import io.meeds.wallet.statistic.ExoWalletStatistic;
 import io.meeds.wallet.statistic.ExoWalletStatisticService;
 import io.meeds.wallet.storage.AddressLabelStorage;
 import io.meeds.wallet.storage.WalletStorage;
 
-public class WalletAccountServiceImpl implements WalletAccountService, ExoWalletStatisticService, Startable {
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.ServletContext;
+
+@Service
+public class WalletAccountServiceImpl implements WalletAccountService, ExoWalletStatisticService {
 
   private static final String     ERROR_BROADCASTING_EVENT_FOR_WALLET     = "Error broadcasting event {} for wallet {}";
 
@@ -139,7 +145,7 @@ public WalletAccountServiceImpl(PortalContainer container,
     }
   }
 
-  @Override
+  @PostConstruct
   public void start() {
     // Ensure to make initialization after starting all other services of Wallet
     PortalContainer.addInitTask(container.getPortalContext(), new RootContainer.PortalContainerPostInitTask() {
@@ -159,11 +165,6 @@ public void execute(ServletContext context, PortalContainer portalContainer) {
     });
   }
 
-  @Override
-  public void stop() {
-    // Nothing to stop
-  }
-
   @Override
   public Set<Wallet> listWallets() {
     Set<Wallet> wallets = accountStorage.listWallets();