Simplifying prune method

LMCROSSITXSADEPLOY-2301

Author: karrgov

multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/builders/ExtensionDescriptorChainBuilder.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -34,6 +35,7 @@ private boolean isSecureDescriptor(ExtensionDescriptor extensionDescriptor) {
     }
 
     public List<ExtensionDescriptor> build(DeploymentDescriptor deploymentDescriptor, List<ExtensionDescriptor> extensionDescriptors) throws ContentException {
+        saveSecureExtensionDescriptor(extensionDescriptors);
         Map<String, ExtensionDescriptor> extensionDescriptorsPerParent = getExtensionDescriptorsPerParent(extensionDescriptors);
         return build(deploymentDescriptor, extensionDescriptorsPerParent);
     }
@@ -42,25 +44,14 @@ private List<ExtensionDescriptor> build(DeploymentDescriptor deploymentDescripto
                                             Map<String, ExtensionDescriptor> extensionDescriptorsPerParent) {
         List<ExtensionDescriptor> chain = new ArrayList<>();
         Descriptor currentDescriptor = deploymentDescriptor;
-        ExtensionDescriptor secureDescriptor = null;
 
         while (currentDescriptor != null) {
             ExtensionDescriptor nextDescriptor = extensionDescriptorsPerParent.remove(currentDescriptor.getId());
-
-            if(nextDescriptor != null && isSecureDescriptor(nextDescriptor)) {
-                secureDescriptor = nextDescriptor;
-                continue;
-            }
-
             CollectionUtils.addIgnoreNull(chain, nextDescriptor);
             currentDescriptor = nextDescriptor;
         }
 
-        CollectionUtils.addIgnoreNull(chain, secureDescriptor);
-
-        if(secureDescriptor == null && this.secureExtensionDescriptor != null) {
-            CollectionUtils.addIgnoreNull(chain, this.secureExtensionDescriptor);
-        }
+        CollectionUtils.addIgnoreNull(chain, this.secureExtensionDescriptor);
 
         if (!extensionDescriptorsPerParent.isEmpty() && isStrict) {
             throw new ContentException(Messages.CANNOT_BUILD_EXTENSION_DESCRIPTOR_CHAIN_BECAUSE_DESCRIPTORS_0_HAVE_AN_UNKNOWN_PARENT,
@@ -77,25 +68,23 @@ private Map<String, ExtensionDescriptor> getExtensionDescriptorsPerParent(List<E
     }
 
     private Map<String, ExtensionDescriptor> prune(Map<String, List<ExtensionDescriptor>> extensionDescriptorsPerParent) {
-        return extensionDescriptorsPerParent.entrySet()
-                                            .stream()
-                                            .collect(Collectors.toMap(Map.Entry::getKey, entry -> {
-                                                List<ExtensionDescriptor> localList = entry.getValue();
-
-                                                for(ExtensionDescriptor extensionDescriptor : localList) {
-                                                    if(extensionDescriptor.getId().equals(Constants.SECURE_EXTENSION_DESCRIPTOR_ID)) {
-                                                        this.secureExtensionDescriptor = extensionDescriptor;
-                                                    }
-                                                }
-
-                                                for(ExtensionDescriptor extensionDescriptor : localList) {
-                                                    if(!extensionDescriptor.getId().equals(Constants.SECURE_EXTENSION_DESCRIPTOR_ID)) {
-                                                        return extensionDescriptor;
-                                                    }
-                                                }
-
-                                                return localList.get(0);
-                                            }));
+        Map<String, ExtensionDescriptor> resultMap = new LinkedHashMap<>();
+
+        for (Map.Entry<String, List<ExtensionDescriptor>> entry : extensionDescriptorsPerParent.entrySet()) {
+            ExtensionDescriptor firstNonSecureExtensionDescriptor = null;
+
+            for (ExtensionDescriptor currentExtensionDescriptorForParent : entry.getValue()) {
+                if (!isSecureDescriptor(currentExtensionDescriptorForParent)) {
+                    firstNonSecureExtensionDescriptor = currentExtensionDescriptorForParent;
+                    break;
+                }
+            }
+
+            if (firstNonSecureExtensionDescriptor != null) {
+                resultMap.put(entry.getKey(), firstNonSecureExtensionDescriptor);
+            }
+        }
+        return resultMap;
     }
 
     private void validateSingleExtensionDescriptorPerParent(Map<String, List<ExtensionDescriptor>> extensionDescriptorsPerParent) {
@@ -109,4 +98,16 @@ private void validateSingleExtensionDescriptorPerParent(Map<String, List<Extensi
         }
     }
 
-}
+    private void saveSecureExtensionDescriptor(List<ExtensionDescriptor> extensionDescriptors) {
+        ExtensionDescriptor lastSecureExtensionDescriptor = null;
+
+        for(ExtensionDescriptor extensionDescriptor : extensionDescriptors) {
+            if(isSecureDescriptor(extensionDescriptor)) {
+                lastSecureExtensionDescriptor = extensionDescriptor;
+            }
+        }
+
+        this.secureExtensionDescriptor = lastSecureExtensionDescriptor;
+    }
+
+}