refactor, remove todo

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

Author: shwstppr

api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java

@@ -32,7 +32,7 @@
 import org.apache.cloudstack.api.response.PodResponse;
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.extension.Extension;
-import org.apache.cloudstack.extension.ExtensionApiService;
+import org.apache.cloudstack.extension.ExtensionHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -46,7 +46,7 @@
 public class ListClustersCmd extends BaseListCmd {
 
     @Inject
-    ExtensionApiService extensionApiService;
+    ExtensionHelper extensionHelper;
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -162,11 +162,11 @@ protected void updateClustersExtensions(final List<ClusterResponse> clusterRespo
             if (!Hypervisor.HypervisorType.External.getHypervisorDisplayName().equals(response.getHypervisorType())) {
                 continue;
             }
-            Long extensionId = extensionApiService.getExtensionIdForCluster(response.getInternalId());
+            Long extensionId = extensionHelper.getExtensionIdForCluster(response.getInternalId());
             if (extensionId == null) {
                 continue;
             }
-            Extension extension = idExtensionMap.computeIfAbsent(extensionId, id -> extensionApiService.getExtension(id));
+            Extension extension = idExtensionMap.computeIfAbsent(extensionId, id -> extensionHelper.getExtension(id));
             if (extension == null) {
                 continue;
             }

…stack/extension/ExtensionApiService.java …loudstack/extension/ExtensionHelper.javaapi/src/main/java/org/apache/cloudstack/extension/ExtensionApiService.java renamed to api/src/main/java/org/apache/cloudstack/extension/ExtensionHelper.java api/src/main/java/org/apache/cloudstack/extension/ExtensionApiService.java renamed to api/src/main/java/org/apache/cloudstack/extension/ExtensionHelper.java

@@ -17,7 +17,7 @@
 
 package org.apache.cloudstack.extension;
 
-public interface ExtensionApiService {
+public interface ExtensionHelper {
     Long getExtensionIdForCluster(long clusterId);
     Extension getExtension(long id);
     Extension getExtensionForCluster(long clusterId);

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java

@@ -57,7 +57,7 @@
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.extension.CustomActionResultResponse;
 import org.apache.cloudstack.extension.Extension;
-import org.apache.cloudstack.extension.ExtensionApiService;
+import org.apache.cloudstack.extension.ExtensionHelper;
 import org.apache.cloudstack.extension.ExtensionCustomAction;
 import org.apache.cloudstack.extension.ExtensionResourceMap;
 import org.apache.cloudstack.framework.extensions.api.AddCustomActionCmd;
@@ -138,7 +138,7 @@
 import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.VMInstanceDao;
 
-public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsManager, ExtensionApiService, PluggableService {
+public class ExtensionsManagerImpl extends ManagerBase implements ExtensionsManager, ExtensionHelper, PluggableService {
 
     @Inject
     ExtensionDao extensionDao;
@@ -1294,7 +1294,6 @@ public CustomActionResultResponse runCustomAction(RunCustomActionCmd cmd) {
                 response.setSuccess(answer.getResult());
                 result.put(ApiConstants.MESSAGE, getActionMessage(answer.getResult(), customActionVO, extensionVO,
                         actionResourceType, entity));
-                // ToDo: Check if we should pass the details for an errored action or pass it at all
                 result.put(ApiConstants.DETAILS, customActionAnswer.getDetails());
             }
         } catch (AgentUnavailableException e) {

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -148,7 +148,7 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
 import org.apache.cloudstack.extension.Extension;
-import org.apache.cloudstack.extension.ExtensionApiService;
+import org.apache.cloudstack.extension.ExtensionHelper;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.jobs.AsyncJobManager;
@@ -653,7 +653,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
     GuestOSDao guestOSDao;
 
     @Inject
-    ExtensionApiService extensionApiService;
+    ExtensionHelper extensionHelper;
 
     private SearchCriteria<ServiceOfferingJoinVO> getMinimumCpuServiceOfferingJoinSearchCriteria(int cpu) {
         SearchCriteria<ServiceOfferingJoinVO> sc = _srvOfferingJoinDao.createSearchCriteria();
@@ -2393,7 +2393,7 @@ protected void updateHostsExtensions(final List<HostResponse> hostResponses) {
                 continue;
             }
             Extension extension = clusterIdExtensionMap.computeIfAbsent(response.getClusterInternalId(),
-                    id -> extensionApiService.getExtensionForCluster(id));
+                    id -> extensionHelper.getExtensionForCluster(id));
             if (extension == null) {
                 continue;
             }