Revert unnecessary AffinityGroupService interface change and processor lookup

Author: Daman Arora

api/src/main/java/org/apache/cloudstack/affinity/AffinityGroupService.java

@@ -17,7 +17,6 @@
 package org.apache.cloudstack.affinity;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.cloudstack.api.command.user.affinitygroup.CreateAffinityGroupCmd;
 
@@ -67,6 +66,4 @@ public interface AffinityGroupService {
 
     boolean isAffinityGroupAvailableInDomain(long affinityGroupId, long domainId);
 
-    Map<String, AffinityGroupProcessor> getAffinityTypeToProcessorMap();
-
 }

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

@@ -56,8 +56,6 @@
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.acl.Rule;
 import org.apache.cloudstack.acl.SecurityChecker;
-import org.apache.cloudstack.affinity.AffinityGroupProcessor;
-import org.apache.cloudstack.affinity.AffinityGroupService;
 import org.apache.cloudstack.affinity.AffinityGroupVO;
 import org.apache.cloudstack.affinity.AffinityProcessorBase;
 import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
@@ -337,8 +335,6 @@ public class KubernetesClusterManagerImpl extends ManagerBase implements Kuberne
     @Inject
     protected AffinityGroupDao affinityGroupDao;
     @Inject
-    protected AffinityGroupService affinityGroupService;
-    @Inject
     protected AffinityGroupVMMapDao affinityGroupVMMapDao;
     @Inject
     protected ServiceOfferingDao serviceOfferingDao;
@@ -2565,11 +2561,6 @@ protected Set<Long> getExistingWorkerHostIds(KubernetesCluster cluster) {
 
     protected void validateNodesAgainstExistingWorkers(List<Long> nodeIds, Set<Long> existingWorkerHostIds,
                                                        AffinityGroupVO affinityGroup, KubernetesCluster cluster) {
-        AffinityGroupProcessor processor = getAffinityGroupProcessor(affinityGroup.getType());
-        if (Objects.isNull(processor)) {
-            return;
-        }
-
         for (Long nodeId : nodeIds) {
             VMInstanceVO node = vmInstanceDao.findById(nodeId);
             if (node == null || node.getHostId() == null) {
@@ -2602,8 +2593,7 @@ protected void validateNodesAgainstExistingWorkers(List<Long> nodeIds, Set<Long>
     }
 
     protected void validateNewNodesAntiAffinity(List<Long> nodeIds, AffinityGroupVO affinityGroup, KubernetesCluster cluster) {
-        AffinityGroupProcessor processor = getAffinityGroupProcessor(affinityGroup.getType());
-        if (processor == null || !AffinityProcessorBase.AFFINITY_TYPE_HOST_ANTI.equals(affinityGroup.getType())) {
+        if (!AffinityProcessorBase.AFFINITY_TYPE_HOST_ANTI.equals(affinityGroup.getType())) {
             return;
         }
 
@@ -2624,14 +2614,6 @@ protected void validateNewNodesAntiAffinity(List<Long> nodeIds, AffinityGroupVO
         }
     }
 
-    protected AffinityGroupProcessor getAffinityGroupProcessor(String affinityGroupType) {
-        Map<String, AffinityGroupProcessor> typeProcessorMap = affinityGroupService.getAffinityTypeToProcessorMap();
-        if (MapUtils.isEmpty(typeProcessorMap)) {
-            return null;
-        }
-        return typeProcessorMap.get(affinityGroupType);
-    }
-
     protected String getHostName(Long hostId) {
         HostVO host = hostDao.findById(hostId);
         return host != null ? host.getName() : String.valueOf(hostId);

server/src/main/java/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java

@@ -355,8 +355,7 @@ public List<String> listAffinityGroupTypes() {
         return types;
     }
 
-    @Override
-    public Map<String, AffinityGroupProcessor> getAffinityTypeToProcessorMap() {
+    protected Map<String, AffinityGroupProcessor> getAffinityTypeToProcessorMap() {
         Map<String, AffinityGroupProcessor> typeProcessorMap = new HashMap<String, AffinityGroupProcessor>();
 
         for (AffinityGroupProcessor processor : _affinityProcessors) {