adaptions to changes in Functjonal

Author: pmbittner

src/main/java/de/variantsync/evolution/Main.java

@@ -21,8 +21,8 @@
 import de.variantsync.evolution.variants.sampling.SamplingStrategy;
 import de.variantsync.functjonal.Functjonal;
 import de.variantsync.functjonal.Lazy;
+import de.variantsync.functjonal.Unit;
 import de.variantsync.functjonal.category.MonadTransformer;
-import de.variantsync.functjonal.category.Unit;
 import de.variantsync.functjonal.list.NonEmptyList;
 
 import java.io.File;

src/main/java/de/variantsync/evolution/io/ResourceWriter.java

@@ -1,7 +1,7 @@
 package de.variantsync.evolution.io;
 
 import de.variantsync.functjonal.Result;
-import de.variantsync.functjonal.category.Unit;
+import de.variantsync.functjonal.Unit;
 
 import java.nio.file.Path;
 

src/main/java/de/variantsync/evolution/io/Resources.java

@@ -17,7 +17,7 @@
 import de.variantsync.evolution.variability.VariabilityDataset;
 import de.variantsync.evolution.variability.pc.Artefact;
 import de.variantsync.functjonal.Result;
-import de.variantsync.functjonal.category.Unit;
+import de.variantsync.functjonal.Unit;
 
 import java.nio.file.Path;
 import java.util.ArrayList;

src/main/java/de/variantsync/evolution/io/data/CSVIO.java

@@ -5,7 +5,7 @@
 import de.variantsync.evolution.io.TextIO;
 import de.variantsync.evolution.util.io.PathUtils;
 import de.variantsync.functjonal.Result;
-import de.variantsync.functjonal.category.Unit;
+import de.variantsync.functjonal.Unit;
 
 import java.io.BufferedReader;
 import java.io.FileReader;

src/main/java/de/variantsync/evolution/io/featureide/FeatureIDEConfigurationIO.java

@@ -11,7 +11,7 @@
 import de.variantsync.evolution.util.fide.ProblemListUtils;
 import de.variantsync.evolution.util.io.PathUtils;
 import de.variantsync.functjonal.Result;
-import de.variantsync.functjonal.category.Unit;
+import de.variantsync.functjonal.Unit;
 
 import java.nio.file.Path;
 

src/main/java/de/variantsync/evolution/io/featureide/FeatureModelIO.java

@@ -10,7 +10,7 @@
 import de.variantsync.evolution.util.fide.ProblemListUtils;
 import de.variantsync.evolution.util.io.PathUtils;
 import de.variantsync.functjonal.Result;
-import de.variantsync.functjonal.category.Unit;
+import de.variantsync.functjonal.Unit;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

src/main/java/de/variantsync/evolution/io/kernelhaven/KernelHavenPCIO.java

@@ -12,7 +12,7 @@
 import de.variantsync.evolution.variability.pc.SourceCodeFile;
 import de.variantsync.evolution.variability.pc.SyntheticArtefactTreeNode;
 import de.variantsync.functjonal.Result;
-import de.variantsync.functjonal.category.Unit;
+import de.variantsync.functjonal.Unit;
 import de.variantsync.functjonal.list.ListHeadTailView;
 import org.prop4j.Node;
 import org.prop4j.NodeReader;

src/main/java/de/variantsync/evolution/util/io/PathUtils.java

@@ -1,8 +1,8 @@
 package de.variantsync.evolution.util.io;
 
 import de.variantsync.functjonal.Result;
+import de.variantsync.functjonal.Unit;
 import de.variantsync.functjonal.category.Monoid;
-import de.variantsync.functjonal.category.Unit;
 import de.variantsync.functjonal.error.CompositeException;
 
 import java.io.File;
@@ -68,7 +68,7 @@ public static Result<Unit, CompositeException> deleteDirectory(final Path path)
             return walk
                     .sorted(Comparator.reverseOrder())
                     .map(f -> Result.Try(() -> Files.delete(f)).mapFail(CompositeException::new))
-                    .reduce(resultReducer::mAppend)
+                    .reduce(resultReducer::append)
                     .orElseGet(() -> Result.Success(Unit.Instance()));
         } catch (final NoSuchFileException e) {
             // If the given path does not exist, then there was nothing to delete.

src/main/java/de/variantsync/evolution/variability/pc/LineBasedAnnotation.java

@@ -100,7 +100,7 @@ public Result<GroundTruth, Exception> generateVariant(
     }
 
     public Optional<AnnotationGroundTruth> deriveForVariant(final Variant variant) {
-        final BlockMatching matching = BlockMatching.MONOID.mEmpty();
+        final BlockMatching matching = BlockMatching.MONOID.neutral();
         return deriveForVariant(variant, 0, matching).map(l -> new AnnotationGroundTruth(this, l, matching));
     }
 

src/main/java/de/variantsync/evolution/variability/pc/groundtruth/BlockMatching.java

@@ -7,7 +7,7 @@
 import java.util.Map;
 
 public class BlockMatching {
-    public static final Monoid<BlockMatching> MONOID = Monoid.Create(
+    public static final Monoid<BlockMatching> MONOID = Monoid.From(
             BlockMatching::new,
             (a, b) -> {
                 final BlockMatching result = new BlockMatching();