extracted functjonal library

Author: pmbittner

pom.xml

@@ -91,6 +91,13 @@
             <version>5.11.1.202105131744-r</version>
         </dependency>
 
+<!--        Local dependencies-->
+        <dependency>
+            <groupId>de.variantsync</groupId>
+            <artifactId>Functjonal</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>de.ovgu</groupId>
             <artifactId>featureide.lib.fm</artifactId>
@@ -102,6 +109,8 @@
             <artifactId>core</artifactId>
             <version>2.3.5</version>
         </dependency>
+<!--        -->
+
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

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

@@ -10,10 +10,6 @@
 import de.variantsync.evolution.io.data.VariabilityDatasetLoader;
 import de.variantsync.evolution.repository.AbstractSPLRepository;
 import de.variantsync.evolution.util.Logger;
-import de.variantsync.evolution.util.functional.Functional;
-import de.variantsync.evolution.util.functional.Lazy;
-import de.variantsync.evolution.util.functional.MonadTransformer;
-import de.variantsync.evolution.util.functional.Unit;
 import de.variantsync.evolution.util.list.NonEmptyList;
 import de.variantsync.evolution.variability.EvolutionStep;
 import de.variantsync.evolution.variability.SPLCommit;
@@ -24,6 +20,10 @@
 import de.variantsync.evolution.variants.VariantsRevision;
 import de.variantsync.evolution.variants.sampling.SampleOnceAtBeginStrategy;
 import de.variantsync.evolution.variants.sampling.SamplingStrategy;
+import de.variantsync.functjonal.Functjonal;
+import de.variantsync.functjonal.Lazy;
+import de.variantsync.functjonal.category.MonadTransformer;
+import de.variantsync.functjonal.category.Unit;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -152,7 +152,7 @@ public static void main(final String[] args) throws IOException, Resources.Resou
             // First possible way is to just run all revisions at once.
             {
                 // This lazy holds the computation that will run everything.
-                final Lazy<Unit> genAll = Functional.match(
+                final Lazy<Unit> genAll = Functjonal.match(
                         firstRevisionToGenerate,
                         VariantsRevision::evolveAll, // If there is a first revision to generate, then generate all subsequent revision.
                         () -> Lazy.pure(Unit.Instance())); // If there was nothing to generate, return an empty computation.

src/main/java/de/variantsync/evolution/feature/config/FeatureIDEConfiguration.java

@@ -9,7 +9,7 @@
 import de.ovgu.featureide.fm.core.configuration.ConfigurationPropagator;
 import de.ovgu.featureide.fm.core.configuration.Selection;
 import de.variantsync.evolution.util.fide.bugfix.FixTrueFalse;
-import de.variantsync.evolution.util.functional.Lazy;
+import de.variantsync.functjonal.Lazy;
 import org.prop4j.Node;
 
 import java.util.HashMap;

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

@@ -1,6 +1,6 @@
 package de.variantsync.evolution.io;
 
-import de.variantsync.evolution.util.functional.Result;
+import de.variantsync.functjonal.Result;
 
 import java.nio.file.Path;
 

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

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

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

@@ -10,14 +10,14 @@
 import de.variantsync.evolution.io.data.VariabilityDatasetLoader;
 import de.variantsync.evolution.io.featureide.FeatureIDEConfigurationIO;
 import de.variantsync.evolution.io.featureide.FeatureModelIO;
-import de.variantsync.evolution.io.kernelhaven.VariabilityModelLoader;
 import de.variantsync.evolution.io.kernelhaven.KernelHavenSPLPCIO;
 import de.variantsync.evolution.io.kernelhaven.KernelHavenVariantPCIO;
+import de.variantsync.evolution.io.kernelhaven.VariabilityModelLoader;
 import de.variantsync.evolution.util.Logger;
-import de.variantsync.evolution.util.functional.Result;
-import de.variantsync.evolution.util.functional.Unit;
 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 java.nio.file.Path;
 import java.util.ArrayList;

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

@@ -1,7 +1,7 @@
 package de.variantsync.evolution.io;
 
 import de.variantsync.evolution.util.Logger;
-import de.variantsync.evolution.util.functional.Result;
+import de.variantsync.functjonal.Result;
 
 import java.io.BufferedReader;
 import java.io.File;

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

@@ -4,8 +4,8 @@
 import de.variantsync.evolution.io.ResourceWriter;
 import de.variantsync.evolution.io.TextIO;
 import de.variantsync.evolution.util.io.PathUtils;
-import de.variantsync.evolution.util.functional.Result;
-import de.variantsync.evolution.util.functional.Unit;
+import de.variantsync.functjonal.Result;
+import de.variantsync.functjonal.category.Unit;
 
 import java.io.BufferedReader;
 import java.io.FileReader;

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

@@ -3,10 +3,10 @@
 import de.variantsync.evolution.io.ResourceLoader;
 import de.variantsync.evolution.io.TextIO;
 import de.variantsync.evolution.util.Logger;
-import de.variantsync.evolution.util.functional.Result;
 import de.variantsync.evolution.variability.SPLCommit;
 import de.variantsync.evolution.variability.SPLCommit.*;
 import de.variantsync.evolution.variability.VariabilityDataset;
+import de.variantsync.functjonal.Result;
 import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
 
@@ -16,6 +16,8 @@
 import java.nio.file.Path;
 import java.util.*;
 
+;
+
 public class VariabilityDatasetLoader implements ResourceLoader<VariabilityDataset> {
     private final static String SUCCESS_COMMIT_FILE = "SUCCESS_COMMITS.txt";
     private final static String ERROR_COMMIT_FILE = "ERROR_COMMITS.txt";

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

@@ -5,13 +5,13 @@
 import de.ovgu.featureide.fm.core.io.ProblemList;
 import de.ovgu.featureide.fm.core.io.manager.FileHandler;
 import de.variantsync.evolution.feature.config.FeatureIDEConfiguration;
+import de.variantsync.evolution.feature.config.IConfiguration;
 import de.variantsync.evolution.io.ResourceLoader;
 import de.variantsync.evolution.io.ResourceWriter;
-import de.variantsync.evolution.util.io.PathUtils;
 import de.variantsync.evolution.util.fide.ProblemListUtils;
-import de.variantsync.evolution.util.functional.Result;
-import de.variantsync.evolution.util.functional.Unit;
-import de.variantsync.evolution.feature.config.IConfiguration;
+import de.variantsync.evolution.util.io.PathUtils;
+import de.variantsync.functjonal.Result;
+import de.variantsync.functjonal.category.Unit;
 
 import java.nio.file.Path;