Changes from latest commit

Author: vkalapov

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/MergeDescriptorsStep.java

@@ -49,14 +49,14 @@ protected StepPhase executeStep(ProcessContext context) {
                                                                                                  extensionDescriptors);
         context.setVariable(Variables.DEPLOYMENT_DESCRIPTOR, descriptor);
 
-        warnForUnknownParameters(descriptor);
+        warnForUnsupportedParameters(descriptor);
 
         backupDeploymentDescriptor(context, descriptor);
         getStepLogger().debug(Messages.DESCRIPTORS_MERGED);
         return StepPhase.DONE;
     }
 
-    private void warnForUnknownParameters(DeploymentDescriptor descriptor) {
+    private void warnForUnsupportedParameters(DeploymentDescriptor descriptor) {
         List<ReferenceContainer> references = new ReferencesFinder().getAllReferences(descriptor);
         Map<String, List<String>> unsupportedParameters = unsupportedParameterFinder.findUnsupportedParameters(descriptor,
                                                                                                                references);

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/util/ModuleHooksAggregator.java

@@ -12,7 +12,7 @@
 import org.flowable.engine.delegate.DelegateExecution;
 
 public class ModuleHooksAggregator {
-
+    private static final int MAJOR_SCHEMA_VERSION_THREE = 3;
     private final DelegateExecution execution;
     private final Module moduleToDeploy;
 
@@ -39,7 +39,7 @@ private List<Hook> collectHooksWithPhase(Module moduleToDeploy, List<HookPhase>
     }
 
     private List<Hook> getModuleHooks(Module module) {
-        return SchemaVersionUtils.getEntityData(module, Module::getMajorSchemaVersion, Module::getHooks);
+        return moduleToDeploy.getMajorSchemaVersion() < MAJOR_SCHEMA_VERSION_THREE ? Collections.emptyList() : moduleToDeploy.getHooks();
     }
 
     private boolean shouldCollectHook(List<String> hookPhases, List<HookPhase> hookTypeForCurrentStepPhase) {

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/util/UnsupportedParameterFinder.java

@@ -25,19 +25,16 @@ public class UnsupportedParameterFinder {
     private static final String GLOBAL_PARAMETER = "global-parameter";
 
     public Map<String, List<String>> findUnsupportedParameters(DeploymentDescriptor descriptor, List<ReferenceContainer> references) {
-        List<CustomParameterContainer> unknownParametersContainer = findUnsupportedParametersInDescriptor(descriptor);
+        List<CustomParameterContainer> unknownParametersContainer = supportedParameterChecker.getCustomParameters(descriptor);
         return collectUnsupportedParametersByOwner(unknownParametersContainer, references);
     }
 
-    private List<CustomParameterContainer> findUnsupportedParametersInDescriptor(DeploymentDescriptor descriptor) {
-        return supportedParameterChecker.getCustomParameters(descriptor);
-    }
-
     private Map<String, List<String>> collectUnsupportedParametersByOwner(List<CustomParameterContainer> containers,
                                                                           List<ReferenceContainer> references) {
         return containers.stream()
                          .map(container -> toFilteredEntry(container, references))
-                         .filter(this::hasUnsupportedParameters)
+                         .filter(entry -> !entry.getValue()
+                                                .isEmpty())
                          .collect(unsupportedParametersCollector());
     }
 
@@ -93,12 +90,7 @@ private boolean isReferenceDependencyMatched(Reference reference, CustomParamete
         return reference.getDependencyName() == null || reference.getDependencyName()
                                                                  .equals(container.getParameterOwner());
     }
-
-    private boolean hasUnsupportedParameters(Map.Entry<String, List<String>> entry) {
-        return !entry.getValue()
-                     .isEmpty();
-    }
-
+    
     private Collector<Map.Entry<String, List<String>>, ?, Map<String, List<String>>> unsupportedParametersCollector() {
         return Collectors.toMap(
             Map.Entry::getKey,