fix no bean error

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

api/src/main/java/org/apache/cloudstack/context/CallContext.java

@@ -23,18 +23,20 @@
 
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.managed.threadlocal.ManagedThreadLocal;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 import com.cloud.exception.CloudAuthenticationException;
 import com.cloud.projects.Project;
 import com.cloud.user.Account;
 import com.cloud.user.AccountService;
 import com.cloud.user.User;
 import com.cloud.utils.UuidUtils;
+import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.db.EntityManager;
 import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.logging.log4j.ThreadContext;
 
 /**
  * CallContext records information about the environment the call is made.  This
@@ -69,11 +71,9 @@ protected Stack<CallContext> initialValue() {
     private String apiName;
 
     static EntityManager s_entityMgr;
-    static AccountService accountService;
 
-    public static void init(EntityManager entityMgr, AccountService accountService) {
+    public static void init(EntityManager entityMgr) {
         s_entityMgr = entityMgr;
-        CallContext.accountService = accountService;
     }
 
     protected CallContext() {
@@ -140,7 +140,15 @@ public Account getCallingAccount() {
 
     public boolean isCallingAccountRootAdmin() {
         if (isAccountRootAdmin == null) {
-            accountService.isRootAdmin(getCallingAccount());
+            AccountService accountService;
+            try {
+                accountService = ComponentContext.getDelegateComponentOfType(AccountService.class);
+            } catch (NoSuchBeanDefinitionException e) {
+                LOGGER.warn("Falling back to account type check for isRootAdmin for account ID: {} as no AccountService bean found: {}", accountId, e.getMessage());
+                Account caller = getCallingAccount();
+                return caller != null && caller.getType() == Account.Type.ADMIN;
+            }
+            isAccountRootAdmin = accountService.isRootAdmin(getCallingAccount());
         }
         return Boolean.TRUE.equals(isAccountRootAdmin);
     }

api/src/main/java/org/apache/cloudstack/context/CallContextListener.java

@@ -23,17 +23,13 @@
 
 import org.apache.cloudstack.managed.context.ManagedContextListener;
 
-import com.cloud.user.AccountService;
 import com.cloud.utils.db.EntityManager;
 
 public class CallContextListener implements ManagedContextListener<Object> {
 
     @Inject
     EntityManager entityMgr;
 
-    @Inject
-    AccountService accountService;
-
     @Override
     public Object onEnterContext(boolean reentry) {
         if (!reentry && CallContext.current() == null) {
@@ -51,6 +47,6 @@ public void onLeaveContext(Object unused, boolean reentry) {
 
     @PostConstruct
     public void init() {
-        CallContext.init(entityMgr, accountService);
+        CallContext.init(entityMgr);
     }
 }

api/src/test/java/org/apache/cloudstack/context/CallContextTest.java

@@ -31,7 +31,6 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import com.cloud.user.Account;
-import com.cloud.user.AccountService;
 import com.cloud.user.User;
 import com.cloud.utils.db.EntityManager;
 
@@ -41,12 +40,9 @@ public class CallContextTest {
     @Mock
     EntityManager entityMgr;
 
-    @Mock
-    AccountService accountService;
-
     @Before
     public void setUp() {
-        CallContext.init(entityMgr, accountService);
+        CallContext.init(entityMgr);
         CallContext.register(Mockito.mock(User.class), Mockito.mock(Account.class));
     }