Add installContext to VersionAwareTask test

Author: eschleb

core/src/main/java/com/merkle/oss/magnolia/setup/EnhancedModuleVersionHandler.java

@@ -90,38 +90,38 @@ private boolean isSnapshot(final Version version) {
     }
 
     protected Stream<Task> getInstallTasks(final InstallContext installContext, final Version forVersion) {
-        return filter(installTasks, forVersion, null);
+        return filter(installTasks, installContext, forVersion, null);
     }
 
     protected Stream<Task> getInstallAndUpdateTasks(final InstallContext installContext, final Version forVersion, @Nullable final Version fromVersion) {
-        return filter(installAndUpdateTasks, forVersion, fromVersion);
+        return filter(installAndUpdateTasks, installContext, forVersion, fromVersion);
     }
 
     protected Stream<Task> getUpdateTasks(final InstallContext installContext, final Version forVersion, @Nullable final Version fromVersion) {
-        return filter(updateTasks, forVersion, fromVersion);
+        return filter(updateTasks, installContext, forVersion, fromVersion);
     }
 
     protected Stream<Task> getModuleStartupTasks(final InstallContext installContext, final Version forVersion, @Nullable final Version fromVersion) {
-        return filter(moduleStartupTasks, forVersion, fromVersion);
+        return filter(moduleStartupTasks, installContext, forVersion, fromVersion);
     }
 
     protected Stream<Task> getSnapshotStartupTasks(final InstallContext installContext, final Version forVersion, @Nullable final Version fromVersion) {
         return Stream.of(
-                filter(snapshotStartupTasks, forVersion, fromVersion),
+                filter(snapshotStartupTasks, installContext, forVersion, fromVersion),
                 // execute all general install and update tasks on snapshot
                 getInstallAndUpdateTasks(installContext, forVersion, fromVersion),
                 getUpdateTasks(installContext, forVersion, fromVersion)
         ).flatMap(Function.identity());
     }
 
     protected Stream<Task> getLocalDevelopmentStartupTasks(final InstallContext installContext, final Version forVersion, @Nullable final Version fromVersion) {
-        return filter(localDevelopmentStartupTasks, forVersion, fromVersion);
+        return filter(localDevelopmentStartupTasks, installContext, forVersion, fromVersion);
     }
 
-    protected Stream<Task> filter(final Collection<? extends VersionAwareTask> tasks, final Version forVersion, @Nullable final Version fromVersion) {
+    protected Stream<Task> filter(final Collection<? extends VersionAwareTask> tasks, final InstallContext installContext, final Version forVersion, @Nullable final Version fromVersion) {
         return tasks
                 .stream()
-                .filter(task -> task.test(forVersion, fromVersion))
+                .filter(task -> task.test(installContext, forVersion, fromVersion))
                 .map(task -> task);
     }
 }

core/src/main/java/com/merkle/oss/magnolia/setup/task/type/VersionAwareTask.java

@@ -1,18 +1,16 @@
 package com.merkle.oss.magnolia.setup.task.type;
 
+import info.magnolia.module.InstallContext;
 import info.magnolia.module.delta.Task;
 import info.magnolia.module.model.Version;
 
 import java.util.Optional;
-import java.util.function.BiPredicate;
-import java.util.function.Predicate;
 
 import javax.annotation.Nullable;
 
-public interface VersionAwareTask extends Task, BiPredicate<Version, Version> {
+public interface VersionAwareTask extends Task {
 
-	@Override
-	default boolean test(final Version forVersion, @Nullable final Version fromVersion) {
+	default boolean test(final InstallContext installContext, final Version forVersion, @Nullable final Version fromVersion) {
 		return true;
 	}