modified: resources/AllgemeinTest/Box.jav

modified:   resources/bytecode/javFiles/Matrix.jav
	modified:   src/test/java/AllgemeinTest.java

.gitea/workflows/build_and_test.yml

@@ -1,8 +1,5 @@
 name: Build and Test with Maven
-on:
-  push:
-    branches-ignore:
-      - master
+on: [push]
 
 jobs:
   Build-and-test-with-Maven:
@@ -18,11 +15,11 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '25'
+          java-version: '22'
           cache: 'maven'
       - name: Compile project
         run: |
           mvn compile
       - name: Run tests
         run: |
-          mvn test
+          mvn test

.gitea/workflows/sonarqube.yml

@@ -1,45 +0,0 @@
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-      types: [opened, synchronize, reopened]
-
-name: SonarQube Scan
-jobs:
-  sonarqube:
-    name: SonarQube Trigger
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checking out
-      uses: actions/checkout@v4
-      with:
-        # Disabling shallow clone is recommended for improving relevancy of reporting
-        fetch-depth: 0
-    - name: Install maven
-      run: |
-        apt update
-        apt install -y maven
-    - name: Install java
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'temurin'
-        java-version: '25'
-        cache: 'maven'
-    - name: Compile project
-      run: |
-        mvn clean dependency:copy-dependencies verify
-    - name: SonarQube Scan
-      uses: SonarSource/sonarqube-scan-action@v5.3.0
-      env:
-        SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }}
-        SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
-      with:
-        args: >
-          -Dsonar.projectKey=Java-TX
-          -Dsonar.sources=src/main/java
-          -Dsonar.tests=src/test/java
-          -Dsonar.junit.reportPaths=target/test-reports
-          -Dsonar.java.binaries=target/classes
-          -Dsonar.java.libraries=target/dependency/*.jar
-          -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml

README.md

@@ -1,7 +0,0 @@
-## Java-TX Compiler
-
-[![Lines of Code](https://gitea.hb.dhbw-stuttgart.de/sonarqube/api/project_badges/measure?project=Java-TX&metric=ncloc&token=sqb_d4a372fca7a6b86441243728a6ea5f88183db5eb)](https://gitea.hb.dhbw-stuttgart.de/sonarqube/dashboard?id=Java-TX)
-[![Coverage](https://gitea.hb.dhbw-stuttgart.de/sonarqube/api/project_badges/measure?project=Java-TX&metric=coverage&token=sqb_d4a372fca7a6b86441243728a6ea5f88183db5eb)](https://gitea.hb.dhbw-stuttgart.de/sonarqube/dashboard?id=Java-TX)
-[![Quality Gate Status](https://gitea.hb.dhbw-stuttgart.de/sonarqube/api/project_badges/measure?project=Java-TX&metric=alert_status&token=sqb_d4a372fca7a6b86441243728a6ea5f88183db5eb)](https://gitea.hb.dhbw-stuttgart.de/sonarqube/dashboard?id=Java-TX)
-
-Work in Progress Java-TX Compiler repository!

independentTest.sh

@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-
-REPO="https://gitea.hb.dhbw-stuttgart.de/f.holzwarth/JavaCompilerCore.git"
-TDIR="./testBuild"
-
-rm -rf "$TDIR" 2>/dev/null
-mkdir $TDIR
-
-cd $TDIR
-git clone $REPO .
-git checkout feat/unify-server
-# git checkout 93e1a8787cd94c73f4538f6a348f58613893a584
-# git checkout dad468368b86bdd5a3d3b2754b17617cee0a9107 # 1:55
-# git checkout a0c11b60e8c9d7addcbe0d3a09c9ce2924e9d5c0 # 2:25
-# git checkout 4cddf73e6d6c9116d3e1705c4b27a8e7f18d80c3 # 2:27
-# git checkout 6c2d97b7703d954e4a42eef3ec374bcf313af75c # 2:13
-# git checkout f722a00fbb6e69423d48a890e4a6283471763e64 # 1:35
-# git checkout f0a4a51ce65639ce9a9470ff0fdb538fdf9c02cc # 2:19
-# git checkout 1391206dfe59263cdb22f93371cfd1dd5465d97f # 1:29
-
-date "+%Y.%m.%d %H:%M:%S"
-# sed -i -e 's/source>21/source>23/g' pom.xml
-# sed -i -e 's/target>21/target>23/g' pom.xml
-
-
-mvn clean compile -DskipTests package
-time java -jar target/JavaTXcompiler-0.1-jar-with-dependencies.jar resources/bytecode/javFiles/Matrix.jav;
-
-# mvn clean compile test
-
-
-echo -e "\nCleanup... "
-cd -
-rm -rf "$TDIR" 2>/dev/null
-
-echo -e "\nFinished "
-date "+%Y.%m.%d %H:%M:%S"
-echo -e "\n "
-

pom.xml

@@ -12,103 +12,60 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 	<url>http://maven.apache.org</url>
 	<dependencies>
 		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.13.2</version>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.2</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.antlr/antlr4 -->
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4</artifactId>
-			<version>4.13.2</version>
+			<version>4.11.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.19.0</version>
+			<version>2.16.1</version>
 		</dependency>
 		<dependency>
 			<groupId>io.github.classgraph</groupId>
 			<artifactId>classgraph</artifactId>
-			<version>4.8.180</version>
+			<version>4.8.172</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.4.8-jre</version>
+			<version>33.2.0-jre</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>9.8</version>
-		</dependency>
-		<dependency>
-			<groupId>org.java-websocket</groupId>
-			<artifactId>Java-WebSocket</artifactId>
-			<version>1.5.2</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.25</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.17.2</version>
-		</dependency>
-		<dependency>
-			<groupId>com.diogonunes</groupId>
-			<artifactId>JColor</artifactId>
-			<version>5.5.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jcommander</groupId>
-			<artifactId>jcommander</artifactId>
-			<version>3.0</version>
+			<version>9.5</version>
 		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.13</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.14.0</version>
+				<version>3.11.0</version>
 				<configuration>
-                    <source>25</source>
-                    <target>25</target>
+					<compilerArgs>--enable-preview</compilerArgs>
+                    <source>22</source>
+                    <target>22</target>
                 </configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.3</version>
+				<version>3.1.0</version>
 				<configuration>
 					<redirectTestOutputToFile>true</redirectTestOutputToFile>
 					<reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
-					<argLine>${argLine} --enable-preview</argLine>
+					<argLine>--enable-preview</argLine>
 					<trimStackTrace>false</trimStackTrace>
 					<excludes>
 						<exclude>**/JavaTXCompilerTest.java</exclude>
@@ -120,7 +77,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr4-maven-plugin</artifactId>
-				<version>4.13.2</version>
+				<version>4.11.1</version>
 				<executions>
 					<execution>
 						<id>antlr</id>
@@ -133,7 +90,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.4.2</version>
+				<version>3.3.0</version>
 				<configuration>
 					<archive>
 						<manifest>
@@ -181,4 +138,4 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<url>file:///${project.basedir}/maven-repository/</url>
 		</repository>
 	</distributionManagement>
-</project>
+</project>

resources/AllgemeinTest/Box.jav

@@ -9,4 +9,12 @@ public class Box {
 	set(x) {
 	  a = x;
 	}
+	
+	get() {
+		return a;
+	}
+	
+	m(b) {
+		//b.set(b.get());
+	}
 }

resources/bytecode/javFiles/Bug325.jav

@@ -6,7 +6,7 @@ import java.util.stream.Stream;
 
 public class Bug325 {
     public main() {
-      var list = new ArrayList<>(List.of(1,2,3,4,5));
+      List<Integer> list = new ArrayList<>(List.of(1,2,3,4,5));
       var func = x -> x*2;
       return list.stream().map(func).toList();
    }

resources/bytecode/javFiles/Bug363.jav

@@ -1,22 +0,0 @@
-import java.lang.String;
-
-
-public class Bug363 {
-  uncurry (f){
-    return x -> f.apply(x);
-  }
-
-  uncurry (f){
-    return (x, y) -> f.apply(x).apply(y);
-  }
-
-  uncurry (f){
-    return (x, y, z) -> f.apply(x).apply(y).apply(z);
-  }
-
-  public test(){
-    var f = x -> y -> z -> x + y + z;
-    var g = uncurry(f);
-    return g.apply("A", "B", "C"); // Outputs: 6
-  }
-}

resources/bytecode/javFiles/Bug364.jav

@@ -1,8 +0,0 @@
-import java.lang.String;
-
-public class Bug364{
-  public main(){
-    var f = x -> y -> z -> x + y + z;
-    return f.apply("A").apply("B").apply("C");
-  }
-}

resources/bytecode/javFiles/Bug365.jav

@@ -1,21 +0,0 @@
-import java.lang.String;
-import java.lang.Object;
-
-public class Bug365{
-  swap(f){
-    return x -> y -> f.apply(y).apply(x);
-  }
-
-  swap(Fun1$$<String, Fun1$$<String, Fun1$$<String, Object>>> f){
-    return x -> y -> z -> f.apply(z).apply(y).apply(x);
-  }
-
-  public ex1() {
-    var func = x -> y -> z -> x + y + z;
-    return func.apply("A").apply("B").apply("C");
-  }
-  public ex2() {
-    var func = x -> y -> z -> x + y + z;
-    return swap(func).apply("A").apply("B").apply("C");
-  }
-}

resources/bytecode/javFiles/Bug366.jav

@@ -1,12 +0,0 @@
-import java.lang.Integer;
-
-public class Bug366 {
-    public static lambda() {
-        return (a, b) -> a + b;
-    }
-
-    public static test() {
-        var l = lambda();
-        return l.apply(10, 20);
-    }
-}

resources/bytecode/javFiles/Bug371.jav

@@ -1,10 +0,0 @@
-import java.lang.Boolean;
-
-public class Bug371 {
-    static m1(x, y) { return x || y; }
-    static m2(x, y) { return x && y; }
-
-    public static test() {
-        return m2(m1(true, false), true);
-    }
-}

resources/bytecode/javFiles/Bug373.jav

@@ -1,17 +0,0 @@
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.lang.System;
-import java.io.PrintStream;
-import java.lang.Character;
-
-public class Bug373 {
-    public static main() {
-        System.out.println(true);
-        System.out.println(false);
-        System.out.println(1);
-        System.out.println(1l);
-        System.out.println(1.0);
-        System.out.println(1.0f);
-        System.out.println('a');
-    }
-}

resources/bytecode/javFiles/Bug378Id.jav

@@ -1,3 +0,0 @@
-class Bug378Id {
-    id2 = x -> x;
-}

resources/bytecode/javFiles/Bug378Main.jav

@@ -1,8 +0,0 @@
-import Bug378Id;
-import java.lang.Integer;
-
-public class Bug378Main {
-    public static main(args) {
-        var hallo = (new Bug378Id<Integer>().id2).apply(1);
-    }
-}

resources/bytecode/javFiles/Bug379.jav

@@ -1,24 +0,0 @@
-import java.lang.Integer;
-import java.lang.Double;
-import java.lang.System;
-import java.io.PrintStream;
-
-public class Bug379 {
-    public Fun1$$<Double, Double> fact = (x) -> {
-        if (x == 1) {
-            return 1;
-        } else {
-            return x * (fact.apply(x-1));
-        }
-    };
-
-    public getFact(x) {
-        return fact.apply(x);
-    }
-
-    public static void main(x) {
-		var f = new Bug379();
-        var intRes = f.getFact(3);
-		System.out.println(intRes);
-	}
-}

resources/bytecode/javFiles/Bug380.jav

@@ -1,12 +0,0 @@
-sealed interface List<T> permits Cons, Empty {}
-record Cons<T>(T a , List<T> l ) implements List <T> {}
-record Empty<T>() implements List <T> {}
-
-public class Bug380 {
-    public <T> List<T> append(l1, List<T> l2) {
-        return switch ( l1 ) {
-            case Cons(e, rest) -> new Cons<>(e, append(rest, l2)); //::Typ TPH A
-            case Empty() -> l2;//::TPH B
-        };
-    }
-}

resources/bytecode/javFiles/Bug382.jav

@@ -1,13 +0,0 @@
-import java.lang.Runnable;
-import java.lang.String;
-import java.lang.System;
-import java.io.PrintStream;
-import java.lang.Thread;
-
-public class Bug382 {
-    public static main(a) {
-        var f = () -> System.out.println("Hallo Welt!");
-        new Thread(f).run();
-    }
-}
-

resources/bytecode/javFiles/Bug383.jav

@@ -1,10 +0,0 @@
-import java.lang.String;
-import java.lang.System;
-import java.io.PrintStream;
-
-public class Bug383 {
-    public static main(a) {
-        var f = () -> System.out.println("Hello from Thread!");
-        f.apply();
-    }
-}

resources/bytecode/javFiles/BugXXX.jav

@@ -0,0 +1,16 @@
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.lang.String;
+import java.util.stream.Stream;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.lang.Integer;
+
+class BugXXX {
+    public main() {
+        List<Integer> i = new ArrayList<>(List.of(1,2,3,4,5,6,7,8,9,10));
+        Optional<Integer> tmp = i.stream().filter(x -> x == 5).map(x -> x*2).findFirst();
+        return tmp;
+    }
+}

resources/bytecode/javFiles/Main.jav

@@ -1,14 +0,0 @@
-import java.lang.Object;
-import java.lang.System;
-import java.lang.Iterable;
-import java.io.PrintStream;
-import java.util.List;
-import java.lang.String;
-
-class Main {
-    static main(args) {
-        for (var arg : args) {
-            System.out.println(arg);
-        }
-    }
-}

resources/bytecode/javFiles/Matrix.jav

@@ -23,9 +23,7 @@ public class Matrix    extends Vector<Vector<Integer>> {
 
     public mul(m) {
         var ret = new Matrix();
-        var i = 0;
-        while(i < size()) {
-            var v1 = this.elementAt(i);
+        for(v1 : this) {
             var v2 = new Vector<Integer>();
             var j = 0;
             while(j < v1.size()) {
@@ -39,7 +37,6 @@ public class Matrix    extends Vector<Vector<Integer>> {
                 v2.addElement(erg);
                 j++; }
             ret.addElement(v2);
-            i++; 
          }
         return ret;
     }

resources/bytecode/javFiles/MatrixOP.jav

@@ -4,7 +4,7 @@ import java.lang.Integer;
 import java.lang.Boolean;
 
 public class MatrixOP    extends Vector<Vector<Integer>> {
-
+   
 	MatrixOP () {
     }
 
@@ -36,8 +36,8 @@ public class MatrixOP    extends Vector<Vector<Integer>> {
                 v2.addElement(erg);
                 j++; }
             ret.addElement(v2);
-            i++;
+            i++; 
          }
         return ret;
     };
-}
+}

resources/bytecode/javFiles/PatternMatchingLiteralStyle.jav

@@ -1,18 +1,17 @@
 import java.lang.Integer;
+import java.lang.Double;
+import java.lang.Number;
 import java.lang.String;
 
-public record R(String n) {}
+public record R(Number n) {}
 
 public class SwitchOverload {
 
-    f() { return 10; }
-    g() { return 20; }
+    public f(){}
 
     public m(r) {
         return switch(r) {
             case R("test") -> f();
-            case R("foo") -> g();
-            case R r -> 0;
         };
     }
 }

src/main/java/de/dhbwstuttgart/bytecode/FunNGenerator.java

@@ -39,10 +39,6 @@ public class FunNGenerator {
         public final List<TargetType> inParams;
         public final List<TargetType> realParams;
 
-        public GenericParameters(TargetFunNType funNType) {
-            this(funNType.funNParams(), funNType.returnArguments());
-        }
-
         public GenericParameters(List<TargetType> params, int numReturns) {
             this.realParams = params;
             this.inParams = flattenTypeParams(params);
@@ -75,7 +71,7 @@ public class FunNGenerator {
         if (type == null) return VOID;
         var res = "L" + type.getInternalName();
         if (type instanceof TargetSpecializedType a) {
-            if (!a.params().isEmpty() && !(a.params().size() == 1 && a.params().getFirst() == null)) {
+            if (a.params().size() > 0) {
                 res += "<";
                 for (var param : a.params()) {
                     if (param instanceof TargetGenericType gp) {
@@ -98,7 +94,7 @@ public class FunNGenerator {
     }
 
     private static String applySignature(TargetType a) { return a.toSignature(); }
-    private static String applyNameDescriptor(TargetType a){ return a instanceof TargetGenericType ? "LTPH;" : String.format("%s", a.toDescriptor()); }
+    private static String applyNameDescriptor(TargetType a){ return a instanceof TargetGenericType ? "LTPH;" : String.format("%s", applySignature(a)); }
 
     public static String encodeType(TargetType type) {
         if (type == null) return VOID;
@@ -115,17 +111,16 @@ public class FunNGenerator {
             superFunNMethodSignature.append(String.format("T%s;", argumentGenericBase + currentParameter));
             superFunNMethodDescriptor.append(objectSignature);
         }
+        superFunNClassSignature.append(String.format("%s:%s>%s", returnGeneric, objectSignature, objectSignature));
         if (numReturnTypes > 0) {
-            superFunNClassSignature.append(String.format("%s:%s>%s", returnGeneric, objectSignature, objectSignature));
             superFunNMethodSignature.append(String.format(")T%s;", returnGeneric));
             superFunNMethodDescriptor.append(String.format(")%s", objectSignature));
         } else {
-            superFunNClassSignature = new StringBuilder(objectSignature);
             superFunNMethodSignature.append(")V");
             superFunNMethodDescriptor.append(")V");
         }
 
-        Codegen.logger.info(superFunNMethodSignature);
+        System.out.println(superFunNMethodSignature);
 
         ClassWriter classWriter = new ClassWriter(0);
         MethodVisitor methodVisitor;

src/main/java/de/dhbwstuttgart/core/ConsoleInterface.java

@@ -1,83 +1,46 @@
 package de.dhbwstuttgart.core;
 
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.ParameterException;
-import de.dhbwstuttgart.server.SocketClient;
-import de.dhbwstuttgart.util.Logger;
-
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.util.*;
-
-class Args {
-    @Parameter(description = "Set destination directory", names = "-d")
-    File outputPath;
-    @Parameter(description = "Set class path", names = {"-cp", "-classpath"})
-    String classpath;
-    @Parameter(description = "[FILE]...")
-    List<File> input;
-    @Parameter(description = "Server mode", names = "--server-port")
-    Integer serverPort;
-    @Parameter(description = "Unify server url", names = "--unify-server")
-    String serverUrl;
-    @Parameter(description = "Write logs", names = "--write-logs")
-    boolean writeLogs = false;
-    @Parameter(names = "-v", description = "Verbosity level")
-    int verbosity = 0;
-    @Parameter(names = "--infer-together", description = "Runs the type inference on all input files together instead of sequentially")
-    boolean inferTogether = false;
-    @Parameter(names = "--help", help = true)
-    boolean help;
-}
-
 public class ConsoleInterface {
-    public static Logger.LogLevel logLevel = Logger.LogLevel.ERROR;
-    public static boolean writeLogFiles = false;
-    public static boolean inferTogether = false;
-    public static Optional<String> unifyServerUrl = Optional.empty();
+	private static final String directory = System.getProperty("user.dir");
 
-	public static void main(String[] argv) throws IOException, ClassNotFoundException {
-        var args = new Args();
-        var builder = JCommander.newBuilder().addObject(args).build();
-        builder.setProgramName("javatx");
-        try {
-            builder.parse(argv);
-            if (args.help) {
-                builder.usage();
-                return;
-            }
-        } catch (ParameterException e) {
-            System.err.println(e.getMessage());
-            System.err.println();
-            builder.usage();
+	public static void main(String[] args) throws IOException, ClassNotFoundException {
+		List<File> input = new ArrayList<>();
+		List<File> classpath = new ArrayList<>();
+        String outputPath = null;
+		Iterator<String> it = Arrays.asList(args).iterator();
+        if(args.length == 0){
+            System.out.println("No input files given. Get help with --help");
+            System.exit(1);
+        }else if(args.length == 1 && args[0].equals("--help")){
+            System.out.println("Usage: javatx [OPTION]... [FILE]...\n" +
+                    "\t-cp\tSet Classpath\n" +
+                    "\t-d\tSet destination directory");
             System.exit(1);
         }
-
-        inferTogether = args.inferTogether;
-        unifyServerUrl = Optional.ofNullable(args.serverUrl);
-        writeLogFiles = args.writeLogs;
-        switch (args.verbosity) {
-            case 1 -> logLevel = Logger.LogLevel.WARNING;
-            case 2 -> logLevel = Logger.LogLevel.INFO;
-            case 3 -> logLevel = Logger.LogLevel.DEBUG;
-            default -> logLevel = Logger.LogLevel.ERROR;
-        }
-
-
-        if (args.serverPort != null) {
-            if (unifyServerUrl.isPresent()) throw new RuntimeException("Cannot use unifyServer when in server mode!");
-            JavaTXServer server = new JavaTXServer(args.serverPort);
-            server.listen();
-        } else {
-            if (args.input == null) {
-                System.err.println("No input files given. Get help with --help");
-                System.exit(1);
+		while(it.hasNext()){
+            String arg = it.next();
+            if(arg.equals("-d")){
+                outputPath = it.next();
+            }else if(arg.startsWith("-d")) {
+                outputPath = arg.substring(2);
+            }else if(arg.equals("-cp") || arg.equals("-classpath")){
+                String[] cps = it.next().split(":");
+                for(String cp : cps){
+                    classpath.add(new File(cp));
+                }
+            }else{
+                input.add(new File(arg));
             }
-            List<File> classpath = args.classpath == null ? List.of() : Arrays.stream(args.classpath.split(File.pathSeparator)).map(File::new).toList();
-            JavaTXCompiler compiler = new JavaTXCompiler(args.input, classpath, args.outputPath);
-            compiler.generateBytecode();
-            SocketClient.closeIfOpen();
         }
+		JavaTXCompiler compiler = new JavaTXCompiler(input, classpath, outputPath != null ? new File(outputPath) : null);
+		//compiler.typeInference();
+		compiler.generateBytecode();
 	}
+
+
 }

src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -2,11 +2,9 @@
 package de.dhbwstuttgart.core;
 
 import de.dhbwstuttgart.bytecode.Codegen;
-import de.dhbwstuttgart.bytecode.FunNGenerator;
 import de.dhbwstuttgart.environment.CompilationEnvironment;
 import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.DebugException;
-import de.dhbwstuttgart.languageServerInterface.model.LanguageServerTransferObject;
 import de.dhbwstuttgart.parser.JavaTXParser;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
@@ -14,11 +12,6 @@ import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.SourceFileContext;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
-import de.dhbwstuttgart.server.SocketClient;
-import de.dhbwstuttgart.server.SocketFuture;
-import de.dhbwstuttgart.server.packet.SetAutoclosePacket;
-import de.dhbwstuttgart.server.packet.UnifyRequestPacket;
-import de.dhbwstuttgart.server.packet.UnifyResultPacket;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.Method;
@@ -42,13 +35,10 @@ import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import de.dhbwstuttgart.typeinference.typeAlgo.TYPE;
-import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
 import de.dhbwstuttgart.typeinference.unify.RuleSet;
 import de.dhbwstuttgart.typeinference.unify.TypeUnify;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import de.dhbwstuttgart.typeinference.unify.distributeVariance;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
 import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
@@ -59,11 +49,9 @@ import de.dhbwstuttgart.typeinference.unify.UnifyResultListenerImpl;
 import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
 import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
 
-import de.dhbwstuttgart.util.Logger;
 import java.io.*;
 import java.lang.reflect.Modifier;
 import java.nio.file.Path;
-import java.sql.Array;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Function;
@@ -73,33 +61,29 @@ import org.apache.commons.io.output.NullOutputStream;
 
 public class JavaTXCompiler {
 
-	// do not use this in any code, that can be executed serverside!
-	public static PlaceholderRegistry defaultClientPlaceholderRegistry = new PlaceholderRegistry();
-	public static Logger defaultLogger = new Logger();
-
 	// public static JavaTXCompiler INSTANCE;
 	final CompilationEnvironment environment;
 	Boolean resultmodel = true;
-	public final Map<File, SourceFile> sourceFiles = new HashMap<>();
-	public final List<File> input;
+    public final Map<File, SourceFile> sourceFiles = new HashMap<>();
 
-	public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
-	public final DirectoryClassLoader classLoader;
+    Boolean log = false; //gibt an ob ein Log-File nach System.getProperty("user.dir")+""/logFiles/"" geschrieben werden soll?
+    public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
+    public final DirectoryClassLoader classLoader;
 
 	public final List<File> classPath;
 	private final File outputPath;
 
-	public final Map<String, FunNGenerator.GenericParameters> usedFunN = new HashMap<>();
-	public final Set<Integer> usedFunNSuperTypes = new HashSet<>();
-
-	public Map<String, byte[]> auxiliaries = new HashMap<>();
-
 	public DirectoryClassLoader getClassLoader() {
 		return classLoader;
 	}
-
+   
 	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
-		this(Collections.singletonList(sourceFile), List.of(), new File("."));
+		this(Arrays.asList(sourceFile), List.of(), new File("."));
+	}
+
+	public JavaTXCompiler(File sourceFile, Boolean log) throws IOException, ClassNotFoundException {
+		this(sourceFile);
+		this.log = log;
 	}
 
 	public JavaTXCompiler(List<File> sourceFiles) throws IOException, ClassNotFoundException {
@@ -107,9 +91,6 @@ public class JavaTXCompiler {
 	}
 
 	public JavaTXCompiler(List<File> sources, List<File> contextPath, File outputPath) throws IOException, ClassNotFoundException {
-		// ensure new default placeholder registry for tests
-		defaultClientPlaceholderRegistry = new PlaceholderRegistry();
-
 		var path = new ArrayList<>(contextPath);
 		if (contextPath.isEmpty()) {
 			// When no contextPaths are given, the working directory is the sources root
@@ -120,7 +101,6 @@ public class JavaTXCompiler {
 		environment = new CompilationEnvironment(sources, classLoader);
 		classPath = path;
 		this.outputPath = outputPath;
-		this.input = sources.stream().map(File::getAbsoluteFile).toList();
 
 		for (File s : sources) {
 			parse(s);
@@ -147,7 +127,7 @@ public class JavaTXCompiler {
 		return null;
 	}
 
-	public Set<ClassOrInterface> getAvailableClasses(File sourceFile) throws ClassNotFoundException, IOException {
+	public ConstraintSet<Pair> getConstraints(File sourceFile) throws ClassNotFoundException, IOException {
 		Set<ClassOrInterface> allClasses = new HashSet<>();// environment.getAllAvailableClasses();
 		ClassOrInterface objectClass = ASTFactory.createClass(Object.class);
 		var recordClass = ASTFactory.createClass(Record.class);
@@ -186,13 +166,7 @@ public class JavaTXCompiler {
 
 		allClasses.addAll(sf.KlassenVektor);
 
-		return allClasses;
-	}
-
-	public ConstraintSet<Pair> getConstraints(File sourceFile) throws ClassNotFoundException, IOException {
-		var sf = sourceFiles.get(sourceFile);
-		var allClasses = getAvailableClasses(sourceFile);
-		TYPE ty = new TYPE(new HashSet<>(sf.availableClasses), allClasses);
+		TYPE ty = new TYPE(sf, allClasses);
 		var constraints = ty.getConstraints();
 		return constraints;
 	}
@@ -242,12 +216,12 @@ public class JavaTXCompiler {
 
 	private Set<ClassOrInterface> getAvailableClasses(JavaClassName name) throws ClassNotFoundException {
 		Set<ClassOrInterface> allClasses = new HashSet<>();
-		var cle = loadJavaTXClass(name);
-		if (cle == null) {
+		var clazz = loadJavaTXClass(name);
+		if (clazz == null) {
 			ClassOrInterface importedClass = ASTFactory.createClass(classLoader.loadClass(name.toString()));
 			allClasses.add(importedClass);
-		} else if (cle.cif != null) {
-			allClasses.add(cle.cif);
+		} else {
+			allClasses.add(clazz);
 		}
 		return allClasses;
 	}
@@ -326,193 +300,58 @@ public class JavaTXCompiler {
 		Set<Set<UnifyPair>> results = new HashSet<>();
 		UnifyResultModel urm = null;
 		// urm.addUnifyResultListener(resultListener);
-		logFile = logFile == null ? new FileWriter("log_" + sourceFiles.keySet().iterator().next().getName()) : logFile;
-		Logger logger = new Logger(logFile, "TypeInferenceAsync");
-		UnifyContext context = new UnifyContext(logger, true, urm, usedTasks, defaultClientPlaceholderRegistry);
+		try {
+			logFile = logFile == null ? new FileWriter(new File("log_" + sourceFiles.keySet().iterator().next().getName())) : logFile;
+			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, getClassLoader(), this);
+			System.out.println(finiteClosure);
+			urm = new UnifyResultModel(cons, finiteClosure);
+			urm.addUnifyResultListener(resultListener);
+			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons);
 
-		IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logger, getClassLoader(), this, context.placeholderRegistry());
-		logger.info(finiteClosure.toString());
-		urm = new UnifyResultModel(cons, finiteClosure);
-		urm.addUnifyResultListener(resultListener);
-		ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons, context.placeholderRegistry());
+			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
+				UnifyType lhs, rhs;
+				if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
+					((PlaceholderType) lhs).setInnerType(true);
+					((PlaceholderType) rhs).setInnerType(true);
+				}
+				return x;
 
-		Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
-			UnifyType lhs, rhs;
-			if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
-				((PlaceholderType) lhs).setInnerType(true);
-				((PlaceholderType) rhs).setInnerType(true);
+			};
+			logFile.write(unifyCons.toString());
+			unifyCons = unifyCons.map(distributeInnerVars);
+			logFile.write(unifyCons.toString());
+			TypeUnify unify = new TypeUnify();
+			// Set<Set<UnifyPair>> results = new HashSet<>(); Nach vorne gezogen
+			logFile.write("FC:\\" + finiteClosure.toString() + "\n");
+			for (SourceFile f : this.sourceFiles.values()) {
+				logFile.write(ASTTypePrinter.print(f));
 			}
-			return x;
+			logFile.flush();
+			Set<PlaceholderType> varianceTPHold;
+			Set<PlaceholderType> varianceTPH = new HashSet<>();
+			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
 
-		};
-		logger.debug(unifyCons.toString());
-		unifyCons = unifyCons.map(distributeInnerVars);
-		logger.debug(unifyCons.toString());
-		// Set<Set<UnifyPair>> results = new HashSet<>(); Nach vorne gezogen
-		logger.debug("FC:\\" + finiteClosure.toString() + "\n");
-		for (SourceFile f : this.sourceFiles.values()) {
-			logger.debug(ASTTypePrinter.print(f));
+			/*
+			 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH); varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) { if (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
+			 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) { ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType( )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0 && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType( )).getVariance()); } } return y; } ); } while (!varianceTPHold.equals(varianceTPH));
+			 */
+
+			// Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
+			// logFile, log);
+			// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()/*
+																								 * .stream().map(x -> { Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret; }).collect(Collectors. toCollection(ArrayList::new))
+																								 */;
+			unify.unifyAsync(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm, usedTasks);
+		} catch (IOException e) {
+			System.err.println("kein LogFile");
 		}
-		// logFile.flush();
-		Set<PlaceholderType> varianceTPHold;
-		Set<PlaceholderType> varianceTPH = new HashSet<>();
-		varianceTPH = varianceInheritanceConstraintSet(unifyCons);
-
-		/*
-		 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH); varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) { if (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
-		 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) { ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType( )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0 && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType( )).getVariance()); } } return y; } ); } while (!varianceTPHold.equals(varianceTPH));
-		 */
-
-		// Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
-		// logFile, log);
-		// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
-		List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()/*
-																							 * .stream().map(x -> { Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret; }).collect(Collectors. toCollection(ArrayList::new))
-																							 */;
-		TypeUnify.unifyAsync(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
-
 		return urm;
 	}
 
 	public List<ResultSet> typeInference(File file) throws ClassNotFoundException, IOException {
-		return typeInference(List.of(file));
-	}
-
-	public List<ResultSet> typeInference(List<File> files) throws ClassNotFoundException, IOException {
-		Set<ClassOrInterface> allClasses = new HashSet<>();
-
-		var ressf = new ArrayList<SourceFile>();
-		var definedClasses = new HashSet<ClassOrInterface>();
-		for (var file : files) {
-			var sf = sourceFiles.get(file);
-			definedClasses.addAll(sf.KlassenVektor);
-			ressf.add(sf);
-			allClasses.addAll(getAvailableClasses(file));
-			allClasses.addAll(sf.availableClasses);
-		}
-
-		TYPE ty = new TYPE(definedClasses, allClasses);
-		var cons = ty.getConstraints();
-
-		Set<Set<UnifyPair>> results = new HashSet<>();
-		PlaceholderRegistry placeholderRegistry = new PlaceholderRegistry();
-
-		var logFolder = new File(System.getProperty("user.dir") + "/logFiles/");
-		if (ConsoleInterface.writeLogFiles && !logFolder.mkdirs()) throw new RuntimeException("Could not create directory for log files: " + logFolder);
-		Writer logFile = ConsoleInterface.writeLogFiles ? new FileWriter(new File(logFolder, "log_" + sourceFiles.keySet().iterator().next().getName())) : new OutputStreamWriter(new NullOutputStream());
-		Logger logger = new Logger(logFile, "TypeInference");
-
-		FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses.stream().toList(), logger, classLoader, this, placeholderRegistry);
-		logger.info(finiteClosure.toString());
-		ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons, placeholderRegistry);
-		logger.info("xxx1");
-		Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
-			UnifyType lhs, rhs;
-			if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
-				((PlaceholderType) lhs).setInnerType(true);
-				((PlaceholderType) rhs).setInnerType(true);
-			}
-			return x;
-
-		};
-
-    logger.debug("Unify:" + unifyCons.toString());
-    logger.info("Unify:" + unifyCons.toString());
-    unifyCons = unifyCons.map(distributeInnerVars);
-    logger.debug("\nUnify_distributeInnerVars: " + unifyCons.toString());
-    // Set<Set<UnifyPair>> results = new HashSet<>(); Nach vorne gezogen
-    logger.debug("FC:\\" + finiteClosure.toString() + "\n");
-	for (var sf : ressf) logger.info(ASTTypePrinter.print(sf));
-    // logFile.flush();
-    List<UnifyPair> andConstraintsSorted = unifyCons.getUndConstraints().stream()
-        .sorted(Comparator.comparing(UnifyPair::getPairOp).thenComparing(UnifyPair::getLhsType, Comparator.comparing(UnifyType::getName)))
-        .collect(Collectors.toList());
-
-    logger.info(andConstraintsSorted);
-
-    Set<PlaceholderType> varianceTPHold;
-    Set<PlaceholderType> varianceTPH = new HashSet<>();
-    varianceTPH = varianceInheritanceConstraintSet(unifyCons);
-
-		/*
-		 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH); varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) { if (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
-		 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) { ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType( )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0 && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType( )).getVariance()); } } return y; } ); } while (!varianceTPHold.equals(varianceTPH));
-		 */
-
-    // Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
-    // logFile, log);
-    // Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
-    List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()// .stream().map(x -> {
-    /*
-     * Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret; }).collect(Collectors.toCollection(ArrayList::new))
-     */;
-    if (ConsoleInterface.unifyServerUrl.isPresent()) {
-        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
-        UnifyContext context = new UnifyContext(logger, true, urm, usedTasks, placeholderRegistry);
-        SocketFuture<UnifyResultPacket> future = SocketClient.execute(
-          UnifyRequestPacket.create(finiteClosure, cons, unifyCons, context.placeholderRegistry())
-        );
-        SocketClient.execute(SetAutoclosePacket.create());
-        return future.get().getResultSet(context);
-    }
-    else if (resultmodel) {
-        /* UnifyResultModel Anfang */
-        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
-        UnifyResultListenerImpl li = new UnifyResultListenerImpl();
-        urm.addUnifyResultListener(li);
-		UnifyContext context = new UnifyContext(logger, true, urm, usedTasks, placeholderRegistry);
-		TypeUnify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
-        var finalResults = li.getResults().stream().sorted().toList();
-        int i = 0;
-        logger.info("RESULT Final: ");
-        for (var result : finalResults){
-          logger.info("Result: " + i++);
-          logger.info(result.getSortedResults());
-        }
-        logger.info("RES_FINAL: " + li.getResults().toString() + "\n");
-        return li.getResults();
-    }
-    /* UnifyResultModel End */
-    else {
-        // Set<Set<UnifyPair>> result = unify.unify(unifyCons.getUndConstraints(),
-        // oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons,
-        // finiteClosure));
-        UnifyContext context = new UnifyContext(logger, false, new UnifyResultModel(cons, finiteClosure), usedTasks, placeholderRegistry);
-        Set<Set<UnifyPair>> result = TypeUnify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
-        logger.info("RESULT: " + result);
-        results.addAll(result);
-
-        results = results.stream().map(x -> {
-          Optional<Set<UnifyPair>> res = new RuleSet(placeholderRegistry).subst(x.stream().map(y -> {
-            if (y.getPairOp() == PairOperator.SMALLERDOTWC)
-              y.setPairOp(PairOperator.EQUALSDOT);
-            return y; // alle Paare a <.? b erden durch a =. b ersetzt
-          }).collect(Collectors.toCollection(HashSet::new)));
-          if (res.isPresent()) {// wenn subst ein Erg liefert wurde was veraendert
-            return new TypeUnifyTask(context).applyTypeUnificationRules(res.get(), finiteClosure);
-          } else
-            return x; // wenn nichts veraendert wurde wird x zurueckgegeben
-        }).collect(Collectors.toCollection(HashSet::new));
-        logger.info("RESULT Final: " + results);
-        logger.info("Constraints for Generated Generics: " + " ???");
-        logger.debug("RES_FINAL: " + results.toString() + "\n");
-        // logFile.flush();
-        logger.debug("PLACEHOLDERS: " + placeholderRegistry);
-        // logFile.flush();
-		}
-
-		return results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons), placeholderRegistry)))).collect(Collectors.toList());
-	}
-
-	/**
-	 * TEMPORARY - Only for Language Server Usage
-	 */
-	public LanguageServerTransferObject getResultSetAndAbstractSyntax(File file) throws IOException, ClassNotFoundException {
 		var sf = sourceFiles.get(file);
-		if(sf == null){
-			sf = sourceFiles.values().stream().findFirst().get();
-		}
-		Set<ClassOrInterface> allClasses = new HashSet<>();
+		Set<ClassOrInterface> allClasses = new HashSet<>();// environment.getAllAvailableClasses();
 		allClasses.addAll(getAvailableClasses(sf));
 		allClasses.addAll(sf.getClasses());
 		var newClasses = CompilationEnvironment.loadDefaultPackageClasses(sf.getPkgName(), file, this).stream().map(ASTFactory::createClass).collect(Collectors.toSet());
@@ -526,13 +365,14 @@ public class JavaTXCompiler {
 
 		final ConstraintSet<Pair> cons = getConstraints(file);
 		Set<Set<UnifyPair>> results = new HashSet<>();
-
-		Writer logFile = new OutputStreamWriter(new NullOutputStream());
-		Logger logger = new Logger(logFile, "TypeInferenceAsync");
-		UnifyContext context = new UnifyContext(logger, false, null, usedTasks, defaultClientPlaceholderRegistry);
 		try {
-			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses.stream().toList(), logger, classLoader, this, context.placeholderRegistry());
-			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons, context.placeholderRegistry());
+			var logFolder = new File(System.getProperty("user.dir") + "/logFiles/");
+			if (log) logFolder.mkdirs();
+			Writer logFile = log ? new FileWriter(new File(logFolder, "log_" + sourceFiles.keySet().iterator().next().getName())) : new OutputStreamWriter(new NullOutputStream());
+			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses.stream().toList(), logFile, classLoader, this);
+			System.out.println(finiteClosure);
+			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons);
+			System.out.println("xxx1");
 			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
 				UnifyType lhs, rhs;
 				if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
@@ -543,48 +383,80 @@ public class JavaTXCompiler {
 
 			};
 
-
+			logFile.write("Unify:" + unifyCons.toString());
+			System.out.println("Unify:" + unifyCons.toString());
 			unifyCons = unifyCons.map(distributeInnerVars);
+			logFile.write("\nUnify_distributeInnerVars: " + unifyCons.toString());
+			TypeUnify unify = new TypeUnify();
+			// Set<Set<UnifyPair>> results = new HashSet<>(); Nach vorne gezogen
+			logFile.write("FC:\\" + finiteClosure.toString() + "\n");
+			logFile.write(ASTTypePrinter.print(sf));
+			System.out.println(ASTTypePrinter.print(sf));
+			logFile.flush();
+			System.out.println("Unify nach Oder-Constraints-Anpassung:" + unifyCons.toString());
 			Set<PlaceholderType> varianceTPHold;
 			Set<PlaceholderType> varianceTPH = new HashSet<>();
 			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
 
-			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints();
+			/*
+			 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH); varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) { if (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
+			 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) { ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType( )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0 && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType( )).getVariance()); } } return y; } ); } while (!varianceTPHold.equals(varianceTPH));
+			 */
 
+			// Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
+			// logFile, log);
+			// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()// .stream().map(x -> {
+			/*
+			 * Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret; }).collect(Collectors.toCollection(ArrayList::new))
+			 */;
 			if (resultmodel) {
 				/* UnifyResultModel Anfang */
 				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
 				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
 				urm.addUnifyResultListener(li);
-				TypeUnify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
-				generateBytecode(sf, li.getResults());
-				return new LanguageServerTransferObject(li.getResults(), sf, ASTTypePrinter.print(sf), generatedGenerics);
+				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm, usedTasks);
+				System.out.println("RESULT Final: " + li.getResults());
+				System.out.println("Constraints for Generated Generics: " + " ???");
+				logFile.write("RES_FINAL: " + li.getResults().toString() + "\n");
+				logFile.flush();
+				return li.getResults();
 			}
 			/* UnifyResultModel End */
 			else {
-				Set<Set<UnifyPair>> result = TypeUnify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
+				// Set<Set<UnifyPair>> result = unify.unify(unifyCons.getUndConstraints(),
+				// oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons,
+				// finiteClosure));
+				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
+				System.out.println("RESULT: " + result);
+				logFile.write("RES: " + result.toString() + "\n");
+				logFile.flush();
 				results.addAll(result);
 
 				results = results.stream().map(x -> {
-					Optional<Set<UnifyPair>> res = new RuleSet(context.placeholderRegistry()).subst(x.stream().map(y -> {
+					Optional<Set<UnifyPair>> res = new RuleSet().subst(x.stream().map(y -> {
 						if (y.getPairOp() == PairOperator.SMALLERDOTWC)
 							y.setPairOp(PairOperator.EQUALSDOT);
 						return y; // alle Paare a <.? b erden durch a =. b ersetzt
 					}).collect(Collectors.toCollection(HashSet::new)));
 					if (res.isPresent()) {// wenn subst ein Erg liefert wurde was veraendert
-						return new TypeUnifyTask(context).applyTypeUnificationRules(res.get(), finiteClosure);
+						return new TypeUnifyTask().applyTypeUnificationRules(res.get(), finiteClosure);
 					} else
 						return x; // wenn nichts veraendert wurde wird x zurueckgegeben
 				}).collect(Collectors.toCollection(HashSet::new));
+				System.out.println("RESULT Final: " + results);
+				System.out.println("Constraints for Generated Generics: " + " ???");
+				logFile.write("RES_FINAL: " + results.toString() + "\n");
+				logFile.flush();
+				logFile.write("PLACEHOLDERS: " + PlaceholderType.EXISTING_PLACEHOLDERS);
+				logFile.flush();
 			}
-		} catch (ClassNotFoundException e) {
+		} catch (IOException e) {
+			System.err.println("kein LogFile");
 		}
-		generateBytecode(sf, results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons), context.placeholderRegistry())))).collect(Collectors.toList()));
-		return new LanguageServerTransferObject(results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons), context.placeholderRegistry())))).collect(Collectors.toList()), sf, ASTTypePrinter.print(sf), generatedGenerics);
+		return results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons))))).collect(Collectors.toList());
 	}
 
-
-
 	/**
 	 * Vererbt alle Variancen bei Paaren (a <. theta) oder (Theta <. a) wenn a eine Variance !=0 hat auf alle Typvariablen in Theta.
 	 * 
@@ -665,12 +537,10 @@ public class JavaTXCompiler {
 	 * if it doesn't exist it's going to compile it and add it to the source files list
 	 * @param name
 	 */
-	public ClassEntry loadJavaTXClass(JavaClassName name) {
+	public ClassOrInterface loadJavaTXClass(JavaClassName name) {
 		var file = findFileForClass(name);
-		var classEntry = new ClassEntry(new File(outputPath, name.getClassName() + ".class"), null);
-		if (input.contains(file)) return classEntry;
 		if (file != null) {
-			if (loadedClasses.containsKey(name)) return loadedClasses.get(name);
+			if (loadedClasses.containsKey(name)) return loadedClasses.get(name).cif();
 			try {
 				var tree = JavaTXParser.parse(file);
 				classRegistry.addName(name.toString(), 0); // TODO This gets overwritten later, is it bad if we don't know this right away?
@@ -687,9 +557,8 @@ public class JavaTXCompiler {
 				writeClassFile(classFiles, outputPath != null ? outputPath : new File("."), false);
 				var clazz = classLoader.loadClass(name.toString());
 				var classOrInterface = ASTFactory.createClass(clazz);
-				classEntry = new ClassEntry(new File(outputPath, clazz.getName() + ".class"), classOrInterface);
-				loadedClasses.put(name, classEntry);
-				return classEntry;
+				loadedClasses.put(name, new ClassEntry(new File(outputPath, clazz.getName() + ".class"), classOrInterface));
+				return classOrInterface;
 			} catch (Exception e) {
 				throw new RuntimeException(e);
 			}
@@ -708,27 +577,19 @@ public class JavaTXCompiler {
 	}
 
 	public void generateBytecode() throws ClassNotFoundException, IOException {
-		if (ConsoleInterface.inferTogether) {
-			var files = sourceFiles.keySet().stream().toList();
-			var typeinferenceResult = this.typeInference(files);
-			for (var file : files) {
-				var sf = sourceFiles.get(file);
-				if (sf.isGenerated()) continue;
-				var classes = generateBytecode(sf, typeinferenceResult);
-				sf.setGenerated();
-				writeClassFile(classes, outputPath == null ? file.getParentFile() : outputPath, outputPath == null);
-			}
-		} else {
-			for (var file : sourceFiles.keySet()) {
-				var sf = sourceFiles.get(file);
-				if (sf.isGenerated()) continue;
-				var classes = generateBytecode(file);
-				sf.setGenerated();
-				writeClassFile(classes, outputPath == null ? file.getParentFile() : outputPath, outputPath == null);
-			}
+		for (var file : sourceFiles.keySet()) {
+			var sf = sourceFiles.get(file);
+			if (sf.isGenerated()) continue;
+			var classes = generateBytecode(file);
+			sf.setGenerated();
+			writeClassFile(classes, outputPath == null ? file.getParentFile() : outputPath, outputPath == null);
 		}
 	}
 
+	/**
+	 * @param path - output-Directory can be null, then class file output is in the same directory as the parsed source files
+	 * @return
+	 */
 	public Map<JavaClassName, byte[]> generateBytecode(File sourceFile) throws ClassNotFoundException, IOException {
 		var sf = sourceFiles.get(sourceFile);
 		if (sf.isGenerated()) return null;
@@ -770,12 +631,12 @@ public class JavaTXCompiler {
 			var codegen = new Codegen(converter.convert(clazz), this, converter);
 			var code = codegen.generate();
 			generatedClasses.put(clazz.getClassName(), code);
+			converter.auxiliaries.forEach((name, source) -> {
+				generatedClasses.put(new JavaClassName(name), source);
+			});
 		}
 		generatedGenerics.put(sf, converter.javaGenerics());
 		converter.generateFunNTypes();
-		auxiliaries.forEach((name, source) -> {
-			generatedClasses.put(new JavaClassName(name), source);
-		});
 		return generatedClasses;
 	}
 
@@ -783,15 +644,15 @@ public class JavaTXCompiler {
 		FileOutputStream output;
 		for (JavaClassName name : classFiles.keySet()) {
 			byte[] bytecode = classFiles.get(name);
-			defaultLogger.info("generating " + name + ".class file ...");
+			System.out.println("generating " + name + ".class file ...");
 			var subPath = preserveHierarchy ? path : Path.of(path.toString(), name.getPackageName().split("\\.")).toFile();
 			File outputFile = new File(subPath, name.getClassName() + ".class");
 			outputFile.getAbsoluteFile().getParentFile().mkdirs();
-			defaultLogger.info(outputFile.toString());
+			System.out.println(outputFile);
 			output = new FileOutputStream(outputFile);
 			output.write(bytecode);
 			output.close();
-			defaultLogger.success(name + ".class file generated");
+			System.out.println(name + ".class file generated");
 		}
 	}
 

src/main/java/de/dhbwstuttgart/core/JavaTXServer.java

@@ -1,31 +0,0 @@
-package de.dhbwstuttgart.core;
-
-import de.dhbwstuttgart.server.SocketServer;
-
-public class JavaTXServer {
-
-  public static boolean isRunning = false;
-
-  final SocketServer socketServer;
-
-  public JavaTXServer(int port) {
-    this.socketServer = new SocketServer(port);
-  }
-
-  public void listen() {
-    isRunning = true;
-    socketServer.start();
-  }
-
-  public void forceStop() {
-    try {
-      socketServer.stop();
-    }
-    catch (InterruptedException exception) {
-      System.err.println("Interrupted socketServer: " + exception);
-    }
-    isRunning = false;
-  }
-
-
-}

src/main/java/de/dhbwstuttgart/environment/ByteArrayClassLoader.java

@@ -0,0 +1,13 @@
+package de.dhbwstuttgart.environment;
+
+public class ByteArrayClassLoader extends ClassLoader implements IByteArrayClassLoader {
+    @Override
+    public Class _defineClass(String name, byte[] code, int i, int length) throws ClassFormatError {
+        return defineClass(name, code, i, length);
+    }
+
+    @Override
+    public Class<?> findClass(String name) throws ClassNotFoundException {
+        return super.findClass(name);
+    }
+}

src/main/java/de/dhbwstuttgart/environment/CompilationEnvironment.java

@@ -30,7 +30,7 @@ public class CompilationEnvironment {
 	public final PackageCrawler packageCrawler;
 
 	/**
-	 * Imitiert die Environment beim Aufruf des JavaCompilers auf einer Menge von java-Dateien Die Environment enthält automatisch die Java Standard Library
+	 * Imitiert die Environment beim Aufruf des JavaCompilers auf einer Menge von java-Dateien Die Environment enth<EFBFBD>lt automatisch die Java Standard Library
 	 * 
 	 * @param sourceFiles die zu kompilierenden Dateien
 	 */
@@ -86,10 +86,6 @@ public class CompilationEnvironment {
 		File[] files = dir.listFiles((dir1, name) -> name.endsWith(".class"));
 		if (files != null)
 			for (File classFile : files) {
-				var javFile = new File(classFile.getParentFile(), classFile.getName().substring(0, classFile.getName().lastIndexOf('.')) + ".jav").getAbsoluteFile();
-				// Ignore class file if the corresponding jav file already exists in the input
-				// FIXME this can't work because we don't know the corresponding file that created a class
-				if (compiler.input.contains(javFile)) continue;
 				String className = classFile.getName().substring(0, classFile.getName().length() - 6);
 				if (className.matches("Fun\\d+\\$\\$.*"))
 					continue;

src/main/java/de/dhbwstuttgart/environment/IByteArrayClassLoader.java

@@ -6,22 +6,18 @@ import java.nio.file.Path;
 
 public interface IByteArrayClassLoader {
 
-    Class<?> loadClass(String path) throws ClassNotFoundException;
+    Class loadClass(String path) throws ClassNotFoundException;
 
-    default Class<?> loadClass(byte[] code) {
-        return this.loadClass(null, code);
+    default Class loadClass(byte[] code) {
+        return this._defineClass(null, code, 0, code.length);
     }
 
-    default Class<?> loadClass(String name, byte[] code) {
-        return this._defineClass(name, code, 0, code.length);
-    }
-
-    default Class<?> loadClass(Path path) throws IOException {
+    default Class loadClass(Path path) throws IOException {
         var code = Files.readAllBytes(path);
         return this._defineClass(null, code, 0, code.length);
     }
 
     public Class<?> findClass(String name) throws ClassNotFoundException;
 
-    Class<?> _defineClass(String name, byte[] code, int i, int length) throws ClassFormatError;
+    Class _defineClass(String name, byte[] code, int i, int length) throws ClassFormatError;
 }

src/main/java/de/dhbwstuttgart/exceptions/UnifyCancelException.java

@@ -1,11 +0,0 @@
-package de.dhbwstuttgart.exceptions;
-
-
-/**
- * Eine Runtime Exception, die für den Fall genutzt wird, dass eine Unifikation abgebrochen wird.
- * Durch das Werfen einer Exception können Abbrüche auch aus Methodenaufrufen heraus
- * geprüft werden, da zuvor nur ein return X; stattfinden würde.
- */
-public class UnifyCancelException extends RuntimeException {
-
-}

src/main/java/de/dhbwstuttgart/languageServerInterface/LanguageServerInterface.java

@@ -1,120 +0,0 @@
-package de.dhbwstuttgart.languageServerInterface;
-
-
-import de.dhbwstuttgart.bytecode.Codegen;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.environment.IByteArrayClassLoader;
-import de.dhbwstuttgart.languageServerInterface.model.LanguageServerTransferObject;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
-import de.dhbwstuttgart.target.generate.ASTToTargetAST;
-import de.dhbwstuttgart.target.generate.GenericsResult;
-import de.dhbwstuttgart.target.tree.TargetStructure;
-import org.apache.commons.io.FileUtils;
-
-import java.io.*;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * Implementation of an Interface for the Language-Server to get the Resultset and abstract Syntax.
- */
-public class LanguageServerInterface {
-
-
-    public LanguageServerTransferObject getResultSetAndAbastractSyntax(String path, String resetNamesTo) throws IOException, URISyntaxException, ClassNotFoundException {
-        NameGenerator.resetTo(resetNamesTo);
-        return getResultSetAndAbstractSyntax(path);
-
-    }
-
-    public SourceFile getAst(String path, String resetNamesTo) throws IOException, URISyntaxException, ClassNotFoundException {
-        NameGenerator.resetTo(resetNamesTo);
-        return getAST(path);
-    }
-
-
-    /**
-     * returns the ResultSets, GenericResultSet and the AST
-     * You have to give the input as well as the path because of potential locks when the File is currently opened in an IDE.
-     * Example: file:///c:/test/main.jav -> file:///c:/test/out/main.class
-     *
-     * @param pathAsString the URI of the File. See Example.
-     */
-    public LanguageServerTransferObject getResultSetAndAbstractSyntax(String pathAsString){
-        System.setOut(new PrintStream(OutputStream.nullOutputStream()));
-        try {
-            var uri = new URI(pathAsString);
-            var path = Path.of(uri);
-            var file = path.toFile();
-            Files.createDirectories(path.getParent().resolve("out"));
-            var compiler = new JavaTXCompiler(List.of(file), List.of(path.getParent().toFile()), path.getParent().resolve("out").toFile());
-
-            var parsedSource = compiler.sourceFiles.get(file);
-            var tiResults = compiler.typeInference(file);
-
-            Map<JavaClassName, byte[]> bytecode = compiler.generateBytecode(parsedSource, tiResults);
-            Files.createDirectories(path.getParent().resolve("out"));
-            compiler.writeClassFile(bytecode, path.getParent().resolve("out").toFile(), false);
-
-            return new LanguageServerTransferObject(tiResults, parsedSource, "", compiler.getGeneratedGenerics());
-        } catch (Exception e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-    }
-
-    /**
-     * returns the AST without calculating the result
-     * You have to give the input as well as the path because of potential locks when the File is currently opened in an IDE.
-     * Example: file:///c:/test/main.jav -> file:///c:/test/out/main.class
-     *
-     * @param path the URI of the File. See Example.
-     * @throws IOException
-     * @throws ClassNotFoundException
-     * @throws URISyntaxException
-     */
-    public SourceFile getAST(String path) throws IOException, ClassNotFoundException, URISyntaxException {
-
-
-        System.setOut(new PrintStream(OutputStream.nullOutputStream()));
-
-
-        URI uri = new URI(path);
-        ArrayList<String> pathWithoutName = new ArrayList<>(List.of(uri.getPath().split("/")));
-        pathWithoutName.remove(List.of(uri.getPath().split("/")).size() - 1);
-        String stringPathWithoutName = "";
-
-        for (String i : pathWithoutName) {
-            stringPathWithoutName += "/" + i;
-        }
-
-        try {
-            FileUtils.cleanDirectory(new File(stringPathWithoutName + "/out"));
-        } catch (Exception e) {
-
-        }
-        try {
-            (new File(stringPathWithoutName + "/out")).mkdirs();
-        } catch (Exception e) {
-
-        }
-        var test = getAST(uri.getPath().split("/")[uri.getPath().split("/").length - 1], new File(stringPathWithoutName).getPath());
-        System.setOut(System.out);
-        return test;
-    }
-
-    public static SourceFile getAST(String filename, String filePath) throws IOException, ClassNotFoundException {
-        var file = Path.of(filePath, filename).toFile();
-        var compiler = new JavaTXCompiler(List.of(file), List.of(file.getParentFile()), Path.of(filePath + "/out").toFile());
-        return compiler.sourceFiles.get(file);
-    }
-}

src/main/java/de/dhbwstuttgart/languageServerInterface/ParserInterface.java

@@ -1,40 +0,0 @@
-package de.dhbwstuttgart.languageServerInterface;
-
-
-
-import de.dhbwstuttgart.languageServerInterface.model.CustomParserErrorHandler;
-import de.dhbwstuttgart.languageServerInterface.model.ParserError;
-import de.dhbwstuttgart.parser.antlr.Java17Lexer;
-import de.dhbwstuttgart.parser.antlr.Java17Parser;
-import de.dhbwstuttgart.parser.antlr.Java17ParserBaseListener;
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
-
-import java.util.List;
-
-public class ParserInterface {
-
-    public List<ParserError> getParseErrors(String input){
-
-        CustomParserErrorHandler errorListener = new CustomParserErrorHandler();
-        CharStream charStream = CharStreams.fromString(input);
-
-        Java17Lexer lexer = new Java17Lexer(charStream);
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-
-        Java17Parser parser = new Java17Parser(tokens);
-        parser.removeErrorListeners();
-        parser.addErrorListener(errorListener);
-
-
-        ParseTree tree = parser.sourceFile();
-        ParseTreeWalker walker = new ParseTreeWalker();
-        Java17ParserBaseListener listener = new Java17ParserBaseListener();
-        walker.walk(listener, tree);
-
-        return errorListener.getErrorMessages();
-    }
-}

src/main/java/de/dhbwstuttgart/languageServerInterface/model/CustomParserErrorHandler.java

@@ -1,47 +0,0 @@
-package de.dhbwstuttgart.languageServerInterface.model;
-
-
-
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.ATNConfigSet;
-import org.antlr.v4.runtime.dfa.DFA;
-
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.List;
-
-public class CustomParserErrorHandler implements ANTLRErrorListener {
-    private final List<ParserError> errorMessages = new ArrayList<>();
-
-    @Override
-    public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line, int charPositionInLine, String msg, RecognitionException e) {
-        int endCharPosition = charPositionInLine;
-        if (offendingSymbol instanceof Token) {
-            Token offendingToken = (Token) offendingSymbol;
-            endCharPosition = charPositionInLine + offendingToken.getText().length();
-        }
-
-        ParserError parserError = new ParserError(line, charPositionInLine, endCharPosition, msg);
-        errorMessages.add(parserError);
-
-    }
-
-    @Override
-    public void reportAmbiguity(Parser parser, DFA dfa, int i, int i1, boolean b, BitSet bitSet, ATNConfigSet atnConfigSet) {
-
-    }
-
-    @Override
-    public void reportAttemptingFullContext(Parser parser, DFA dfa, int i, int i1, BitSet bitSet, ATNConfigSet atnConfigSet) {
-
-    }
-
-    @Override
-    public void reportContextSensitivity(Parser parser, DFA dfa, int i, int i1, int i2, ATNConfigSet atnConfigSet) {
-
-    }
-
-    public List<ParserError> getErrorMessages() {
-        return errorMessages;
-    }
-}

src/main/java/de/dhbwstuttgart/languageServerInterface/model/LanguageServerTransferObject.java

@@ -1,31 +0,0 @@
-package de.dhbwstuttgart.languageServerInterface.model;
-
-
-
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.target.generate.GenericsResult;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class LanguageServerTransferObject {
-    List<ResultSet> resultSets;
-    SourceFile Ast;
-    String printedAst;
-    Map<SourceFile, List<GenericsResult>> generatedGenerics = new HashMap<>();
-
-
-    public LanguageServerTransferObject(List<ResultSet> resultSets, SourceFile Ast, String printedAst, Map<SourceFile, List<GenericsResult>> generatedGenerics) {
-        this.resultSets = resultSets;
-        this.Ast = Ast;
-        this.printedAst = printedAst;
-        this.generatedGenerics = generatedGenerics;
-    }
-
-    public List<ResultSet> getResultSets() {return resultSets;}
-    public SourceFile getAst() {return Ast;}
-    public String getPrintedAst() {return printedAst;}
-    public Map<SourceFile, List<GenericsResult>> getGeneratedGenerics() {return generatedGenerics;}
-}

src/main/java/de/dhbwstuttgart/languageServerInterface/model/ParserError.java

@@ -1,48 +0,0 @@
-package de.dhbwstuttgart.languageServerInterface.model;
-
-public class ParserError {
-
-    private int line;
-    private int charPositionInLine;
-    private int endCharPosition;
-    String msg;
-
-    public ParserError(int line, int charPositionInLine, int endCharPosition, String msg) {
-        this.line = line;
-        this.charPositionInLine = charPositionInLine;
-        this. endCharPosition = endCharPosition;
-        this.msg = msg;
-    }
-
-    public int getEndCharPosition() {
-        return endCharPosition;
-    }
-
-    public void setEndCharPosition(int endCharPosition) {
-        this.endCharPosition = endCharPosition;
-    }
-
-    public void setCharPositionInLine(int charPositionInLine) {
-        this.charPositionInLine = charPositionInLine;
-    }
-
-    public void setLine(int line) {
-        this.line = line;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public int getCharPositionInLine() {
-        return charPositionInLine;
-    }
-
-    public int getLine() {
-        return line;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-}

src/main/java/de/dhbwstuttgart/languageServerInterface/model/ResultSetListener.java

@@ -1,20 +0,0 @@
-package de.dhbwstuttgart.languageServerInterface.model;
-
-
-import com.google.common.reflect.TypeResolver;
-import de.dhbwstuttgart.typeinference.unify.UnifyResultEvent;
-import de.dhbwstuttgart.typeinference.unify.UnifyResultListener;
-
-public class ResultSetListener implements UnifyResultListener {
-
-    TypeResolver typeResolver;
-
-    public ResultSetListener(TypeResolver typeResolver){
-        this.typeResolver = typeResolver;
-    }
-
-    @Override
-    public void onNewTypeResultFound(UnifyResultEvent evt) {
-
-    }
-}

src/main/java/de/dhbwstuttgart/parser/JavaTXParser.java

@@ -7,7 +7,6 @@ import de.dhbwstuttgart.parser.antlr.Java17Parser;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
 
-import de.dhbwstuttgart.util.Logger;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
@@ -18,9 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class JavaTXParser {
-
-    public static Logger logger = new Logger("Parser");
-
     public static Java17Parser.SourceFileContext parse(File source) throws IOException, java.lang.ClassNotFoundException {
         InputStream stream = new FileInputStream(source);
         // DEPRECATED: ANTLRInputStream input = new ANTLRInputStream(stream);

src/main/java/de/dhbwstuttgart/parser/SourceLoc.java

@@ -1,25 +1,4 @@
 package de.dhbwstuttgart.parser;
 
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-
-public record SourceLoc(String file, int line) implements ISerializableData {
-
-
-  @Override
-  public SerialMap toSerial(KeyStorage keyStorage) {
-    var serialized = new SerialMap();
-    serialized.put("file", file);
-    serialized.put("line", line);
-    return serialized;
-  }
-
-  public static SourceLoc fromSerial(SerialMap data) {
-    return new SourceLoc(
-      data.getValue("file").getOf(String.class),
-      data.getValue("line").getOf(Integer.class)
-    );
-  }
-
+public record SourceLoc(String file, int line) {
 }

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java

@@ -12,7 +12,6 @@ import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
 import de.dhbwstuttgart.typeinference.unify.model.*;
 
 import java.util.*;
@@ -27,21 +26,16 @@ public class FCGenerator {
      *
      * @param availableClasses - Alle geparsten Klassen
      */
-    public static Set<UnifyPair> toUnifyFC(JavaTXCompiler compiler, Collection<ClassOrInterface> availableClasses, ClassLoader classLoader, PlaceholderRegistry placeholderRegistry) throws ClassNotFoundException {
-        return toFC(
-          availableClasses,
-          classLoader,
-          placeholderRegistry
-        ).stream().map(t -> UnifyTypeFactory.convert(compiler, t, placeholderRegistry))
-          .collect(Collectors.toSet());
+    public static Set<UnifyPair> toUnifyFC(JavaTXCompiler compiler, Collection<ClassOrInterface> availableClasses, ClassLoader classLoader) throws ClassNotFoundException {
+        return toFC(availableClasses, classLoader).stream().map(t -> UnifyTypeFactory.convert(compiler, t)).collect(Collectors.toSet());
     }
 
-    public static Set<Pair> toFC(Collection<ClassOrInterface> availableClasses, ClassLoader classLoader, PlaceholderRegistry placeholderRegistry) throws ClassNotFoundException {
+    public static Set<Pair> toFC(Collection<ClassOrInterface> availableClasses, ClassLoader classLoader) throws ClassNotFoundException {
         HashSet<Pair> pairs = new HashSet<>();
         //PL 2018-09-18: gtvs vor die for-Schleife gezogen, damit immer die gleichen Typeplaceholder eingesetzt werden.
         HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs = new HashMap<>();
         for(ClassOrInterface cly : availableClasses){
-        	List<Pair> newPairs = getSuperTypes(cly, availableClasses, gtvs, classLoader, placeholderRegistry);
+        	List<Pair> newPairs = getSuperTypes(cly, availableClasses, gtvs, classLoader);
             pairs.addAll(newPairs);
             
             //For all Functional Interfaces FI: FunN$$<... args auf dem Functional Interface ...> <. FI is added to FC 
@@ -81,13 +75,8 @@ public class FCGenerator {
      * @param forType
      * @return
      */
-    private static List<Pair> getSuperTypes(
-      ClassOrInterface forType,
-      Collection<ClassOrInterface> availableClasses,
-      ClassLoader classLoader,
-      PlaceholderRegistry placeholderRegistry
-    ) throws ClassNotFoundException {
-        return getSuperTypes(forType, availableClasses, new HashMap<>(), classLoader, placeholderRegistry);
+    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses, ClassLoader classLoader) throws ClassNotFoundException {
+        return getSuperTypes(forType, availableClasses, new HashMap<>(), classLoader);
     }
 
     /**
@@ -98,13 +87,8 @@ public class FCGenerator {
      * @return
      * @throws ClassNotFoundException
      */
-    private static List<Pair> getSuperTypes(
-      ClassOrInterface forType,
-      Collection<ClassOrInterface> availableClasses,
-      HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs,
-      ClassLoader classLoader,
-      PlaceholderRegistry placeholderRegistry
-    ) throws ClassNotFoundException {
+    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses,
+                                            HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs, ClassLoader classLoader) throws ClassNotFoundException {
         List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
         //Die GTVs, die in forType hinzukommen:
         HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> newGTVs = new HashMap<>();
@@ -163,7 +147,7 @@ public class FCGenerator {
             if(superClass.getClassName().equals(ASTFactory.createObjectClass().getClassName())){
                 superTypes = Arrays.asList(new Pair(ASTFactory.createObjectType(), ASTFactory.createObjectType(), PairOperator.SMALLER));
             }else{
-                superTypes = getSuperTypes(superClass, availableClasses, newGTVs, classLoader, placeholderRegistry);
+                superTypes = getSuperTypes(superClass, availableClasses, newGTVs, classLoader);
             }
 
             retList.add(ret);

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
-import de.dhbwstuttgart.parser.JavaTXParser;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -151,7 +150,7 @@ public class StatementGenerator {
                 } else {
                 	type = methodparameters?
                 			TypePlaceholder.fresh(fp.getStart(), 1, false) 
-                			: TypePlaceholder.fresh(fp.getStart(), 1, false);
+                			: TypePlaceholder.fresh(fp.getStart());
                 }
                 ret.add(new FormalParameter(paramName, type, fp.getStart()));
                 localVars.put(paramName, type); 
@@ -260,7 +259,7 @@ public class StatementGenerator {
             ret.setStatement();
             return ret;
         default:
-            JavaTXParser.logger.info(stmt.getClass());
+            System.out.println(stmt.getClass());
             throw new NotImplementedException();
         }
     }
@@ -1066,7 +1065,7 @@ public class StatementGenerator {
             List<Pattern> parameterList = new ArrayList<>();
             for (IdentifierContext identifier : lambdaParams.identifier()) {
                 Token offset = identifier.getStart();
-                parameterList.add(new FormalParameter(identifier.getText(), TypePlaceholder.fresh(offset, 1, false), offset));
+                parameterList.add(new FormalParameter(identifier.getText(), TypePlaceholder.fresh(offset), offset));
             }
             params = new ParameterList(parameterList, lambdaParams.getStart());
         } else if (lambdaParams.formalParameterList() != null) {
@@ -1076,7 +1075,7 @@ public class StatementGenerator {
             List<Pattern> parameterList = new ArrayList<>();
             for (LambdaLVTIParameterContext param : lambdaParams.lambdaLVTIList().lambdaLVTIParameter()) {
                 Token offset = param.getStart();
-                parameterList.add(new FormalParameter(param.identifier().getText(), TypePlaceholder.fresh(offset, 1, false), offset));
+                parameterList.add(new FormalParameter(param.identifier().getText(), TypePlaceholder.fresh(offset), offset));
             }
             params = new ParameterList(parameterList, lambdaParams.getStart());
         } else {
@@ -1100,9 +1099,9 @@ public class StatementGenerator {
             block = lambdaGenerator.convert(expression.lambdaBody().block(), true);
         }
         List<RefTypeOrTPHOrWildcardOrGeneric> funNParams = new ArrayList<>();
-        funNParams.add(TypePlaceholder.fresh(expression.getStart(), -1, false));// ret-Type
+        funNParams.add(TypePlaceholder.fresh(expression.getStart()));// ret-Type
         params.getFormalparalist().forEach(formalParameter -> // Für jeden Parameter einen TPH anfügen:
-        	funNParams.add(TypePlaceholder.fresh(expression.getStart(), 1, false)));
+        funNParams.add(TypePlaceholder.fresh(expression.getStart())));
         RefTypeOrTPHOrWildcardOrGeneric lambdaType = TypePlaceholder.fresh(expression.getStart());
         // RefType lambdaType = new
         // RefType(reg.getName("Fun"+params.getFormalparalist().size()),

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java

@@ -111,7 +111,7 @@ public class SyntaxTreeGenerator {
     this.allmodifiers.put(Modifier.toString(Modifier.INTERFACE), Modifier.INTERFACE);
     this.allmodifiers.put("sealed", 4096);
     this.allmodifiers.put("non-sealed", 8192);
-    this.allmodifiers.put("default", 0); // Doesn't exist
+    this.allmodifiers.put("default", 16384);
     this.allmodifiers.put("strictfp", 32768);
 
     this.compiler = compiler;

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java

@@ -74,7 +74,7 @@ public class TypeGenerator {
                 throw new NotImplementedException();
             }
         } else if (!typeContext.LBRACK().isEmpty()) { // ArrayType über eckige Klammer prüfen
-            // JavaTXParser.logger.info(unannTypeContext.getText());
+            // System.out.println(unannTypeContext.getText());
             throw new NotImplementedException();
         }
         /*
@@ -168,7 +168,7 @@ public class TypeGenerator {
             if (generics.contains(name)) {
                 return new GenericRefType(name, offset);
             } else {
-                Pattern p = Pattern.compile("Fun(Void|VoidImpl|Wrapper)?(\\d+)[$][$]"); // TODO Regex shenanigans
+                Pattern p = Pattern.compile("Fun(\\d+)[$][$]");
                 Matcher m = p.matcher(name);
                 if (m.matches()) {// es ist FunN$$-Type
                     return new RefType(new JavaClassName(name), convert(typeArguments, reg, generics), offset);

src/main/java/de/dhbwstuttgart/parser/scope/JavaClassName.java

@@ -41,7 +41,7 @@ public class JavaClassName {
 	}
 
 	/**
-	 * Gibt von einem Klassennamen nur den Namen der Klasse zurück
+	 * Gibt von einem Klassennamen nur den Namen der Klasse zur<EFBFBD>ck
 	 * Beispiel:
 	 * java.lang.Object wird zu: Object
 	 */

src/main/java/de/dhbwstuttgart/parser/scope/JavaClassRegistry.java

@@ -5,9 +5,9 @@ import de.dhbwstuttgart.exceptions.NotImplementedException;
 import java.util.*;
 
 /**
- * Speichert die Klassen für einen bestimmten Projektscope
+ * Speichert die Klassen f<EFBFBD>r einen bestimmten Projektscope
  */
-public class JavaClassRegistry{
+public class JavaClassRegistry {
     final Map<JavaClassName, Integer> existingClasses = new HashMap<>();
 
     public JavaClassRegistry(Map<String, Integer> initialNames) {
@@ -22,10 +22,6 @@ public class JavaClassRegistry{
         }
     }
 
-    public Set<JavaClassName> getAllClassNames(){
-        return existingClasses.keySet();
-    }
-
     public void addName(String className, int numberOfGenerics) {
         existingClasses.put(new JavaClassName(className), numberOfGenerics);
     }
@@ -64,6 +60,6 @@ public class JavaClassRegistry{
     }
 
     public int getNumberOfGenerics(String name) {
-        return existingClasses.getOrDefault(new JavaClassName(name), 0);
+        return existingClasses.get(new JavaClassName(name));
     }
 }

src/main/java/de/dhbwstuttgart/server/ServerTaskLogger.java

@@ -1,41 +0,0 @@
-package de.dhbwstuttgart.server;
-
-import de.dhbwstuttgart.util.Logger;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import org.java_websocket.WebSocket;
-
-public class ServerTaskLogger extends Logger {
-
-  private final WebSocket webSocket;
-  private final SocketServer socketServer;
-  private final LogLevel customLogLevel;
-
-  public ServerTaskLogger(WebSocket webSocket, SocketServer socketServer, LogLevel customLogLevel) {
-    this.webSocket = webSocket;
-    this.socketServer = socketServer;
-    this.customLogLevel = customLogLevel;
-  }
-
-  @Override
-  public boolean isLogLevelActive(LogLevel logLevel) {
-    return logLevel.isHigherOrEqualTo(customLogLevel);
-  }
-
-  @Override
-  protected void print(String s, LogLevel logLevel) {
-    String coloredPrefix = this.getPrefix(logLevel);
-    if (logLevel.isHigherOrEqualTo(LogLevel.ERROR)) {
-      socketServer.sendError(webSocket, coloredPrefix + s, false);
-    }
-    else {
-      socketServer.sendMessage(webSocket, coloredPrefix + s);
-    }
-  }
-
-  @Override
-  protected void write(String s) {
-    // under no circumstances write anything to a file
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/SocketClient.java

@@ -1,202 +0,0 @@
-package de.dhbwstuttgart.server;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import de.dhbwstuttgart.core.ConsoleInterface;
-import de.dhbwstuttgart.server.packet.IClientToServerPacket;
-import de.dhbwstuttgart.server.packet.IPacket;
-import de.dhbwstuttgart.server.packet.IServerToClientPacket;
-import de.dhbwstuttgart.server.packet.PacketContainer;
-import de.dhbwstuttgart.server.packet.UnifyRequestPacket;
-import de.dhbwstuttgart.server.packet.UnifyResultPacket;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
-import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
-import de.dhbwstuttgart.util.Logger;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CountDownLatch;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.enums.ReadyState;
-import org.java_websocket.handshake.ServerHandshake;
-
-
-/**
- * The Client-side of the websocket
- */
-public class SocketClient extends WebSocketClient {
-
-  public static Logger logger = new Logger("SocketClient");
-
-  /**
-   * The singleton object
-   */
-  private static SocketClient socketClient = null;
-
-  /**
-   * List of futures that are still waiting to be fulfilled
-   */
-  private final Map<String, SocketFuture<?>> responseFutures = new HashMap<>();
-
-  private SocketClient(String url) {
-    super(
-      URI.create(url), // target url
-      //SocketServer.perMessageDeflateDraft, // enable compression
-      Map.of( // headers
-        "packetProtocolVersion", SocketServer.packetProtocolVersion
-      )
-    );
-
-    // make sure the url is in a valid format
-    final String regex = "^wss?://(\\w+(\\.\\w+)?)*:(\\d+)$";
-    final Matcher matcher = Pattern.compile(regex).matcher(url);
-    if (!matcher.find()) {
-      throw new RuntimeException("Provided string \"" + url + "\" is not a valid server URL! Use pattern ws(s?)://<host.name>:<port>");
-    }
-
-    try {
-      // wait for the connection to be set up
-      this.connectBlocking();
-      // make sure the connection has been established successfully
-      if (this.getReadyState() != ReadyState.OPEN) {
-        throw new RuntimeException("WebSocket Client could not connect to remote host at " + this.uri);
-      }
-    } catch (InterruptedException exception) {
-      throw new RuntimeException(exception);
-    }
-
-    // add a shutdown hook to close the connection when the process ends or is stopped by a SIGINT signal
-    Runtime.getRuntime().addShutdownHook(new Thread(this::close));
-  }
-
-  private SocketClient(String host, int port, boolean secure) throws InterruptedException {
-    this(String.format("%s://%s:%d/", secure ? "wss" : "ws", host, port));
-  }
-
-  /**
-   * Singleton access method, creates one if none is available
-   *
-   * @return The one and only socketClient
-   */
-  private static SocketClient initializeClient() {
-    if (socketClient == null) {
-      socketClient = new SocketClient(ConsoleInterface.unifyServerUrl.get());
-    }
-    return socketClient;
-  }
-
-  /**
-   * Send a packet to the server (connection will be created, if none is found) and return a future
-   * for the response packet
-   */
-  synchronized public static <T extends IServerToClientPacket> SocketFuture<T> execute(IClientToServerPacket<T> packet) {
-    SocketClient client = initializeClient();
-
-    /*
-     * Create a future that will be associated with the packet and eventually completed
-     */
-    SocketFuture<T> future = packet.getFuture();
-    if (!future.isDone()) {
-      client.responseFutures.put(future.futureId, future);
-    }
-
-    /*
-     * Establish connection, if not already done.
-     * Serialize the packet and send it to the server.
-     * Return the future to be handled by the caller.
-     */
-    try {
-      String json = PacketContainer.serialize(packet);
-      client.send(json);
-    } catch (Exception exception) {
-      logger.exception(exception);
-      throw new RuntimeException("Exception occurred in server connection: ", exception);
-    }
-
-    return future;
-  }
-
-  /**
-   * Shortcut for waiting and retrieving the response immediately
-   *
-   * @param packet The packet to send
-   * @param <T>    The type of response packet to await
-   * @return The response packet, once it is received
-   */
-  public static <T extends IServerToClientPacket> T executeAndGet(IClientToServerPacket<T> packet) {
-    return SocketClient.execute(packet).get();
-  }
-
-  /**
-   * Specific client-side implementations to handle incoming packets
-   */
-  protected void handleReceivedPacket(IPacket packet) {
-    if (!(packet instanceof IServerToClientPacket serverToClientPacket)) {
-      System.err.println("Received package of invalid type + " + packet.getClass().getName());
-      this.close();
-      return;
-    }
-
-    serverToClientPacket.onHandle(this.getConnection(), this);
-  }
-
-  /**
-   * Complete a registered future, so it can be handled by whoever executed the creator task
-   *
-   * @param id      The associated id for this future
-   * @param trigger The object triggering the completion
-   */
-  public void completeResponseFuture(String id, IServerToClientPacket trigger) {
-    SocketFuture<?> future = this.responseFutures.remove(id);
-    if (future == null) return;
-    if (!future.accept(trigger)) {
-      throw new RuntimeException("Packet " + trigger.getClass().getName() + " tried to complete future, but was not allowed to");
-    }
-  }
-
-  public static void closeIfOpen() {
-    if (socketClient != null && socketClient.isOpen()) {
-      socketClient.close();
-    }
-  }
-
-  @Override
-  public void onOpen(ServerHandshake handshakedata) {
-    logger.success("Connected to server with status " + handshakedata.getHttpStatus());
-  }
-
-  @Override
-  public void onMessage(String message) {
-    // logger.info("received: " + message);
-    IPacket packet = PacketContainer.deserialize(message);
-    this.handleReceivedPacket(packet);
-  }
-
-  @Override
-  public void onClose(int code, String reason, boolean remote) {
-    logger.info(
-      "Disconnected from server " +
-        "with code " + code + " " +
-        (reason.isEmpty() ? "" : "and reason " + reason + " ") +
-        "(closed by remote: " + remote + ")"
-    );
-
-    if (!this.responseFutures.isEmpty()) {
-      throw new RuntimeException("Server closed before all required tasks were answered");
-    }
-  }
-
-  @Override
-  public void onError(Exception e) {
-    logger.exception(e);
-    throw new RuntimeException(e);
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/SocketFuture.java

@@ -1,48 +0,0 @@
-package de.dhbwstuttgart.server;
-
-import de.dhbwstuttgart.server.packet.IServerToClientPacket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-public class SocketFuture<T extends IServerToClientPacket> extends CompletableFuture<T> {
-
-  public final String futureId = UUID.randomUUID().toString();
-
-  public final List<Class<T>> allowedTriggers;
-
-  public SocketFuture(List<Class<T>> allowedTriggers) {
-    this.allowedTriggers = allowedTriggers;
-  }
-
-  public boolean accept(IServerToClientPacket trigger) {
-    if (this.allowedTriggers.contains(trigger.getClass())) {
-      this.complete((T)trigger);
-      return true;
-    }
-    return false;
-  }
-
-  @Override
-  public T get() {
-    try {
-      return super.get();
-    }
-    catch (InterruptedException | ExecutionException exception) {
-      throw new RuntimeException(exception);
-    }
-  }
-
-  /**
-   * Special case where the future is immediately fulfilled without a response package similar to
-   * <code>CompletableFuture.completedFuture()</code> but without a value
-   */
-  public static <R extends IServerToClientPacket> SocketFuture<R> completedFuture() {
-    SocketFuture<R> dummyFuture = new SocketFuture<>(new ArrayList<>(0));
-    dummyFuture.complete(null);
-    return dummyFuture;
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/SocketServer.java

@@ -1,235 +0,0 @@
-package de.dhbwstuttgart.server;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import de.dhbwstuttgart.server.packet.ErrorPacket;
-import de.dhbwstuttgart.server.packet.IClientToServerPacket;
-import de.dhbwstuttgart.server.packet.IPacket;
-import de.dhbwstuttgart.server.packet.MessagePacket;
-import de.dhbwstuttgart.server.packet.PacketContainer;
-import de.dhbwstuttgart.util.Logger;
-import java.net.InetSocketAddress;
-import java.util.Collections;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.java_websocket.WebSocket;
-import org.java_websocket.drafts.Draft;
-import org.java_websocket.drafts.Draft_6455;
-import org.java_websocket.extensions.permessage_deflate.PerMessageDeflateExtension;
-import org.java_websocket.handshake.ClientHandshake;
-import org.java_websocket.server.WebSocketServer;
-
-public class SocketServer extends WebSocketServer {
-
-  public static Logger logger = new Logger("SocketServer");
-  public static final int maxTasksPerSession = 100;
-  private static boolean serverRunning = false;
-
-  /**
-   * Increase this every time a breaking change to the server communication is done.
-   * This will prevent errors when the server version and client version do not match.
-   */
-  public static final String packetProtocolVersion = "1";
-
-  // create an executor for tasks that will always keep at least one task around
-  private final ThreadPoolExecutor taskExecutor = new ThreadPoolExecutor(1, Integer.MAX_VALUE,60L, TimeUnit.SECONDS, new SynchronousQueue<>());
-  // create an executor for scheduling timeouts
-  private final ScheduledExecutorService timeoutExecutor = Executors.newSingleThreadScheduledExecutor();
-
-  public SocketServer(int port) {
-    super(new InetSocketAddress(port));
-    this.setConnectionLostTimeout(30);
-
-    serverRunning = true;
-    // add a shutdown hook to close all connections when the process ends or is stopped by a SIGINT signal
-    Runtime.getRuntime().addShutdownHook(new Thread(this::onShutdown));
-  }
-
-  public static boolean isServerRunning() {
-    return serverRunning;
-  }
-
-  private void onShutdown() {
-    serverRunning = false;
-    try {
-      for (var webSocket : this.getConnections()) {
-        this.sendError(webSocket, "Sorry, i am shutting down. You are now on your own, good Luck!", true);
-        webSocket.close();
-      }
-      this.stop();
-      taskExecutor.shutdown();
-      timeoutExecutor.shutdown();
-    } catch (InterruptedException exception) {
-      // we are shutting down anyway
-    }
-  }
-
-  @Override
-  public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) {
-    String ppv = clientHandshake.getFieldValue("packetProtocolVersion");
-    if (!ppv.equals(packetProtocolVersion)) {
-      this.sendError(webSocket,
-        "Mismatch in packet protocol version! Client (you): \"" + ppv + "\" and Server (me): \"" + packetProtocolVersion + "\"",
-        true
-      );
-      webSocket.close(1);
-      return;
-    }
-
-    SocketData socketData = new SocketData(webSocket);
-    logger.info("New connection: " + socketData.id + " (with ppv " + ppv + ")");
-
-    try {
-      sendMessage(webSocket, "Welcome to the server!");
-
-      // wait 10 seconds for the client to send a task and close the connection if nothing has been received until then
-      final int secondsUntilTimeout = 10;
-      timeoutExecutor.schedule(() -> {
-          if (webSocket.<SocketData>getAttachment().totalTasks.get() > 0 || !webSocket.isOpen()) {
-            return;
-          }
-          sendMessage(webSocket, "No task received after " + secondsUntilTimeout + " seconds. Closing connection...");
-          webSocket.close();
-        },
-        secondsUntilTimeout,
-        TimeUnit.SECONDS
-      );
-
-      // and finally, when your program wants to exit
-    } catch (Exception e) {
-      logger.exception(e);
-      webSocket.close(1, e.getMessage());
-    }
-  }
-
-  @Override
-  public void onClose(WebSocket webSocket, int code, String reason, boolean remote) {
-    SocketData socketData = webSocket.getAttachment();
-    logger.info("Connection closed: " + socketData.id);
-    logger.info(
-      "Disconnected client " + socketData.id + " " +
-        "with code " + code + " " +
-        (reason.isEmpty() ? "" : "and reason " + reason + " ") +
-        "(closed by client: " + remote + ")"
-    );
-
-  }
-
-  @Override
-  public void onMessage(WebSocket webSocket, String s) {
-    // logger.info("Received: " + s.substring(0, 50));
-    IPacket reconstructedPacket = PacketContainer.deserialize(s);
-    try {
-      this.onPacketReceived(webSocket, reconstructedPacket);
-    } catch (JsonProcessingException e) {
-      logger.exception(e);
-      this.log(webSocket, "Error on processing incoming package: " + e.getMessage());
-    }
-  }
-
-  @Override
-  public void onError(WebSocket webSocket, Exception e) {
-    if (webSocket != null) {
-      log(webSocket, e.getMessage());
-      webSocket.close();
-    }
-    logger.exception(e);
-  }
-
-  @Override
-  public void onStart() {
-    logger.success("Websocket server started on port " + this.getPort());
-  }
-
-  /**
-   * A shorthand method for sending informational messages to the client
-   */
-  public void sendMessage(WebSocket webSocket, String text) {
-    try {
-      MessagePacket message = MessagePacket.create(text);
-      webSocket.send(PacketContainer.serialize(message));
-    } catch (Exception e) {
-      System.err.println("Failed to send message: " + text);
-      logger.exception(e);
-    }
-  }
-
-  /**
-   * A shorthand method for sending error messages to the client
-   */
-  public void sendError(WebSocket webSocket, String text, boolean isFatal) {
-    try {
-      ErrorPacket error = ErrorPacket.create(text, isFatal);
-      webSocket.send(PacketContainer.serialize(error));
-    } catch (Exception e) {
-      logger.exception(e);
-      log(webSocket, "Failed to send error: " + text);
-    }
-  }
-
-  /**
-   * The server-side implementation on how to handle certain packets when received
-   */
-  private void onPacketReceived(WebSocket webSocket, IPacket packet) throws JsonProcessingException {
-    SocketData socketData = webSocket.getAttachment();
-
-    // limit the number of tasks per connection
-    if (socketData.totalTasks.get() >= maxTasksPerSession) {
-      sendError(webSocket, "Exceeded the maximum amount of " + maxTasksPerSession + " tasks per session", true);
-      webSocket.close();
-      return;
-    }
-
-    // only allow packets that are meant to be handled by the server
-    if (!(packet instanceof IClientToServerPacket<?> clientToServerPacket)) {
-      sendMessage(webSocket, "The package of type " + packet.getClass().getName() + " is not handled by the server!");
-      return;
-    }
-
-    // update the socket data
-    socketData.unhandledTasks.incrementAndGet();
-    socketData.totalTasks.incrementAndGet();
-
-    // add the packet to the queue so it can be started by the worker
-    CompletableFuture.runAsync(() -> {
-      clientToServerPacket.onHandle(webSocket, this);
-      int remainingUnhandledTasks = socketData.unhandledTasks.decrementAndGet();
-
-      if (socketData.closeIfNoTasksLeft) {
-        // if the websocket has 0 unhandled Tasks, close the connection
-        if (remainingUnhandledTasks <= 0) {
-          sendMessage(webSocket, "All requested tasks finished! Closing connection...");
-          webSocket.close();
-        }
-      }
-    }, taskExecutor);
-  }
-
-  public void log(WebSocket webSocket, String msg) {
-    String socketId = (webSocket == null) ? "???" : webSocket.<SocketData>getAttachment().id;
-    logger.info("[" + socketId + "] " + msg);
-  }
-
-  /**
-   * The data that is associated server-side with any connected client.
-   * This makes it possible to store information that can be mapped to any existing connection.
-   */
-  public static class SocketData {
-
-    public final String id;
-    public final AtomicInteger unhandledTasks = new AtomicInteger(0);
-    public final AtomicInteger totalTasks = new AtomicInteger(0);
-    public boolean closeIfNoTasksLeft = false;
-
-    public SocketData(WebSocket webSocket) {
-      this.id = UUID.randomUUID().toString();
-      webSocket.setAttachment(this);
-    }
-  }
-}

src/main/java/de/dhbwstuttgart/server/packet/DebugPacket.java

@@ -1,35 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.server.SocketClient;
-import de.dhbwstuttgart.server.SocketFuture;
-import de.dhbwstuttgart.server.SocketServer;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.ISerialNode;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialList;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialUUID;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialValue;
-import org.java_websocket.WebSocket;
-
-public class DebugPacket implements IClientToServerPacket.Void, IServerToClientPacket {
-
-  public SerialUUID a1;
-  public SerialUUID a2;
-  public SerialMap b1;
-  public SerialMap b2;
-  public SerialList<? extends ISerialNode> c1;
-  public SerialList<? extends ISerialNode> c2;
-  public SerialValue<?> d1;
-  public SerialValue<?> d2;
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketClient socketClient) {}
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketServer socketServer) {}
-
-  @JsonIgnore
-  public SocketFuture<IServerToClientPacket> getFuture() {
-    return SocketFuture.completedFuture();
-  }
-}

src/main/java/de/dhbwstuttgart/server/packet/ErrorPacket.java

@@ -1,36 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.server.SocketClient;
-import de.dhbwstuttgart.server.SocketFuture;
-import de.dhbwstuttgart.server.SocketServer;
-import org.java_websocket.WebSocket;
-
-/**
- * A packet to send simple error messages between the client and the server
- */
-public class ErrorPacket implements IServerToClientPacket {
-
-  /**
-   * The error endpoint for messages from the server that should be logged out as errors and possibly abort the process
-   */
-  public String error;
-  public boolean isFatal;
-
-  @JsonIgnore
-  public static ErrorPacket create(String error, boolean isFatal) {
-    ErrorPacket packet = new ErrorPacket();
-    packet.error = error;
-    packet.isFatal = isFatal;
-    return packet;
-  }
-
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketClient socketClient) {
-    SocketClient.logger.exception(new RuntimeException(this.error));
-    if (this.isFatal) {
-      socketClient.close(1, "Received fatal error from server");
-    }
-  }
-}

src/main/java/de/dhbwstuttgart/server/packet/IClientToServerPacket.java

@@ -1,26 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.server.SocketFuture;
-import de.dhbwstuttgart.server.SocketServer;
-import org.java_websocket.WebSocket;
-
-/**
- * A packet that will be sent to the server. Use <code>Void</code> Sub-Interface for packets without response
- *
- * @param <T>   The response packet that will fulfill the future.
- */
-public interface IClientToServerPacket<T extends IServerToClientPacket> extends IPacket {
-
-  @JsonIgnore
-  void onHandle(WebSocket webSocket, SocketServer socketServer);
-
-  @JsonIgnore
-  SocketFuture<T> getFuture();
-
-  /**
-   * Special case, where the packet will remain unanswered by the server
-   */
-  interface Void extends IClientToServerPacket<IServerToClientPacket> {}
-}
-

src/main/java/de/dhbwstuttgart/server/packet/IPacket.java

@@ -1,12 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-/**
- * The shared interface for all packet of the client-server connection.
- * A packet must always:
- * - Have a default / no-parameter constructor
- * - Have only serializable public properties (or disable them via jackson annotations)
- *
- */
-public interface IPacket {
-
-}

src/main/java/de/dhbwstuttgart/server/packet/IServerToClientPacket.java

@@ -1,12 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.server.SocketClient;
-import org.java_websocket.WebSocket;
-
-public interface IServerToClientPacket extends IPacket {
-
-  @JsonIgnore
-  void onHandle(WebSocket webSocket, SocketClient socketClient);
-
-}

src/main/java/de/dhbwstuttgart/server/packet/InvalidPacket.java

@@ -1,35 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.server.SocketClient;
-import de.dhbwstuttgart.server.SocketFuture;
-import de.dhbwstuttgart.server.SocketServer;
-import org.java_websocket.WebSocket;
-
-/**
- * A fallback packet that is generated if the received JSON could not be mapped to an existing package
- */
-public class InvalidPacket implements IClientToServerPacket.Void, IServerToClientPacket {
-
-  /**
-   * If available, the error that caused this package to appear
-   */
-  public String error = "<unknown error>";
-
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketClient socketClient) {
-    SocketClient.logger.error("InvalidPacket: " + this.error);
-  }
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketServer socketServer) {
-    socketServer.log(webSocket, "InvalidPacket: " + this.error);
-  }
-
-  @JsonIgnore
-  public SocketFuture<IServerToClientPacket> getFuture() {
-    return SocketFuture.completedFuture();
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/packet/MessagePacket.java

@@ -1,40 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.server.SocketClient;
-import de.dhbwstuttgart.server.SocketFuture;
-import de.dhbwstuttgart.server.SocketServer;
-import org.java_websocket.WebSocket;
-
-/**
- * A packet to send simple informational messages between the client and the server
- */
-public class MessagePacket implements IClientToServerPacket.Void, IServerToClientPacket {
-
-  /**
-   * The informational message from the server that should be logged out outputted
-   */
-  public String message;
-
-  @JsonIgnore
-  public static MessagePacket create(String message) {
-    MessagePacket packet = new MessagePacket();
-    packet.message = message;
-    return packet;
-  }
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketClient socketClient) {
-    SocketClient.logger.info("SocketMessage: " + this.message);
-  }
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketServer socketServer) {
-    socketServer.log(webSocket, this.message);
-  }
-
-  @JsonIgnore
-  public SocketFuture<IServerToClientPacket> getFuture() {
-    return SocketFuture.completedFuture();
-  }
-}

src/main/java/de/dhbwstuttgart/server/packet/PacketContainer.java

@@ -1,98 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import de.dhbwstuttgart.util.Logger;
-
-/**
- * A wrapper for the packet to ensure correct serialization/deserialization and make it possible to detect the matching
- * packet type for deserialization.
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class PacketContainer {
-
-  // The jackson serializer / deserializer tool
-  private static final ObjectMapper objectMapper = new ObjectMapper();
-
-  /*
-   * The available packet types. The one type that is represented in the JSON should always be the ONLY non-null value.
-   * They have to be public (for the moment) to let jackson fill them in while deserializing
-   */
-  public ErrorPacket errorPacket = null;
-  public MessagePacket messagePacket = null;
-  public InvalidPacket invalidPacket = null;
-  public UnifyRequestPacket unifyRequestPacket = null;
-  public UnifyResultPacket unifyResultPacket = null;
-  public DebugPacket debugPacket = null;
-  public SetAutoclosePacket setAutoclosePacket = null;
-
-
-  /**
-   * Generate the JSON string for the given packet
-   *
-   * @param packet The packet to serialize
-   * @return The JSON representation of the packet
-   */
-  public static String serialize(IPacket packet) throws JsonProcessingException {
-    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    PacketContainer container = new PacketContainer();
-
-    if (packet instanceof ErrorPacket)
-      container.errorPacket = (ErrorPacket) packet;
-    else if (packet instanceof MessagePacket)
-      container.messagePacket = (MessagePacket) packet;
-    else if (packet instanceof UnifyRequestPacket)
-      container.unifyRequestPacket = (UnifyRequestPacket) packet;
-    else if (packet instanceof UnifyResultPacket)
-      container.unifyResultPacket = (UnifyResultPacket) packet;
-    else if (packet instanceof DebugPacket)
-      container.debugPacket = (DebugPacket) packet;
-    else if (packet instanceof SetAutoclosePacket)
-      container.setAutoclosePacket = (SetAutoclosePacket) packet;
-    // Add new packets here and in the deserialize method
-    else
-      throw new RuntimeException("Cannot map packet to any known packet class");
-
-    return objectMapper.writeValueAsString(container);
-  }
-
-  /**
-   * Use the JSON string to generate the matching packet object
-   *
-   * @param json The serialized representation of a packet container
-   * @return The deserialized Packet object
-   */
-  public static IPacket deserialize(String json) {
-    objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-
-    try {
-      PacketContainer container = objectMapper.readValue(json, PacketContainer.class);
-
-      if (container.errorPacket != null)
-        return container.errorPacket;
-      if (container.messagePacket != null)
-        return container.messagePacket;
-      if (container.invalidPacket != null)
-        return container.invalidPacket;
-      if (container.unifyRequestPacket != null)
-        return container.unifyRequestPacket;
-      if (container.unifyResultPacket != null)
-        return container.unifyResultPacket;
-      if (container.debugPacket != null)
-        return container.debugPacket;
-      if (container.setAutoclosePacket != null)
-        return container.setAutoclosePacket;
-      // Add new packets here and in the serialize method
-
-      throw new RuntimeException("Cannot map received json to any known packet class");
-    } catch (Exception e) {
-      (new Logger()).exception(e);
-      InvalidPacket packet = new InvalidPacket();
-      packet.error = e.getMessage();
-      return packet;
-    }
-  }
-
-
-}

src/main/java/de/dhbwstuttgart/server/packet/SetAutoclosePacket.java

@@ -1,32 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.server.SocketClient;
-import de.dhbwstuttgart.server.SocketFuture;
-import de.dhbwstuttgart.server.SocketServer;
-import org.java_websocket.WebSocket;
-
-/**
- * Normally, a connection stays open until either the client or the server process ends.
- * Send this packet to inform the server that the connection can be closed once all tasks are done
- */
-public class SetAutoclosePacket implements IClientToServerPacket.Void {
-
-  public int dummyProperty = 1;
-
-  @JsonIgnore
-  public static SetAutoclosePacket create() {
-    return new SetAutoclosePacket();
-  }
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketServer socketServer) {
-    webSocket.<SocketServer.SocketData>getAttachment().closeIfNoTasksLeft = true;
-    socketServer.log(webSocket, "Marked connection as autoclose");
-  }
-
-  @JsonIgnore
-  public SocketFuture<IServerToClientPacket> getFuture() {
-    return SocketFuture.completedFuture();
-  }
-}

src/main/java/de/dhbwstuttgart/server/packet/UnifyRequestPacket.java

@@ -1,164 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.core.ConsoleInterface;
-import de.dhbwstuttgart.server.ServerTaskLogger;
-import de.dhbwstuttgart.server.SocketFuture;
-import de.dhbwstuttgart.server.SocketServer;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialList;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialValue;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
-import de.dhbwstuttgart.typeinference.unify.TypeUnify;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
-import de.dhbwstuttgart.typeinference.unify.UnifyResultListenerImpl;
-import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
-import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
-import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
-import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
-import de.dhbwstuttgart.typeinference.unify.model.UnifyType;
-import de.dhbwstuttgart.util.Logger;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.ForkJoinPool;
-import org.java_websocket.WebSocket;
-
-/**
- * A packet to send all required data for the unification algorithm to the server and request the unification
- */
-public class UnifyRequestPacket implements IClientToServerPacket<UnifyResultPacket> {
-
-  public SerialMap finiteClosure;
-  public SerialMap constraintSet;
-  public SerialMap unifyConstraintSet;
-  public SerialMap serialKeyStorage;
-  public SerialValue<?> placeholders;
-  public SerialList<SerialMap> factoryplaceholders;
-  public String futureId;
-  public int logLevel;
-
-  @JsonIgnore
-  private KeyStorage keyStorage = new KeyStorage();
-  @JsonIgnore
-  private boolean keyStorageLoaded = false;
-
-  public static UnifyRequestPacket create(
-    FiniteClosure finiteClosure,
-    ConstraintSet<Pair> constraintSet,
-    ConstraintSet<UnifyPair> unifyConstraintSet,
-    PlaceholderRegistry placeholderRegistry
-  ) {
-    UnifyRequestPacket packet = new UnifyRequestPacket();
-    // store constraint and finite closure
-    packet.finiteClosure = finiteClosure.toSerial(packet.keyStorage);
-    packet.constraintSet = constraintSet.toSerial(packet.keyStorage);
-    packet.unifyConstraintSet = unifyConstraintSet.toSerial(packet.keyStorage);
-    // store placeholder registry
-    var serialRegistry = placeholderRegistry.toSerial(packet.keyStorage);
-    packet.placeholders = serialRegistry.getValue("ph");
-    packet.factoryplaceholders = serialRegistry.getList("factoryPh").assertListOfMaps();
-    // store referenced objects separately
-    packet.serialKeyStorage = packet.keyStorage.toSerial(packet.keyStorage);
-    packet.logLevel = ConsoleInterface.logLevel.getValue();
-    return packet;
-  }
-
-
-  @JsonIgnore
-  public void loadKeyStorage(UnifyContext context) {
-    if (!keyStorageLoaded) {
-      keyStorageLoaded = true;
-      keyStorage = KeyStorage.fromSerial(this.serialKeyStorage, context);
-    }
-  }
-
-  @JsonIgnore
-  private FiniteClosure retrieveFiniteClosure(UnifyContext context) {
-    this.loadKeyStorage(context);
-    return FiniteClosure.fromSerial(this.finiteClosure, context, keyStorage);
-  }
-
-  @JsonIgnore
-  private ConstraintSet<Pair> retrieveConstraintSet(UnifyContext context) {
-    this.loadKeyStorage(context);
-    return ConstraintSet.fromSerial(this.constraintSet, context, Pair.class, keyStorage);
-  }
-
-  @JsonIgnore
-  private ConstraintSet<UnifyPair> retrieveUnifyConstraintSet(UnifyContext context) {
-    this.loadKeyStorage(context);
-    return ConstraintSet.fromSerial(this.unifyConstraintSet, context, UnifyPair.class, keyStorage);
-  }
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketServer socketServer) {
-    socketServer.sendMessage(webSocket, "You requested a unify! Please wait until I calculated everything...");
-    socketServer.log(webSocket, "Client requested a unification. Starting now...");
-
-    try {
-      var placeholderRegistry = new PlaceholderRegistry();
-      ArrayList<String> existingPlaceholders = (ArrayList) this.placeholders.getOf(ArrayList.class);
-      existingPlaceholders.forEach(placeholderRegistry::addPlaceholder);
-
-      Logger logger = new ServerTaskLogger(
-        webSocket,
-        socketServer,
-        Logger.LogLevel.fromValue(
-          Math.max(this.logLevel, Logger.LogLevel.INFO.getValue())
-        )
-      );
-      var unifyContext = new UnifyContext(logger, true,
-        new UnifyResultModel(new ConstraintSet<>(), new FiniteClosure(new HashSet<>(), logger, placeholderRegistry)),
-        new UnifyTaskModel(), ForkJoinPool.commonPool(), placeholderRegistry
-      );
-
-      this.factoryplaceholders.stream()
-        .map(p -> (PlaceholderType)UnifyType.fromSerial(p, unifyContext))
-        .forEach(placeholderRegistry.UnifyTypeFactory_PLACEHOLDERS::add);
-
-
-      // start the unification algorithm from the received data
-      IFiniteClosure finiteClosure = this.retrieveFiniteClosure(unifyContext);
-      ConstraintSet<Pair> constraintSet = this.retrieveConstraintSet(unifyContext);
-      ConstraintSet<UnifyPair> unifyConstraintSet = this.retrieveUnifyConstraintSet(unifyContext);
-
-      var resultModel = new UnifyResultModel(constraintSet, finiteClosure);
-      UnifyResultListenerImpl resultListener = new UnifyResultListenerImpl();
-      resultModel.addUnifyResultListener(resultListener);
-
-      TypeUnify.unifyParallel(
-        unifyConstraintSet.getUndConstraints(),
-        unifyConstraintSet.getOderConstraints(),
-        finiteClosure,
-        unifyContext.newWithResultModel(resultModel)
-      );
-
-      var resultSets = resultListener.getResults();
-
-      socketServer.log(webSocket, "Finished unification");
-      socketServer.sendMessage(webSocket, "Unification finished. Found " + resultSets.size() + " result sets");
-
-      if (webSocket.isOpen()) {
-        UnifyResultPacket resultPacket = UnifyResultPacket.create(resultSets, futureId);
-        webSocket.send(PacketContainer.serialize(resultPacket));
-      }
-    } catch (Exception e) {
-      SocketServer.logger.exception(e);
-      socketServer.log(webSocket, e.getMessage());
-    }
-  }
-
-  @JsonIgnore
-  public SocketFuture<UnifyResultPacket> getFuture() {
-    var future = new SocketFuture<>(List.of(UnifyResultPacket.class));
-    futureId = future.futureId;
-    return future;
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/packet/UnifyResultPacket.java

@@ -1,45 +0,0 @@
-package de.dhbwstuttgart.server.packet;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.dhbwstuttgart.server.SocketClient;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.ISerialNode;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialList;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
-import java.util.List;
-import org.java_websocket.WebSocket;
-
-/**
- * A packet to send all calculated data from the unification algorithm back to the client
- */
-public class UnifyResultPacket implements IServerToClientPacket {
-
-  public SerialList<ISerialNode> results;
-  public SerialMap keyStorage;
-  public String futureId;
-
-  public static UnifyResultPacket create(List<ResultSet> resultSets, String futureId) {
-    UnifyResultPacket serialized = new UnifyResultPacket();
-    KeyStorage keyStorage = new KeyStorage();
-    serialized.results = SerialList.fromMapped(resultSets, resultSet -> resultSet.toSerial(keyStorage));
-    serialized.keyStorage = keyStorage.toSerial(keyStorage);
-    serialized.futureId = futureId;
-    return serialized;
-  }
-
-  @JsonIgnore
-  public List<ResultSet> getResultSet(UnifyContext context) {
-    return this.results.assertListOfMaps().stream()
-      .map(resultData -> ResultSet.fromSerial(resultData, context)).toList();
-  }
-
-  @JsonIgnore
-  public void onHandle(WebSocket webSocket, SocketClient socketClient) {
-    SocketClient.logger.info("Received unify result");
-    socketClient.completeResponseFuture(futureId, this);
-  }
-
-
-}

src/main/java/de/dhbwstuttgart/server/packet/dataContainers/ISerializableData.java

@@ -1,16 +0,0 @@
-package de.dhbwstuttgart.server.packet.dataContainers;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.ISerialNode;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
-
-public interface ISerializableData {
-
-  public abstract ISerialNode toSerial(KeyStorage keyStorage);
-
-  public static Object fromSerial(SerialMap data, UnifyContext context) {
-    throw new NotImplementedException("Missing implementation of \"fromSerial\" for a serializable element");
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/packet/dataContainers/KeyStorage.java

@@ -1,103 +0,0 @@
-package de.dhbwstuttgart.server.packet.dataContainers;
-
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class KeyStorage implements ISerializableData {
-
-  /**
-   *  Store a unique identifier for every element, so it can be referenced in the json
-   */
-  protected AtomicInteger identifierCount = new AtomicInteger();
-  /**
-   *  Store the serialized element per identifier when serializing
-   */
-  protected SerialMap serializedElements = new SerialMap();
-  /**
-   *  Store the unserialized element per identifier when unserializing
-   */
-  protected Map<String, ISerializableData> unserializedElements = new HashMap<>();
-
-
-  /**
-   *  Retrieve or generate a new identifier for a constraint
-   */
-  public String getIdentifier() {
-    return this.identifierCount.incrementAndGet() + "_";
-  }
-
-  /**
-   *  Checks if the given element identifier belongs to an element that was already serialized
-   */
-  public boolean isAlreadySerialized(String identifier) {
-    return this.serializedElements.containsKey(identifier);
-  }
-
-  /**
-   *  Checks if the given element identifier belongs to a element that was already unserialized
-   */
-  public boolean isAlreadyUnserialized(String identifier) {
-    return this.unserializedElements.containsKey(identifier);
-  }
-
-  /**
-   *  Register a serialized element to prevent it from being serialized again
-   */
-  public void putSerialized(String identifier, SerialMap serializedElement) {
-    this.serializedElements.put(identifier, serializedElement);
-  }
-
-  /**
-   *  Retrieve a serialized element
-   */
-  public SerialMap getSerialized(String identifier) {
-    if (!this.serializedElements.containsKey(identifier)) {
-      throw new RuntimeException("No serialized element of identifier " + identifier + " available to get");
-    }
-    return this.serializedElements.getMap(identifier);
-  }
-
-  /**
-   *  Register an unserialized element to prevent it from being unserialized again
-   */
-  public void putUnserialized(String identifier, ISerializableData element) {
-    this.unserializedElements.put(identifier, element);
-  }
-
-  /**
-   *  Retrieve an unserialized element
-   */
-  public <T extends ISerializableData> T getUnserialized(String identifier, Class<T> target) {
-    if (!this.unserializedElements.containsKey(identifier)) {
-      throw new RuntimeException("No unserialized element of identifier " + identifier + " available to get");
-    }
-    var element = this.unserializedElements.get(identifier);
-    if (target.isInstance(element)) {
-      return (T) element;
-    }
-    throw new RuntimeException("Failed to get unserialized element from KeyStorage. Expected instance of " +
-      target.getName() + " but found " + element.getClass().getName());
-  }
-
-  @Override
-  public SerialMap toSerial(KeyStorage keyStorage) {
-    SerialMap serialized = new SerialMap();
-    serialized.put("serializedElements", this.serializedElements);
-    return serialized;
-  }
-
-  public static KeyStorage fromSerial(SerialMap data, UnifyContext context) {
-    var serializedConstraintsData = data.getMap("serializedElements");
-    var constraintContext = new KeyStorage();
-    for (var entry : serializedConstraintsData.entrySet()) {
-      if (entry.getValue() instanceof SerialMap valueMap) {
-        constraintContext.putSerialized(entry.getKey(), valueMap);
-      }
-    }
-    return constraintContext;
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/packet/dataContainers/serialized/ISerialNode.java

@@ -1,31 +0,0 @@
-package de.dhbwstuttgart.server.packet.dataContainers.serialized;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-
-/**
- * Use the following classes for an intermediate serialized tree structure
- */
-@JsonTypeInfo(
-  use = JsonTypeInfo.Id.NAME,
-  include = JsonTypeInfo.As.PROPERTY,
-  property = "_t"
-)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = SerialMap.class, name = "m"),
-  @JsonSubTypes.Type(value = SerialList.class, name = "l"),
-  @JsonSubTypes.Type(value = SerialValue.class, name = "v"),
-  @JsonSubTypes.Type(value = SerialUUID.class, name = "u")
-})
-public interface ISerialNode {
-
-  default <T extends ISerialNode> T assertType(Class<T> type) {
-    if (type.isInstance(this)) {
-      return (T) this;
-    }
-    throw new RuntimeException("Expected ISerialNode to be of type " + type.getName()
-      + " but found " + this.getClass().getName() + " instead");
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/packet/dataContainers/serialized/SerialList.java

@@ -1,74 +0,0 @@
-package de.dhbwstuttgart.server.packet.dataContainers.serialized;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-public class SerialList<I extends ISerialNode> extends ArrayList<I> implements ISerialNode {
-  public SerialList() {}
-  public SerialList(Collection<I> data) {
-    this.addAll(data);
-  }
-  public SerialList(Stream<I> data) {
-    this(data.toList());
-  }
-  public SerialList(I[] data) {
-    this(Arrays.stream(data).toList());
-  }
-
-  @SafeVarargs
-  @JsonIgnore
-  public static <A extends ISerialNode> ArrayList<A> from(A ...values) {
-    ArrayList<A> list = new SerialList<>();
-    Collections.addAll(list, values);
-    return list;
-  }
-  @JsonIgnore
-  public static <A,B extends ISerialNode> SerialList<B> fromMapped(Stream<A> data, Function<A,B> mapper) {
-    return new SerialList<>(data.map(mapper).toList());
-  }
-  @JsonIgnore
-  public static <A,B extends ISerialNode> SerialList<B> fromMapped(Collection<A> data, Function<A,B> mapper) {
-    return SerialList.fromMapped(data.stream(), mapper);
-  }
-  @JsonIgnore
-  public static <A,B extends ISerialNode> SerialList<B> fromMapped(A[] data, Function<A,B> mapper) {
-    return SerialList.fromMapped(Arrays.stream(data), mapper);
-  }
-
-  @JsonIgnore
-  public SerialList<SerialMap> assertListOfMaps() {
-    if (this.isEmpty() || this.get(0) instanceof SerialMap) {
-      return (SerialList<SerialMap>) this;
-    }
-    throw new RuntimeException("Required List to contain SerialMap elements but condition failed");
-  }
-
-  @JsonIgnore
-  public SerialList<SerialList<?>> assertListOfLists() {
-    if (this.isEmpty() || this.get(0) instanceof SerialList) {
-      return (SerialList<SerialList<?>>) this;
-    }
-    throw new RuntimeException("Required List to contain SerialList elements but condition failed");
-  }
-
-  @JsonIgnore
-  public SerialList<SerialValue<?>> assertListOfValues() {
-    if (this.isEmpty() || this.get(0) instanceof SerialValue) {
-      return (SerialList<SerialValue<?>>) this;
-    }
-    throw new RuntimeException("Required List to contain SerialValue elements but condition failed");
-  }
-
-  @JsonIgnore
-  public SerialList<SerialUUID> assertListOfUUIDs() {
-    if (this.isEmpty() || this.get(0) instanceof SerialUUID) {
-      return (SerialList<SerialUUID>) this;
-    }
-    throw new RuntimeException("Required List to contain SerialUUID elements but condition failed");
-  }
-}

src/main/java/de/dhbwstuttgart/server/packet/dataContainers/serialized/SerialMap.java

@@ -1,84 +0,0 @@
-package de.dhbwstuttgart.server.packet.dataContainers.serialized;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import java.util.HashMap;
-import java.util.Map;
-import org.jspecify.annotations.Nullable;
-
-public class SerialMap extends HashMap<String, ISerialNode> implements ISerialNode {
-
-  public SerialMap() {
-    super();
-  }
-
-  public SerialMap(Map<String, ISerialNode> data) {
-    super(data);
-  }
-
-  @JsonIgnore
-  public void put(String key, Boolean value) {
-    this.put(key, new SerialValue<>(value));
-  }
-
-  @JsonIgnore
-  public void put(String key, String value) {
-    this.put(key, new SerialValue<>(value));
-  }
-
-  @JsonIgnore
-  public void put(String key, Number value) {
-    this.put(key, new SerialValue<>(value));
-  }
-
-  @JsonIgnore
-  private <T> T get(String key, Class<T> expectedType) {
-    if (!this.containsKey(key)) {
-      throw new RuntimeException("Missing required value " + key + " in ObjectMap");
-    }
-    var element = this.get(key);
-    if (element != null && element.getClass() != expectedType) {
-      throw new RuntimeException(
-        "Required value " + key + " to be of type " + expectedType.getName() + " but found " + element.getClass().getName()
-      );
-    }
-    return (T)element;
-  }
-
-  @JsonIgnore
-  public SerialList<?> getList(String key) {
-    return this.get(key, SerialList.class);
-  }
-
-  @Nullable
-  @JsonIgnore
-  public SerialList<?> getListOrNull(String key) {
-    return this.containsKey(key) ? this.getList(key) : null;
-  }
-
-  @JsonIgnore
-  public SerialMap getMap(String key) {
-    return this.get(key, SerialMap.class);
-  }
-
-  @Nullable
-  @JsonIgnore
-  public SerialMap getMapOrNull(String key) {
-    return this.containsKey(key) ? this.getMap(key) : null;
-  }
-
-  @JsonIgnore
-  public SerialValue<?> getValue(String key) {
-    return this.get(key, SerialValue.class);
-  }
-
-  @JsonIgnore
-  public SerialUUID getUUID(String key) {
-    return this.get(key, SerialUUID.class);
-  }
-
-  @Nullable
-  @JsonIgnore
-  public SerialUUID getUUIDOrNull(String key) {
-    return this.containsKey(key) ? this.getUUID(key) : null;
-  }
-}

src/main/java/de/dhbwstuttgart/server/packet/dataContainers/serialized/SerialUUID.java

@@ -1,13 +0,0 @@
-package de.dhbwstuttgart.server.packet.dataContainers.serialized;
-
-public class SerialUUID implements ISerialNode {
-
-  public String uuid;
-
-  public SerialUUID() {}
-
-  public SerialUUID(String uuid) {
-    this.uuid = uuid;
-  }
-
-}

src/main/java/de/dhbwstuttgart/server/packet/dataContainers/serialized/SerialValue.java

@@ -1,28 +0,0 @@
-package de.dhbwstuttgart.server.packet.dataContainers.serialized;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-public class SerialValue<T> implements ISerialNode {
-  public T value;
-  public static final SerialValue<Object> NULL = new SerialValue<>(null);
-
-  public SerialValue() {}
-
-  public SerialValue(T value) {
-    this.value = value;
-  }
-
-  @JsonIgnore
-  public <A> SerialValue<A> assertValueOf(Class<A> targetClass) {
-    if (this.value == null || targetClass.isInstance(this.value)) {
-      return (SerialValue<A>) this;
-    }
-    throw new RuntimeException("Required Value to contain " + targetClass.getName() + " value but condition failed on" +
-      " type " + this.value.getClass().getName());
-  }
-
-  @JsonIgnore
-  public <A> A getOf(Class<A> targetClass) {
-    return this.assertValueOf(targetClass).value;
-  }
-}

src/main/java/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java

@@ -6,12 +6,10 @@ import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.target.tree.TargetGeneric;
 import org.antlr.v4.runtime.Token;
 
 import java.lang.reflect.Modifier;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Stellt jede Art von Klasse dar. Auch abstrakte Klassen und Interfaces
@@ -33,7 +31,6 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope {
   private List<RefType> implementedInterfaces;
   private List<RefType> permittedSubtypes;
   private List<Constructor> constructors;
-  private Set<GenericTypeVar> userDefinedGenerics;
 
   public ClassOrInterface(int modifiers, JavaClassName name, List<Field> fielddecl, Optional<Constructor> fieldInitializations, Optional<Method> staticInitializer, List<Method> methods, List<Constructor> constructors, GenericDeclarationList genericClassParameters, RefType superClass, Boolean isInterface, Boolean isFunctionalInterface, List<RefType> implementedInterfaces, List<RefType> permittedSubtypes, Token offset, String fileName) {
     super(offset);
@@ -202,22 +199,4 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope {
   public int hashCode() {
     return Objects.hash(name);
   }
-
-  public Set<GenericTypeVar> getUserDefinedGenerics() {
-    if (this.userDefinedGenerics != null) return this.userDefinedGenerics;
-
-    var genericsIter = getGenerics().iterator();
-    if (genericsIter.hasNext()) {
-      // Add empty set of generics to cache so that it doesn't try to calculate it later
-      this.userDefinedGenerics = new HashSet<>();
-      while (genericsIter.hasNext()) {
-        var next = genericsIter.next();
-        userDefinedGenerics.add(next);
-      }
-    } else {
-      this.userDefinedGenerics = new HashSet<>();
-    }
-
-    return this.userDefinedGenerics;
-  }
 }

src/main/java/de/dhbwstuttgart/syntaxtree/SourceFile.java

@@ -5,10 +5,8 @@ import java.util.*;
 
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.target.generate.ASTToTargetAST;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
 //import sun.security.x509.X509CertInfo;
 
 public class SourceFile extends SyntaxTreeNode {
@@ -20,7 +18,6 @@ public class SourceFile extends SyntaxTreeNode {
   private boolean isGenerated;
 
   public List<ClassOrInterface> availableClasses = new ArrayList<>();
-  public List<ASTToTargetAST.Generics> generics = new ArrayList<>();
 
   /**
    * Die SourceFile repräsntiert eine zu einem Syntaxbaum eingelesene Java-Datei.
@@ -43,10 +40,6 @@ public class SourceFile extends SyntaxTreeNode {
     this.imports = new HashSet<>(sf.imports);
   }
 
-  public void addResultSet(ResultSet rs) {
-
-  }
-
   public void setPackageName(String packageName) {
     this.pkgName = packageName;
   }

src/main/java/de/dhbwstuttgart/syntaxtree/SyntaxTree.java

@@ -1,8 +0,0 @@
-package de.dhbwstuttgart.syntaxtree;
-
-import de.dhbwstuttgart.util.Logger;
-
-public class SyntaxTree {
-
-  public static Logger logger = new Logger("SyntaxTree");
-}

src/main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java

@@ -176,9 +176,8 @@ public class ASTFactory {
 		for (Type jreInterface : jreClass.getGenericInterfaces()) {
 			implementedInterfaces.add((RefType) createType(jreInterface));
 		}
-		List<RefType> permittedSubtypes = null;
+		List<RefType> permittedSubtypes = new ArrayList<>();
 		if (jreClass.isSealed()) {
-			permittedSubtypes = new ArrayList<>();
 			for (Class subclass : jreClass.getPermittedSubclasses()) {
 				permittedSubtypes.add((RefType) createType(subclass));
 			}

src/main/java/de/dhbwstuttgart/syntaxtree/factory/NameGenerator.java

@@ -1,8 +1,5 @@
 package de.dhbwstuttgart.syntaxtree.factory;
 
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.core.JavaTXServer;
-
 public class NameGenerator {
 
     private static String strNextName = "A";
@@ -16,10 +13,6 @@ public class NameGenerator {
     public static void reset() {
     	strNextName = "A";
     }
-
-    public static void resetTo(String name) {
-        strNextName = name;
-    }
     
     /**
      * Berechnet einen neuen, eindeutigen Namen f�r eine neue                          
@@ -33,11 +26,7 @@ public class NameGenerator {
     
         // n�chster Name berechnen und in strNextName speichern        
         inc( strNextName.length() - 1 );
-
-        if (JavaTXServer.isRunning) {
-            throw new RuntimeException("Using the NameGenerator on a server is not allowed");
-        }
-        JavaTXCompiler.defaultClientPlaceholderRegistry.addPlaceholder(strReturn);
+        
         return strReturn;        
     }
 

src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java

@@ -1,8 +1,5 @@
 package de.dhbwstuttgart.syntaxtree.factory;
 
-import de.dhbwstuttgart.syntaxtree.SyntaxTree;
-import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
-import de.dhbwstuttgart.util.Logger;
 import java.io.Writer;
 import java.lang.reflect.Modifier;
 import java.util.*;
@@ -34,13 +31,9 @@ import org.antlr.v4.runtime.Token;
 
 public class UnifyTypeFactory {
 	
-    public static FiniteClosure generateFC(
-      List<ClassOrInterface> fromClasses,
-      Logger logger,
-      ClassLoader classLoader,
-      JavaTXCompiler compiler,
-      PlaceholderRegistry placeholderRegistry
-    ) throws ClassNotFoundException {
+	private static ArrayList<PlaceholderType> PLACEHOLDERS = new ArrayList<>(); 
+
+    public static FiniteClosure generateFC(List<ClassOrInterface> fromClasses, Writer logFile, ClassLoader classLoader, JavaTXCompiler compiler) throws ClassNotFoundException {
         /*
         Die transitive Hülle muss funktionieren.
         Man darf schreiben List<A> extends AL<A>
@@ -51,7 +44,7 @@ public class UnifyTypeFactory {
         Generell dürfen sie immer die gleichen Namen haben.
         TODO: die transitive Hülle bilden
          */
-        return new FiniteClosure(FCGenerator.toUnifyFC(compiler, fromClasses, classLoader, placeholderRegistry), logger, compiler, placeholderRegistry);
+        return new FiniteClosure(FCGenerator.toUnifyFC(compiler, fromClasses, classLoader), logFile, compiler);
     }
 
     public static UnifyPair generateSmallerPair(UnifyType tl, UnifyType tr, SourceLoc location){
@@ -74,23 +67,23 @@ public class UnifyTypeFactory {
      * Convert from
      * ASTType -> UnifyType
      */
-    public static UnifyType convert(JavaTXCompiler compiler, RefTypeOrTPHOrWildcardOrGeneric t, Boolean innerType, PlaceholderRegistry placeholderRegistry){
+    public static UnifyType convert(JavaTXCompiler compiler, RefTypeOrTPHOrWildcardOrGeneric t, Boolean innerType){
         if (t instanceof GenericRefType){
-            return UnifyTypeFactory.convert(compiler, (GenericRefType)t, innerType, placeholderRegistry);
+            return UnifyTypeFactory.convert(compiler, (GenericRefType)t, innerType);
         } else if (t instanceof TypePlaceholder){
-            return UnifyTypeFactory.convert(compiler, (TypePlaceholder)t, innerType, placeholderRegistry);
+            return UnifyTypeFactory.convert(compiler, (TypePlaceholder)t, innerType);
         } else if (t instanceof ExtendsWildcardType){
-            return UnifyTypeFactory.convert(compiler, (ExtendsWildcardType)t, innerType, placeholderRegistry);
+            return UnifyTypeFactory.convert(compiler, (ExtendsWildcardType)t, innerType);
         } else if (t instanceof SuperWildcardType) {
-            return UnifyTypeFactory.convert(compiler, (SuperWildcardType) t, innerType, placeholderRegistry);
+            return UnifyTypeFactory.convert(compiler, (SuperWildcardType) t, innerType);
         } else if (t instanceof RefType){
-            return UnifyTypeFactory.convert(compiler, (RefType)t, innerType, placeholderRegistry);
+            return UnifyTypeFactory.convert(compiler, (RefType)t, innerType);
         }
         //Es wurde versucht ein Typ umzuwandeln, welcher noch nicht von der Factory abgedeckt ist
         throw new NotImplementedException("Der Typ "+t+" kann nicht umgewandelt werden");
     }
 
-    public static UnifyType convert(JavaTXCompiler compiler, RefType t, Boolean innerType, PlaceholderRegistry placeholderRegistry){
+    public static UnifyType convert(JavaTXCompiler compiler, RefType t, Boolean innerType){
         //Check if it is a FunN Type:
         Pattern p = Pattern.compile("Fun(\\d+)[$][$]");
         Matcher m = p.matcher(t.getName().toString());
@@ -98,76 +91,76 @@ public class UnifyTypeFactory {
         if(b){
             Integer N = Integer.valueOf(m.group(1));
             if((N + 1) == t.getParaList().size()){
-                return convertFunN(compiler, t.getParaList(), false, placeholderRegistry);
+                return convertFunN(compiler, t.getParaList(), false);
             }
         }
         UnifyType ret;
         List<UnifyType> params = new ArrayList<>();
         if (t.getParaList() != null) {
             for (RefTypeOrTPHOrWildcardOrGeneric pT : t.getParaList()) {
-                params.add(UnifyTypeFactory.convert(compiler, pT, true, placeholderRegistry));
+                params.add(UnifyTypeFactory.convert(compiler, pT, true));
             }
         }
 
         var clazz = compiler.getClass(t.getName());
         if (clazz != null && clazz.isInterface() && clazz.isFunctionalInterface()) {
             var method = clazz.getMethods().stream().filter(x -> Modifier.isAbstract(x.modifier)).findFirst().orElseThrow();
-            var methodParams = method.getParameterList().getFormalparalist().stream().map(x -> convert(compiler, x.getType(), true, placeholderRegistry)).toList();
+            var methodParams = method.getParameterList().getFormalparalist().stream().map(x -> convert(compiler, x.getType(), true)).toList();
             var generics = StreamSupport.stream(clazz.getGenerics().spliterator(), false).map(GenericTypeVar::getName).toList();
-            return new FunInterfaceType(t.getName().toString(), new TypeParams(params), methodParams, convert(compiler, method.getReturnType(), true, placeholderRegistry), generics);
+            return new FunInterfaceType(t.getName().toString(), new TypeParams(params), methodParams, convert(compiler, method.getReturnType(), true), generics);
         }
 
         return new ReferenceType(t.getName().toString(),new TypeParams(params));
     }
 
-    public static UnifyType convertFunN(JavaTXCompiler compiler, List<RefTypeOrTPHOrWildcardOrGeneric> paraList, Boolean innerType, PlaceholderRegistry placeholderRegistry){
+    public static UnifyType convertFunN(JavaTXCompiler compiler, List<RefTypeOrTPHOrWildcardOrGeneric> paraList, Boolean innerType){
         UnifyType ret;
         List<UnifyType> params = new ArrayList<>();
         if(paraList != null && paraList.size() > 0){
             for(RefTypeOrTPHOrWildcardOrGeneric pT : paraList){
-                params.add(UnifyTypeFactory.convert(compiler, pT, false, placeholderRegistry));
+                params.add(UnifyTypeFactory.convert(compiler, pT, false));
             }
         }
         ret = FunNType.getFunNType(new TypeParams(params));
         return ret;
     }
 
-    public static UnifyType convert(JavaTXCompiler compiler, TypePlaceholder tph, Boolean innerType, PlaceholderRegistry placeholderRegistry) {
+    public static UnifyType convert(JavaTXCompiler compiler, TypePlaceholder tph, Boolean innerType){
     	if (tph.getName().equals("AFR")) {
-          SyntaxTree.logger.info("XXX"+innerType);
+    		System.out.println("XXX"+innerType);
     	}
-    	PlaceholderType ntph = new PlaceholderType(tph.getName(), tph.getVariance(), placeholderRegistry);
+    	PlaceholderType ntph = new PlaceholderType(tph.getName(), tph.getVariance());
     	ntph.setVariance(tph.getVariance());
     	ntph.setOrCons(tph.getOrCons());
     	ntph.setWildcardtable(tph.getWildcardtable());
-    	int in = placeholderRegistry.UnifyTypeFactory_PLACEHOLDERS.indexOf(ntph);
+    	int in = PLACEHOLDERS.indexOf(ntph);
 		if (in == -1) {
-        placeholderRegistry.UnifyTypeFactory_PLACEHOLDERS.add(ntph);
+			PLACEHOLDERS.add(ntph);
 			ntph.setInnerType(innerType);
 			return ntph;
 		}
 		else {
-			 PlaceholderType oldpht = placeholderRegistry.UnifyTypeFactory_PLACEHOLDERS.get(in);
+			 PlaceholderType oldpht = PLACEHOLDERS.get(in);
 			 oldpht.setInnerType(oldpht.isInnerType() || innerType);
 			 return oldpht;
 		}
     }
 
-    public static UnifyType convert(JavaTXCompiler compiler, GenericRefType t, Boolean innerType, PlaceholderRegistry placeholderRegistry){
+    public static UnifyType convert(JavaTXCompiler compiler, GenericRefType t, Boolean innerType){
         return new ReferenceType(t.getParsedName(), true);
     }
 
-    public static UnifyType convert(JavaTXCompiler compiler, WildcardType t, Boolean innerType, PlaceholderRegistry placeholderRegistry){
+    public static UnifyType convert(JavaTXCompiler compiler, WildcardType t, Boolean innerType){
         if(t.isExtends())
-            return new ExtendsType(UnifyTypeFactory.convert(compiler, t.getInnerType(), false, placeholderRegistry));
+            return new ExtendsType(UnifyTypeFactory.convert(compiler, t.getInnerType(), false));
         else if(t.isSuper())
-            return new SuperType(UnifyTypeFactory.convert(compiler, t.getInnerType(), false, placeholderRegistry));
+            return new SuperType(UnifyTypeFactory.convert(compiler, t.getInnerType(), false));
         else throw new NotImplementedException();
     }
 
 
-    public static ConstraintSet<UnifyPair> convert(JavaTXCompiler compiler, ConstraintSet<Pair> constraints, PlaceholderRegistry placeholderRegistry) {
-        return constraints.map(c -> UnifyTypeFactory.convert(compiler, c, placeholderRegistry));
+    public static ConstraintSet<UnifyPair> convert(JavaTXCompiler compiler, ConstraintSet<Pair> constraints) {
+        return constraints.map(c -> UnifyTypeFactory.convert(compiler, c));
     }
 
     //NEVER USED
@@ -178,30 +171,30 @@ public class UnifyTypeFactory {
     //	return unifyPairConstraint;
     //}
 
-    public static UnifyPair convert(JavaTXCompiler compiler, Pair p, PlaceholderRegistry placeholderRegistry) {
+    public static UnifyPair convert(JavaTXCompiler compiler, Pair p) {
     	UnifyPair ret = null;
         if(p.GetOperator().equals(PairOperator.SMALLERDOT)) {
-             ret = generateSmallerDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false, placeholderRegistry)
-                    , UnifyTypeFactory.convert(compiler, p.TA2, false, placeholderRegistry), p.getLocation());
+             ret = generateSmallerDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false)
+                    , UnifyTypeFactory.convert(compiler, p.TA2, false), p.getLocation());
             //return ret;
         }else if(p.GetOperator().equals(PairOperator.SMALLERNEQDOT)) {
-             ret = generateSmallNotEqualDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false, placeholderRegistry)
-                    , UnifyTypeFactory.convert(compiler, p.TA2, false, placeholderRegistry), p.getLocation());
+             ret = generateSmallNotEqualDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false)
+                    , UnifyTypeFactory.convert(compiler, p.TA2, false), p.getLocation());
             //return ret;
         }else if(p.GetOperator().equals(PairOperator.EQUALSDOT)) {
-             ret = generateEqualDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false, placeholderRegistry)
-                    , UnifyTypeFactory.convert(compiler, p.TA2, false, placeholderRegistry), p.getLocation());
+             ret = generateEqualDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false)
+                    , UnifyTypeFactory.convert(compiler, p.TA2, false), p.getLocation());
             //return ret;
         }else if(p.GetOperator().equals(PairOperator.SMALLER)){
-            ret =  generateSmallerPair(UnifyTypeFactory.convert(compiler, p.TA1, false, placeholderRegistry),
-                    UnifyTypeFactory.convert(compiler, p.TA2, false, placeholderRegistry), p.getLocation());
+            ret =  generateSmallerPair(UnifyTypeFactory.convert(compiler, p.TA1, false),
+                    UnifyTypeFactory.convert(compiler, p.TA2, false), p.getLocation());
         }else            throw new NotImplementedException();
         UnifyType lhs, rhs;
         if (((lhs = ret.getLhsType()) instanceof PlaceholderType) 
         		&& ((PlaceholderType)lhs).isWildcardable() 
         		&&	(rhs = ret.getLhsType()) instanceof PlaceholderType) {
         	if (lhs.getName().equals("AQ")) {
-        		// SyntaxTree.logger.info("");
+        		System.out.println("");
         	}
         	((PlaceholderType)rhs).enableWildcardtable();
         }
@@ -210,7 +203,7 @@ public class UnifyTypeFactory {
         		&& ((PlaceholderType)rhs).isWildcardable()
         		&&	(lhs = ret.getLhsType()) instanceof PlaceholderType) {
         	if (rhs.getName().equals("AQ")) {
-        		// SyntaxTree.logger.info("");
+        		System.out.println("");
         	}
         	((PlaceholderType)lhs).enableWildcardtable();
         }
@@ -221,16 +214,16 @@ public class UnifyTypeFactory {
      * Convert from
      * UnifyType -> ASTType
      */
-    public static Set<ResultPair> convert(Set<UnifyPair> unifyPairSet, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
+    public static Set<ResultPair> convert(Set<UnifyPair> unifyPairSet, Map<String,TypePlaceholder> tphs) {
         return unifyPairSet.stream().map(
-                unifyPair -> convert(unifyPair, tphs, placeholderRegistry))
+                unifyPair -> convert(unifyPair, tphs))
                         .collect(Collectors.toSet());
     }
 
-    public static ResultPair convert(UnifyPair mp, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
+    public static ResultPair convert(UnifyPair mp, Map<String,TypePlaceholder> tphs) {
     	if (mp == null) { return null;} //kann bei basePairs passieren
-        RefTypeOrTPHOrWildcardOrGeneric tl = UnifyTypeFactory.convert(mp.getLhsType(), tphs, placeholderRegistry);
-        RefTypeOrTPHOrWildcardOrGeneric tr = UnifyTypeFactory.convert(mp.getRhsType(), tphs, placeholderRegistry);
+        RefTypeOrTPHOrWildcardOrGeneric tl = UnifyTypeFactory.convert(mp.getLhsType(), tphs);
+        RefTypeOrTPHOrWildcardOrGeneric tr = UnifyTypeFactory.convert(mp.getRhsType(), tphs);
         if(tl instanceof TypePlaceholder){
             if(tr instanceof TypePlaceholder) {
 
@@ -239,7 +232,7 @@ public class UnifyTypeFactory {
                     //Einfach ignorieren TODO: Das hier muss ausgebessert werden:
                     //return new PairTPHequalRefTypeOrWildcardType((TypePlaceholder)tl, ASTFactory.createObjectType());
                 }else{
-                    return new PairTPHsmallerTPH((TypePlaceholder)tl, (TypePlaceholder)tr, convert(mp.getBasePair(), tphs, placeholderRegistry));
+                    return new PairTPHsmallerTPH((TypePlaceholder)tl, (TypePlaceholder)tr, convert(mp.getBasePair(), tphs));
                 }
             }else if(tr instanceof RefType){
                 return new PairTPHequalRefTypeOrWildcardType((TypePlaceholder)tl, (RefType) tr);
@@ -251,51 +244,51 @@ public class UnifyTypeFactory {
         }else return new PairNoResult(tl, tr);//throw new NotImplementedException();
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(ReferenceType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(ReferenceType t, Map<String,TypePlaceholder> tphs) {
         if(JavaClassName.Void.equals(t.getName()))return new Void(new NullToken());
         if (t.isGenTypeVar()) return new GenericRefType(t.getName(),new NullToken());
-        RefType ret = new RefType(new JavaClassName(t.getName()),convert(t.getTypeParams(), tphs, placeholderRegistry),new NullToken());
+        RefType ret = new RefType(new JavaClassName(t.getName()),convert(t.getTypeParams(), tphs),new NullToken());
         return ret;
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(FunNType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
-        RefType ret = new RefType(new JavaClassName(t.getName()), convert(t.getTypeParams(), tphs, placeholderRegistry), new NullToken());
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(FunNType t, Map<String,TypePlaceholder> tphs) {
+        RefType ret = new RefType(new JavaClassName(t.getName()), convert(t.getTypeParams(), tphs), new NullToken());
         return ret;
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(SuperType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
-        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getSuperedType(), tphs, placeholderRegistry);
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(SuperType t, Map<String,TypePlaceholder> tphs) {
+        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getSuperedType(), tphs);
         return new SuperWildcardType(innerType, new NullToken());
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(ExtendsType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
-        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getExtendedType(), tphs, placeholderRegistry);
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(ExtendsType t, Map<String,TypePlaceholder> tphs) {
+        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getExtendedType(), tphs);
         return new ExtendsWildcardType(innerType, new NullToken());
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(PlaceholderType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(PlaceholderType t, Map<String,TypePlaceholder> tphs) {
         TypePlaceholder ret = tphs.get(t.getName());
         if(ret == null){ //Dieser TPH wurde vom Unifikationsalgorithmus erstellt
-            ret = TypePlaceholder.fresh(new NullToken(), placeholderRegistry);
+            ret = TypePlaceholder.fresh(new NullToken());
             tphs.put(t.getName(), ret);
         }
         ret.setVariance(t.getVariance());
         return ret;
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(UnifyType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
-        if(t instanceof FunNType)return convert((FunNType) t, tphs, placeholderRegistry);
-        if(t instanceof ReferenceType)return convert((ReferenceType) t, tphs, placeholderRegistry);
-        if(t instanceof SuperType)return convert((SuperType) t, tphs, placeholderRegistry);
-        if(t instanceof ExtendsType)return convert((ExtendsType) t, tphs, placeholderRegistry);
-        if(t instanceof PlaceholderType)return convert((PlaceholderType) t, tphs, placeholderRegistry);
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(UnifyType t, Map<String,TypePlaceholder> tphs) {
+        if(t instanceof FunNType)return convert((FunNType) t, tphs);
+        if(t instanceof ReferenceType)return convert((ReferenceType) t, tphs);
+        if(t instanceof SuperType)return convert((SuperType) t, tphs);
+        if(t instanceof ExtendsType)return convert((ExtendsType) t, tphs);
+        if(t instanceof PlaceholderType)return convert((PlaceholderType) t, tphs);
         throw new NotImplementedException("Der Typ "+t+" kann nicht umgewandelt werden");
     }
 
-    private static List<RefTypeOrTPHOrWildcardOrGeneric> convert(TypeParams typeParams, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
+    private static List<RefTypeOrTPHOrWildcardOrGeneric> convert(TypeParams typeParams, Map<String,TypePlaceholder> tphs) {
         List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
         for(UnifyType uT : typeParams){
-            RefTypeOrTPHOrWildcardOrGeneric toAdd = convert(uT, tphs, placeholderRegistry);
+            RefTypeOrTPHOrWildcardOrGeneric toAdd = convert(uT, tphs);
             ret.add(toAdd);
         }
         return ret;

src/main/java/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java

@@ -1,13 +1,8 @@
 package de.dhbwstuttgart.syntaxtree.type;
 
 
-import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
 import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import org.antlr.v4.runtime.Token;
 
 import java.util.Objects;
@@ -20,7 +15,7 @@ import java.util.Objects;
  * 
  */
 
-public class ExtendsWildcardType extends WildcardType implements ISerializableData {
+public class ExtendsWildcardType extends WildcardType{
 	
 	/**
 	* Author: Arne Lüdtke<br/>
@@ -73,22 +68,4 @@ public class ExtendsWildcardType extends WildcardType implements ISerializableDa
 		ExtendsWildcardType that = (ExtendsWildcardType) o;
 		return that.innerType.equals(this.innerType);
 	}
-
-	@Override
-	public SerialMap toSerial(KeyStorage keyStorage) {
-		SerialMap serialized = new SerialMap();
-		serialized.put("innerType", this.innerType.toSerial(keyStorage));
-
-		// create the wrapper and put this as the object
-		var serializedWrapper = super.toSerial(keyStorage).assertType(SerialMap.class);
-		serializedWrapper.put("object", serialized);
-		return serializedWrapper;
-	}
-
-	public static ExtendsWildcardType fromSerial(SerialMap data, UnifyContext context) {
-		return new ExtendsWildcardType(
-			RefTypeOrTPHOrWildcardOrGeneric.fromSerial(data.getMap("innerType"), context),
-			new NullToken()
-		);
-	}
 }

src/main/java/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java

@@ -1,77 +1,57 @@
 package de.dhbwstuttgart.syntaxtree.type;
 
-import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
 import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import org.antlr.v4.runtime.Token;
 
 import java.util.Objects;
 
-public class GenericRefType extends RefTypeOrTPHOrWildcardOrGeneric implements ISerializableData {
-  private String name;
+public class GenericRefType extends RefTypeOrTPHOrWildcardOrGeneric
+{
+    private String name;
 
-  public GenericRefType(String name, Token offset) {
-    super(offset);
-    this.name = name;
-  }
+    public GenericRefType(String name, Token offset)
+    {
+        super(offset);
+        this.name = name;
+    }
 
-  public String getParsedName() {
-    return name.toString();
-  }
+    public String getParsedName(){
+        return name.toString();
+    }
 
-  @Override
-  public void accept(ASTVisitor visitor) {
-    visitor.visit(this);
-  }
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
 
-  @Override
-  public <A> A acceptTV(TypeVisitor<A> visitor) {
-    return visitor.visit(this);
-  }
+    @Override
+    public <A> A acceptTV(TypeVisitor<A> visitor) {
+        return visitor.visit(this);
+    }
 
-  @Override
-  public void accept(ResultSetVisitor visitor) {
-    visitor.visit(this);
-  }
+    @Override
+    public void accept(ResultSetVisitor visitor) {
+        visitor.visit(this);
+    }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    GenericRefType that = (GenericRefType) o;
-    return name.equals(that.name);
-  }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GenericRefType that = (GenericRefType) o;
+        return name.equals(that.name);
+    }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(name);
-  }
+    @Override
+    public int hashCode() {
+        return Objects.hash(name);
+    }
 
-  @Override
-  public String toString() {
-    return "GTV " + this.name;
-  }
-
-  @Override
-  public SerialMap toSerial(KeyStorage keyStorage) {
-    SerialMap serialized = new SerialMap();
-    serialized.put("name", this.name);
-
-    // create the wrapper and put this as the object
-    var serializedWrapper = super.toSerial(keyStorage).assertType(SerialMap.class);
-    serializedWrapper.put("object", serialized);
-    return serializedWrapper;
-  }
-
-  public static GenericRefType fromSerial(SerialMap data, UnifyContext context) {
-    return new GenericRefType(
-      data.getValue("name").getOf(String.class),
-      new NullToken()
-    );
-  }
+    @Override
+	public String toString()
+	{
+		 return "GTV " + this.name;
+	}
 }
 

src/main/java/de/dhbwstuttgart/syntaxtree/type/RefType.java

@@ -1,15 +1,8 @@
 package de.dhbwstuttgart.syntaxtree.type;
 
-import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.ISerialNode;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialList;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
 import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import org.antlr.v4.runtime.Token;
 
 import java.util.ArrayList;
@@ -18,137 +11,122 @@ import java.util.List;
 import java.util.Objects;
 
 
-public class RefType extends RefTypeOrTPHOrWildcardOrGeneric implements ISerializableData {
-  protected final JavaClassName name;
-  protected final List<RefTypeOrTPHOrWildcardOrGeneric> parameter;
-  /**
-   * Ist primitiveFlag auf true, muss beim Codegen dieser Reftype durch
-   * den primitiven Datentyp ersetzt werden
-   * <p>
-   * Bsp: java.lang.Integer mit Flag wird dann zu [int]
-   */
-  boolean primitiveFlag = false; // TODO Should be final
+public class RefType extends RefTypeOrTPHOrWildcardOrGeneric
+{
+	protected final JavaClassName name;
+    protected final List<RefTypeOrTPHOrWildcardOrGeneric> parameter;
+    /**
+     * Ist primitiveFlag auf true, muss beim Codegen dieser Reftype durch
+     * den primitiven Datentyp ersetzt werden
+     *
+     * Bsp: java.lang.Integer mit Flag wird dann zu [int]
+     */
+    boolean primitiveFlag = false; // TODO Should be final
 
-  public RefType(JavaClassName fullyQualifiedName, Token offset) {
-    this(fullyQualifiedName, new ArrayList<>(), offset);
-  }
-
-  public boolean isPrimitive() {
-    return primitiveFlag;
-  }
-
-  @Override
-  public String toString() {
-    String params = "";
-    if (parameter.size() > 0) {
-      params += "<";
-      Iterator<RefTypeOrTPHOrWildcardOrGeneric> it = parameter.iterator();
-      while (it.hasNext()) {
-        RefTypeOrTPHOrWildcardOrGeneric param = it.next();
-        params += param.toString();
-        if (it.hasNext()) params += ", ";
-      }
-      params += ">";
-    }
-    return this.name.toString() + params;
-  }
-
-  @Override
-  public int hashCode() {
-    return this.name.hashCode();//Nur den Name hashen. Sorgt für langsame, aber funktionierende HashMaps
-  }
-
-  public RefType(JavaClassName fullyQualifiedName, List<RefTypeOrTPHOrWildcardOrGeneric> parameter, Token offset) {
-    this(fullyQualifiedName, parameter, offset, false);
-  }
-
-  public RefType(JavaClassName fullyQualifiedName, List<RefTypeOrTPHOrWildcardOrGeneric> parameter, Token offset, boolean primitiveFlag) {
-    super(offset);
-    this.name = (fullyQualifiedName);
-    this.parameter = parameter;
-    this.primitiveFlag = primitiveFlag;
-  }
-
-  public JavaClassName getName() {
-    return name;
-  }
-
-  public List<RefTypeOrTPHOrWildcardOrGeneric> getParaList() {
-    if (this.parameter == null) return new ArrayList<>();
-    return this.parameter;
-  }
-
-  /**
-   * Author: Jrg Buerle<br/>
-   *
-   * @return
-   */
-  public boolean equals(Object obj) {
-    if (!(obj instanceof RefType refObj)) {
-      return false;
+    public RefType(JavaClassName fullyQualifiedName, Token offset)
+    {
+        this(fullyQualifiedName, new ArrayList<>(), offset);
     }
 
-    if (!Objects.equals(this.name, refObj.name)) return false;
-    boolean ret = true;
+    public boolean isPrimitive() {
+        return primitiveFlag;
+    }
 
-    //if(!(super.equals(obj))) PL 2020-03-12 muss vll. einkommentiert werden
-    //	return false;
-
-    if (parameter == null || parameter.size() == 0) {
-      ret &= (refObj.getParaList() == null || refObj.getParaList().isEmpty());
-    } else {
-      if (refObj.getParaList() == null) {
-        ret = false;
-      } else if (parameter.size() != refObj.getParaList().size()) {
-        ret = false;
-      } else {
-        for (int i = 0; i < parameter.size(); i++) {
-          ret &= parameter.get(i).equals(refObj.getParaList().get(i));
+    @Override
+    public String toString(){
+        String params = "";
+        if(parameter.size()>0){
+            params += "<";
+            Iterator<RefTypeOrTPHOrWildcardOrGeneric> it = parameter.iterator();
+            while(it.hasNext()){
+                RefTypeOrTPHOrWildcardOrGeneric param = it.next();
+                params += param.toString();
+                if(it.hasNext())params += ", ";
+            }
+            params += ">";
         }
-      }
+        return this.name.toString() + params;
     }
-    return ret;
 
-  }
+    @Override
+	public int hashCode() {
+        return this.name.hashCode();//Nur den Name hashen. Sorgt für langsame, aber funktionierende HashMaps
+	}
 
+    public RefType(JavaClassName fullyQualifiedName, List<RefTypeOrTPHOrWildcardOrGeneric> parameter, Token offset) {
+        this(fullyQualifiedName, parameter, offset, false);
+    }
 
-  @Override
-  public void accept(ASTVisitor visitor) {
-    visitor.visit(this);
-  }
+    public RefType(JavaClassName fullyQualifiedName, List<RefTypeOrTPHOrWildcardOrGeneric> parameter, Token offset, boolean primitiveFlag) {
+        super(offset);
+        this.name = (fullyQualifiedName);
+        this.parameter = parameter;
+        this.primitiveFlag = primitiveFlag;
+    }
 
-  @Override
-  public <A> A acceptTV(TypeVisitor<A> visitor) {
-    return visitor.visit(this);
-  }
+    public JavaClassName getName()
+    {
+        return name;
+    }
 
-  @Override
-  public void accept(ResultSetVisitor visitor) {
-    visitor.visit(this);
-  }
+    public List<RefTypeOrTPHOrWildcardOrGeneric> getParaList(){
+    	if(this.parameter==null)return new ArrayList<>();
+    	return this.parameter;
+    }
 
-  @Override
-  public ISerialNode toSerial(KeyStorage keyStorage) {
-    SerialMap serialized = new SerialMap();
-    serialized.put("isPrimitive", this.primitiveFlag);
-    serialized.put("name", this.name.toString());
-    serialized.put("parameters", SerialList.fromMapped(this.parameter, param -> param.toSerial(keyStorage)));
+    /**
+     * Author: Jrg Buerle<br/>
+     * @return
+     */
+    public boolean equals(Object obj)
+    {
+        if(obj instanceof RefType){
+            if (!Objects.equals(this.name, ((RefType) obj).name)) return false;
+            boolean ret = true;
+            
+            //if(!(super.equals(obj))) PL 2020-03-12 muss vll. einkommentiert werden   
+            //	return false;
+            
+            if(parameter==null || parameter.size()==0){
+                ret &= (((RefType)obj).getParaList()==null || ((RefType)obj).getParaList().size()==0);
+            }
+            else{
+                if(((RefType)obj).getParaList()==null){
+                    ret = false;
+                }
+                else if(parameter.size() != ((RefType)obj).getParaList().size())
+                {
+                	ret = false;
+                }
+                else
+                {
+                	for(int i = 0; i<parameter.size(); i++)
+                	{
+                		ret &= parameter.get(i).equals(((RefType)obj).getParaList().get(i));
+                	}
+                }
+            }
+            return ret;
+        }
+        else{
+            return false;
+        }
+    }
+    	
 
-    // create the wrapper and put this as the object
-    var serializedWrapper = super.toSerial(keyStorage).assertType(SerialMap.class);
-    serializedWrapper.put("object", serialized);
-    return serializedWrapper;
-  }
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
 
-  public static RefType fromSerial(SerialMap data, UnifyContext context) {
-    return new RefType(
-      new JavaClassName(data.getValue("name").getOf(String.class)),
-      data.getList("parameters").assertListOfMaps().stream()
-        .map(param -> RefTypeOrTPHOrWildcardOrGeneric.fromSerial(param, context))
-        .toList(),
-      new NullToken(),
-      data.getValue("isPrimitive").getOf(Boolean.class)
-    );
-  }
+    @Override
+    public <A> A acceptTV(TypeVisitor<A> visitor) {
+        return visitor.visit(this);
+    }
+
+    @Override
+    public void accept(ResultSetVisitor visitor) {
+        visitor.visit(this);
+    }
 }
 

src/main/java/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPHOrWildcardOrGeneric.java

@@ -1,17 +1,11 @@
 package de.dhbwstuttgart.syntaxtree.type;
 
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.ISerialNode;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialValue;
 import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import org.antlr.v4.runtime.Token;
 
-public abstract class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode implements ISerializableData {
+public abstract class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode{
     public RefTypeOrTPHOrWildcardOrGeneric(Token offset) {
         super(offset);
     }
@@ -24,26 +18,5 @@ public abstract class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode imp
     
     @Override
     public abstract boolean equals(Object o);
-
-    @Override
-    public ISerialNode toSerial(KeyStorage keyStorage) {
-        SerialMap serialized = new SerialMap();
-        serialized.put("type", this.getClass().getSimpleName());
-          // we only insert null for the object and expect the child classes to call this and override the value with themselves
-        serialized.put("object", SerialValue.NULL);
-        return serialized;
-    }
-
-    public static RefTypeOrTPHOrWildcardOrGeneric fromSerial(SerialMap data, UnifyContext context) {
-        String type = data.getValue("type").getOf(String.class);
-        SerialMap object = data.getMap("object");
-
-        if      (type.equals(ExtendsWildcardType.class.getSimpleName()))    return ExtendsWildcardType.fromSerial(object, context);
-        else if (type.equals(GenericRefType.class.getSimpleName()))         return GenericRefType.fromSerial(object, context);
-        else if (type.equals(SuperWildcardType.class.getSimpleName()))      return SuperWildcardType.fromSerial(object, context);
-        else if (type.equals(RefType.class.getSimpleName()))                return RefType.fromSerial(object, context);
-        else if (type.equals(Void.class.getSimpleName()))                   return Void.fromSerial(object, context);
-        else if (type.equals(TypePlaceholder.class.getSimpleName()))        return TypePlaceholder.fromSerial(object, context);
-        else throw new RuntimeException("Could not unserialize class of unhandled type " + type);
-    }
+    
 }

src/main/java/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java

@@ -1,13 +1,9 @@
 package de.dhbwstuttgart.syntaxtree.type;
 
 
-import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
 import de.dhbwstuttgart.syntaxtree.ASTVisitor;
+import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import org.antlr.v4.runtime.Token;
 
 import java.util.Objects;
@@ -20,7 +16,7 @@ import java.util.Objects;
  * 
  */
 
-public class SuperWildcardType extends WildcardType implements ISerializableData {
+public class SuperWildcardType extends WildcardType{
 
 	/**
 	* Author: Arne Lüdtke<br/>
@@ -84,22 +80,4 @@ public class SuperWildcardType extends WildcardType implements ISerializableData
 		SuperWildcardType that = (SuperWildcardType) o;
 		return that.innerType.equals(this.innerType);
 	}
-
-	@Override
-	public SerialMap toSerial(KeyStorage keyStorage) {
-		SerialMap serialized = new SerialMap();
-		serialized.put("innerType", this.innerType.toSerial(keyStorage));
-
-		// create the wrapper and put this as the object
-		var serializedWrapper = super.toSerial(keyStorage).assertType(SerialMap.class);
-		serializedWrapper.put("object", serialized);
-		return serializedWrapper;
-	}
-
-	public static SuperWildcardType fromSerial(SerialMap data, UnifyContext context) {
-		return new SuperWildcardType(
-			RefTypeOrTPHOrWildcardOrGeneric.fromSerial(data.getMap("innerType"), context),
-			new NullToken()
-		);
-	}
 }

src/main/java/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java

@@ -1,12 +1,9 @@
 package de.dhbwstuttgart.syntaxtree.type;
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
+import java.util.Hashtable;
 
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.ASTVisitor;
+import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;
@@ -19,7 +16,7 @@ import org.antlr.v4.runtime.Token;
  * @author J�rg B�uerle
  * @version $Date: 2013/06/19 12:45:37 $
  */
-public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric implements ISerializableData
+public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
 {
 	private final String name;
 	
@@ -68,12 +65,7 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric implements
     public static TypePlaceholder fresh(Token position){
 		return new TypePlaceholder(NameGenerator.makeNewName(), position, 0, true);
     }
-
-  public static TypePlaceholder fresh(Token position, PlaceholderRegistry placeholderRegistry){
-    String newName = placeholderRegistry.generateFreshPlaceholderName();
-    return new TypePlaceholder(newName, position, 0, true);
-  }
-
+    
     public static TypePlaceholder fresh(Token position, int variance, boolean wildcardable){
 		return new TypePlaceholder(NameGenerator.makeNewName(), position, variance, wildcardable);
     }
@@ -147,26 +139,4 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric implements
 	public Boolean getWildcardtable() {
 		return wildcardable;
 	}
-
-  @Override
-  public SerialMap toSerial(KeyStorage keyStorage) {
-    SerialMap serialized = new SerialMap();
-    serialized.put("name", this.name);
-    serialized.put("variance", this.variance);
-    serialized.put("wildcardable", this.wildcardable);
-
-    // create the wrapper and put this as the object
-    var serializedWrapper = super.toSerial(keyStorage).assertType(SerialMap.class);
-    serializedWrapper.put("object", serialized);
-    return serializedWrapper;
-  }
-
-  public static TypePlaceholder fromSerial(SerialMap data, UnifyContext context) {
-    return new TypePlaceholder(
-      data.getValue("name").getOf(String.class),
-      new NullToken(),
-      data.getValue("variance").getOf(Integer.class),
-      data.getValue("wildcardable").getOf(Boolean.class)
-    );
-  }
 }

src/main/java/de/dhbwstuttgart/syntaxtree/type/Void.java

@@ -1,32 +1,14 @@
 package de.dhbwstuttgart.syntaxtree.type;
 
-import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.ISerialNode;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import org.antlr.v4.runtime.Token;
 
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 
 
-public class Void extends RefType implements ISerializableData
+public class Void extends RefType
 {
     public Void(Token offset) {
         super(JavaClassName.Void, offset);
     }
-
-    @Override
-    public ISerialNode toSerial(KeyStorage keyStorage) {
-        // create the wrapper and put this as the object
-        var serializedWrapper = super.toSerial(keyStorage).assertType(SerialMap.class);
-        serializedWrapper.put("object", new SerialMap());
-        return serializedWrapper;
-    }
-
-    public static Void fromSerial(SerialMap data, UnifyContext context) {
-        return new Void(new NullToken());
-    }
 }
 

src/main/java/de/dhbwstuttgart/target/Target.java

@@ -1,8 +0,0 @@
-package de.dhbwstuttgart.target;
-
-import de.dhbwstuttgart.util.Logger;
-
-public class Target {
-  public static Logger logger = new Logger("Target");
-
-}

src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java

@@ -1,8 +1,8 @@
-
 package de.dhbwstuttgart.target.generate;
 
 import de.dhbwstuttgart.bytecode.FunNGenerator;
 import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.environment.ByteArrayClassLoader;
 import de.dhbwstuttgart.environment.IByteArrayClassLoader;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.NullToken;
@@ -12,14 +12,12 @@ import de.dhbwstuttgart.syntaxtree.Record;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
-import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
-import de.dhbwstuttgart.syntaxtree.visual.OutputGenerator;
-import de.dhbwstuttgart.target.Target;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
 import de.dhbwstuttgart.typeinference.result.*;
 
+import java.lang.annotation.Target;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -38,6 +36,7 @@ public class ASTToTargetAST {
     public Generics generics;
     public List<Generics> currentMethodOverloads;
 
+    final Map<ClassOrInterface, Set<GenericTypeVar>> userDefinedGenerics = new HashMap<>();
     final Map<Method, Set<SignaturePair>> tphsInMethods = new HashMap<>();
     private Method currentMethod;
 
@@ -62,19 +61,17 @@ public class ASTToTargetAST {
     }
 
     public record Generics(JavaGenerics javaGenerics, TxGenerics txGenerics) {
-        public Generics(JavaTXCompiler compiler, ResultSet set) {
-            this(new JavaGenerics(compiler, set), new TxGenerics(compiler, set));
-        }
     }
 
+
     public IByteArrayClassLoader classLoader;
     protected SourceFile sourceFile;
 
-    public ASTToTargetAST(List<ResultSet> resultSets, IByteArrayClassLoader classLoader) {
-        this(null, resultSets, classLoader);
+    public ASTToTargetAST(List<ResultSet> resultSets) {
+        this(null, resultSets);
     }
-    public ASTToTargetAST(JavaTXCompiler compiler, List<ResultSet> resultSets, IByteArrayClassLoader classLoader) {
-        this(compiler, resultSets, null, classLoader);
+    public ASTToTargetAST(JavaTXCompiler compiler, List<ResultSet> resultSets) {
+        this(compiler, resultSets, null, new ByteArrayClassLoader());
     }
 
     public ASTToTargetAST(JavaTXCompiler compiler, List<ResultSet> resultSets, SourceFile sourceFile, IByteArrayClassLoader classLoader) {
@@ -84,9 +81,9 @@ public class ASTToTargetAST {
 
         all = new ArrayList<>();
         for (var set : resultSets) {
-            all.add(new Generics(compiler, set));
+            all.add(new Generics(new JavaGenerics(this, set), new TxGenerics(this, set)));
         }
-        this.generics = all.getFirst();
+        this.generics = all.get(0);
     }
 
     public void addSignaturePair(TypePlaceholder signature, RefTypeOrTPHOrWildcardOrGeneric parameter) {
@@ -96,13 +93,9 @@ public class ASTToTargetAST {
     }
 
     Optional<Method> findMethod(ClassOrInterface owner, String name, List<TargetType> argumentList) {
-        return findMethod(owner, name, argumentList, this.generics.javaGenerics, this.compiler);
-    }
-
-    public static Optional<Method> findMethod(ClassOrInterface owner, String name, List<TargetType> argumentList, GenerateGenerics generics, JavaTXCompiler compiler) {
         Optional<Method> method = Optional.empty();
         while (method.isEmpty()) {
-            method = owner.getMethods().stream().filter(m -> m.name.equals(name) && parameterEquals(m.getParameterList(), argumentList, generics)).findFirst();
+            method = owner.getMethods().stream().filter(m -> m.name.equals(name) && parameterEquals(m.getParameterList(), argumentList)).findFirst();
             if (owner.getClassName().toString().equals("java.lang.Object")) break;
             owner = compiler.getClass(owner.getSuperClass().getName());
         }
@@ -110,16 +103,16 @@ public class ASTToTargetAST {
     }
 
     Optional<Constructor> findConstructor(ClassOrInterface owner, List<TargetType> argumentList) {
-        return owner.getConstructors().stream().filter(c -> parameterEquals(c.getParameterList(), argumentList, generics.javaGenerics)).findFirst();
+        return owner.getConstructors().stream().filter(c -> parameterEquals(c.getParameterList(), argumentList)).findFirst();
     }
 
-    static boolean parameterEquals(ParameterList parameterList, List<TargetType> arguments, GenerateGenerics generics) {
+    boolean parameterEquals(ParameterList parameterList, List<TargetType> arguments) {
         var pars = parameterList.getFormalparalist();
         if (pars.size() != arguments.size())
             return false;
 
         for (var i = 0; i < pars.size(); i++) {
-            var type1 = generics.getTargetType(pars.get(i).getType());
+            var type1 = convert(pars.get(i).getType(), generics.javaGenerics);
             var type2 = arguments.get(i);
             if (type1 instanceof TargetGenericType)
                 return true;
@@ -152,25 +145,49 @@ public class ASTToTargetAST {
         return ret;
     }
 
+    // This is used to serve as a custom equality to signature that performs a weak check without going into record patterns.
+    // The two signatures are considered equal if all the argument types match.
+    // This also turns equal if both types implement a sealed super interface
+    class PatternSignature {
+        final TargetMethod.Signature signature;
+        final String name;
+        PatternSignature(String name, TargetMethod.Signature signature) {
+            this.signature = signature;
+            this.name = name;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof PatternSignature other)) return false;
+            if (!this.name.equals(other.name)) return false;
+            if (other.signature.parameters().size() != signature.parameters().size()) return false;
+            for (var i = 0; i < signature.parameters().size(); i++) {
+                var p1 = signature.parameters().get(i).pattern().type();
+                var p2 = other.signature.parameters().get(i).pattern().type();
+                if (p1 instanceof TargetGenericType && p2 instanceof TargetGenericType) continue;
+                if (!p1.equals(p2) && commonSuperInterfaceTypes(p1, p2).isEmpty()) return false;
+            }
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            return signature.parameters().size();
+        }
+    }
+
     // This finds a common sealed interface type to group together methods that use different records
     private List<ClassOrInterface> commonSuperInterfaceTypes(TargetType a, TargetType b) {
-        if (a instanceof TargetGenericType && b instanceof TargetGenericType) return List.of(ASTFactory.createObjectClass());
-        if (a instanceof TargetRefType ta && b instanceof TargetGenericType)
-            return List.of(compiler.getClass(new JavaClassName(ta.name())));
-        if (b instanceof TargetRefType tb && a instanceof TargetGenericType)
-            return List.of(compiler.getClass(new JavaClassName(tb.name())));
-
+        if (a instanceof TargetGenericType && b instanceof TargetGenericType) return List.of(ASTFactory.createClass(Object.class));
         if (a instanceof TargetRefType ta && b instanceof TargetRefType tb) {
             var res = new HashSet<ClassOrInterface>();
 
             var cla = compiler.getClass(new JavaClassName(ta.name()));
             var clb = compiler.getClass(new JavaClassName(tb.name()));
 
-            if (cla.equals(clb)) return List.of(cla);
-
-            while (!cla.equals(ASTFactory.createObjectClass())) {
+            while (!cla.equals(ASTFactory.createClass(Object.class))) {
                 var clb2 = clb;
-                while (!clb2.equals(ASTFactory.createObjectClass())) {
+                while (!clb2.equals(ASTFactory.createClass(Object.class))) {
                     for (var intfa : cla.getSuperInterfaces()) {
                         for (var intfb : clb.getSuperInterfaces()) {
                             if (intfa.equals(intfb)) {
@@ -190,181 +207,57 @@ public class ASTToTargetAST {
         return List.of();
     }
 
-    // TODO This is ugly and probably doesn't work right
-    private boolean patternStrictlyEquals(TargetComplexPattern a, TargetComplexPattern b) {
-        if (!a.name().equals(b.name())) return false;
-        if (a.subPatterns().size() != b.subPatterns().size()) return false;
-        for (var i = 0; i < a.subPatterns().size(); i++) {
-            var p1 = a.subPatterns().get(i);
-            var p2 = b.subPatterns().get(i);
-            if (p1 instanceof TargetComplexPattern pc1 && p2 instanceof TargetComplexPattern pc2 &&
-                patternStrictlyEquals(pc1, pc2)) return false;
-            if (p1 instanceof TargetTypePattern pt1 && p2 instanceof TargetTypePattern pt2) {
-                if (pt1.type() instanceof TargetGenericType && pt2.type() instanceof TargetGenericType) continue;
-            }
-            if (!p1.type().equals(p2.type()) && commonSuperInterfaceTypes(p1.type(), p2.type()).isEmpty()) return false;
-        }
-        return true;
-    }
-
-    private boolean canCombine(TargetMethod m1, TargetMethod m2) {
-        if (!m1.name().equals(m2.name())) return false;
-        var s1 = m1.signature();
-        var s2 = m2.signature();
-        if (s1.parameters().size() != s2.parameters().size()) return false;
-        if (s1.parameters().isEmpty()) return false;
-        for (var i = 0; i < s1.parameters().size(); i++) {
-            var p1 = s1.parameters().get(i).pattern();
-            var p2 = s2.parameters().get(i).pattern();
-            if (p1.type() instanceof TargetGenericType || p2.type() instanceof TargetGenericType) continue;
-            if (p1 instanceof TargetComplexPattern pc1 && p2 instanceof TargetComplexPattern pc2 &&
-                patternStrictlyEquals(pc1, pc2)) return false;
-            if (!p1.equals(p2) && commonSuperInterfaceTypes(p1.type(), p2.type()).isEmpty()) return false;
-        }
-        return true;
-    }
-
-    private record Combination(TargetMethod a, TargetMethod b) {
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof Combination(TargetMethod a1, TargetMethod b1))) return false;
-            return this.a.equals(a1) && this.b.equals(b1) ||
-                this.a.equals(b1) && this.b.equals(a1);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(a) + Objects.hashCode(b);
-        }
-    }
-
     public List<List<TargetMethod>> groupOverloads(ClassOrInterface input, List<Method> methods) {
-        var mapOfTargetMethods = new HashMap<Generics, TargetMethod[]>();
-        for (var generics : all) {
-            mapOfTargetMethods.put(generics, new TargetMethod[methods.size()]);
-        }
-
-        for (var i = 0; i < methods.size(); i++) {
-            var method = methods.get(i);
+        var mapOfSignatures = new HashMap<PatternSignature, List<TargetMethod>>();
+        for (var method : methods) {
             // Convert all methods
             var methodsWithTphs = convert(input, method);
-            for (var m : methodsWithTphs) {
-                var resultMethods = mapOfTargetMethods.get(m.generics);
-                resultMethods[i] = m.method;
-            }
-        }
-        /*System.out.println("============== INPUT ==============");
-        for (var m : mapOfTargetMethods.values()) {
-            for (var v : m) System.out.println(v.name() + " " + v.getSignature());
-            System.out.println();
-        }*/
+            // Then check for methods with the same signature
+            var resMethods = new HashSet<MethodWithTphs>();
 
-        var allCombinations = new HashSet<Set<Combination>>();
-        // Combine methods based on their signature and position in the result set
-        for (var g1 : all) {
-            var resMeth1 = mapOfTargetMethods.get(g1);
-            for (var i = 0; i < methods.size(); i++) {
-                var m1 = resMeth1[i];
-                if (m1 == null) continue;
-
-                for (var g2 : all) {
-                    if (g1 == g2) continue; // No need to combine the same method
-                    var resMeth2 = mapOfTargetMethods.get(g2);
-                    var m2 = resMeth2[i];
-                    if (m2 == null) continue;
-
-                    var combinations = new HashSet<Combination>();
-
-                    if (canCombine(m1, m2)) {
-                        //System.out.println("     Combining " + m1.getSignature() + " and " + m2.getSignature());
-                        combinations.add(new Combination(m1, m2));
-                        for (var j = 0; j < methods.size(); j++) {
-                            if (j == i) continue;
-                            var m3 = resMeth2[j];
-                            if (m3 == null) continue;
-                            var m4 = resMeth1[j];
-                            if (m4 == null) continue;
-                            combinations.add(new Combination(m4, m3));
-                            //System.out.println("Also Combining " + m4.getSignature() + " and " + m3.getSignature());
-                        }
-                    } else {
-                        //System.out.println(" Not Combining " + m1.getSignature() + " and " + m2.getSignature());
-                    }
-                    if (!combinations.isEmpty()) allCombinations.add(combinations);
-                }
-            }
-        }
-
-        if (allCombinations.isEmpty()) allCombinations.add(new HashSet<>());
-
-        // Combine back into output format
-        var r0 = new HashSet<Set<TargetMethod>>();
-        for (var combinations : allCombinations) {
-            var r1 = new HashSet<Set<TargetMethod>>();
-            // This is used to weed out duplicates
-            var uniqued = new HashSet<TargetMethod>();
-            // We go over all methods in the result
-            for (var g : all) for (var i = 0; i < methods.size(); i++) {
-                var r2 = new HashSet<TargetMethod>();
-                var m = mapOfTargetMethods.get(g)[i];
-                if (m == null) continue;
-                if (!uniqued.contains(m)) {
-                    // Add the method to r2
-                    r2.add(m);
-                    uniqued.add(m);
-                } else continue;
-                // Find all combinations that contain the method and add them to the result
-                // if not filtered out by uniqued
-                for (var c : combinations) {
-                    if (c.a.equals(m) || c.b.equals(m)) {
-                        if (!uniqued.contains(c.a)) {
-                            r2.add(c.a);
-                            uniqued.add(c.a);
-                        }
-                        if (!uniqued.contains(c.b)) {
-                            r2.add(c.b);
-                            uniqued.add(c.b);
+            outer:
+            for (var m1 : methodsWithTphs) {
+                for (var m2 : methodsWithTphs) {
+                    for (var i = 0; i < m1.args.size(); i++) {
+                        var arg1 = m1.args.get(i);
+                        var arg2 = m2.args.get(i);
+                        if (arg1.parameter.equals(arg2.parameter)) {
+                            if (isSupertype(arg1.signature, arg2.signature) &&
+                                    !arg1.signature.equals(arg2.signature)) continue outer;
                         }
                     }
                 }
-                r1.add(r2);
+                resMethods.add(m1);
             }
-            outer: for (var s1 : r1) {
-                for (var s2 : new HashSet<>(r0)) {
-                    if (s2.containsAll(s1)) {
-                        continue outer;
-                    } else if (s1.containsAll(s2)) {
-                        r0.remove(s2);
-                        r0.add(s1);
-                        continue outer;
-                    }
-                }
-                r0.add(s1);
+
+            for (var m : resMethods) {
+                var signature = new PatternSignature(m.method.name(), m.method.signature());
+                var methodsWithSameSignature = mapOfSignatures.getOrDefault(signature, new ArrayList<>());
+                methodsWithSameSignature.add(m.method);
+                mapOfSignatures.put(signature, methodsWithSameSignature);
             }
         }
 
-        var result = r0.stream().map(l -> l.stream().toList()).toList();
-
-        Target.logger.info("============== OUTPUT ==============");
-        for (var l : result) {
-            for (var m : l) Target.logger.info(m.name() + " " + m.getSignature());
-            Target.logger.info("");
-        }
-        return result;
+        return mapOfSignatures.values().stream().toList();
     }
 
     public TargetStructure convert(ClassOrInterface input) {
         Set<TargetGeneric> javaGenerics = new HashSet<>();
         Set<TargetGeneric> txGenerics = new HashSet<>();
 
-        var userDefinedGenerics = input.getUserDefinedGenerics();
-        if (!userDefinedGenerics.isEmpty()) {
+        var genericsIter = input.getGenerics().iterator();
+        if (genericsIter.hasNext()) {
             // Add empty set of generics to cache so that it doesn't try to calculate it later
-            for (var generic : userDefinedGenerics) {
-                // TODO Support multiple bouds
-                javaGenerics.add(new TargetGeneric(generic.getName(), convert(generic.getBounds().getFirst())));
+            var userDefinedGenerics = new HashSet<GenericTypeVar>();
+            this.userDefinedGenerics.put(input, userDefinedGenerics);
+            while (genericsIter.hasNext()) {
+                var next = genericsIter.next();
+                userDefinedGenerics.add(next);
+                // TODO Support multiple bounds
+                javaGenerics.add(new TargetGeneric(next.getName(), convert(next.getBounds().get(0))));
             }
         } else {
+            this.userDefinedGenerics.put(input, new HashSet<>());
             // Generate generics only if there are no user defined ones
             javaGenerics = convert(generics.javaGenerics.generics(input), generics.javaGenerics);
             txGenerics = convert(generics.txGenerics.generics(input), generics.txGenerics);
@@ -378,8 +271,7 @@ public class ASTToTargetAST {
         var superInterfaces = input.getSuperInterfaces().stream().map(clazz -> convert(clazz, generics.javaGenerics)).toList();
         var constructors = input.getConstructors().stream().map(constructor -> this.convert(input, constructor, finalFieldInitializer)).flatMap(List::stream).toList();
         var fields = input.getFieldDecl().stream().map(this::convert).toList();
-        var methods = groupOverloads(input, input.getMethods()).stream().map(m -> generatePatternOverloads(input, m)).flatMap(List::stream)
-                .collect(Collectors.toSet()).stream().toList(); // Unique generated methods
+        var methods = groupOverloads(input, input.getMethods()).stream().map(m -> generatePatternOverloads(input, m)).flatMap(List::stream).toList();
 
         TargetMethod staticConstructor = null;
         if (input.getStaticInitializer().isPresent())
@@ -426,7 +318,7 @@ public class ASTToTargetAST {
     }
 
     private List<TargetConstructor> convert(ClassOrInterface currentClass, Constructor input, TargetBlock fieldInitializer) {
-        generics = all.getFirst();
+        generics = all.get(0);
         List<TargetConstructor> result = new ArrayList<>();
         Set<List<MethodParameter>> parameterSet = new HashSet<>();
         this.currentMethod = input;
@@ -470,6 +362,13 @@ public class ASTToTargetAST {
         }
     }
 
+    private TargetType unwrap(TargetType type) {
+        if (type instanceof TargetRefType ref) {
+            if (!ref.params().isEmpty()) return new TargetRefType(ref.name());
+        }
+        return type;
+    }
+
     private TargetExpression generatePatternOverloadsRec(int offset, TargetExpression switchExpr, List<TargetLocalVar> params, List<TargetPattern> patterns, List<TargetMethod> methods, TargetType classType) {
         if (methods.isEmpty()) throw new DebugException("Couldn't find a candidate for switch overloading");
         if (methods.size() == 1) {
@@ -494,7 +393,7 @@ public class ASTToTargetAST {
         }
 
         var cases = new ArrayList<TargetSwitch.Case>();
-        var usedPatterns = new HashSet<TargetPattern>();
+        var usedPatterns = new HashSet<TargetType>();
 
         for (var method : methods) {
             var patternsRec = new ArrayList<>(patterns);
@@ -514,8 +413,9 @@ public class ASTToTargetAST {
             }
 
             var lastPattern = patternsRec.getLast();
-            if (usedPatterns.contains(lastPattern)) continue;
-            usedPatterns.add(lastPattern);
+            var type = unwrap(lastPattern.type());
+            if (usedPatterns.contains(type)) continue;
+            usedPatterns.add(type);
 
             var candidates = methods.stream().filter(m -> {
                 var j = 0;
@@ -561,12 +461,9 @@ public class ASTToTargetAST {
                 var t3 = m.signature().parameters().get(i).pattern().type();
                 commonSubTypes.retainAll(commonSuperInterfaceTypes(t1, t3));
             }
-            if (commonSubTypes.size() > 1) throw new DebugException("Invalid overload");
+            if (commonSubTypes.size() != 1) throw new DebugException("Invalid overload");
             // TODO accept multiple types
-            var superType = ASTFactory.createObjectClass();
-            if (!commonSubTypes.isEmpty())
-                superType = commonSubTypes.iterator().next();
-
+            var superType = commonSubTypes.iterator().next();
             String name;
             if (p1 instanceof TargetComplexPattern) name = "__var" + i;
             else name = p1.name();
@@ -636,19 +533,7 @@ public class ASTToTargetAST {
         }).findFirst();
     }
 
-    record MethodWithTphs(TargetMethod method, Generics generics, List<SignaturePairTarget> args) {
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof MethodWithTphs that)) return false;
-            return Objects.equals(method, that.method) && Objects.equals(args, that.args);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(method, args);
-        }
-    }
+    record MethodWithTphs(TargetMethod method, List<SignaturePairTarget> args) {}
 
     record Signature(TargetMethod.Signature java, TargetMethod.Signature tx, Generics generics) {}
 
@@ -697,7 +582,7 @@ public class ASTToTargetAST {
             var newMethod = new TargetMethod(method.modifier, method.name, convert(method.block), signature.java, signature.tx);
             var concreteParams = tphsInMethods.getOrDefault(method, new HashSet<>()).stream().map(sig -> new SignaturePairTarget(convert(sig.signature), convert(sig.parameter))).toList();
 
-            result.add(new MethodWithTphs(newMethod, generics, concreteParams));
+            result.add(new MethodWithTphs(newMethod, concreteParams));
         }
 
         return result;
@@ -740,6 +625,11 @@ public class ASTToTargetAST {
         return new TargetField(input.modifier, convert(input.getType(), generics.javaGenerics), input.getName());
     }
 
+    private final Map<String, FunNGenerator.GenericParameters> usedFunN = new HashMap<>();
+    private final Set<Integer> usedFunNSuperTypes = new HashSet<>();
+
+    public Map<String, byte[]> auxiliaries = new HashMap<>();
+
     public TargetType convert(RefTypeOrTPHOrWildcardOrGeneric input) {
         return convert(input, generics.javaGenerics);
     }
@@ -772,15 +662,7 @@ public class ASTToTargetAST {
         return TargetFunNType.fromParams(params, filteredParams, gep.getReturnType() != null ? 1 : 0);
     }
 
-    private FunNGenerator.GenericParameters convertToParameters(TargetFunNType input) {
-        return null;
-    }
-
     private boolean isSubtype(TargetType test, TargetType other) {
-        if (other.equals(TargetType.Object)) return true;
-        if (test instanceof TargetFunNType tfun && other instanceof TargetFunNType ofun)
-            return isSubtype(new FunNGenerator.GenericParameters(tfun), new FunNGenerator.GenericParameters(ofun));
-
         var testClass = compiler.getClass(new JavaClassName(test.name()));
         var otherClass = compiler.getClass(new JavaClassName(other.name()));
         if (testClass == null) return false;
@@ -808,24 +690,28 @@ public class ASTToTargetAST {
     }
 
     public void generateFunNTypes() {
-        for (var entry : compiler.usedFunN.entrySet()) {
+        for (var entry : usedFunN.entrySet()) {
             var gep = entry.getValue();
-            var superInterfaces = compiler.usedFunN.values().stream()
+            var superInterfaces = usedFunN.values().stream()
                 .filter(g -> !g.equals(gep))
                 .filter(genericParameters -> isSubtype(gep, genericParameters))
                 .map(FunNGenerator::getSpecializedClassName)
                 .toList();
 
             var code = FunNGenerator.generateSpecializedBytecode(gep, superInterfaces);
-            compiler.auxiliaries.put(entry.getKey(), code);
+
+            try {
+                classLoader.findClass(entry.getKey());
+            } catch (ClassNotFoundException e) {
+                try {
+                    classLoader.loadClass(code);
+                } catch (LinkageError ignored) {}
+            }
+            auxiliaries.put(entry.getKey(), code);
         }
     }
 
-    public TargetType convert(RefTypeOrTPHOrWildcardOrGeneric input, GenerateGenerics generics) {
-        return convert(input, generics, compiler);
-    }
-
-    public static TargetType convert(RefTypeOrTPHOrWildcardOrGeneric input, GenerateGenerics generics, JavaTXCompiler compiler) {
+    protected TargetType convert(RefTypeOrTPHOrWildcardOrGeneric input, GenerateGenerics generics) {
         return input.acceptTV(new TypeVisitor<>() {
             @Override
             public TargetType visit(RefType refType) {
@@ -837,24 +723,31 @@ public class ASTToTargetAST {
                 }
 
                 var params = refType.getParaList().stream().map(type -> {
-                    return convert(type, generics, compiler);
+                    return convert(type, generics);
                 }).toList();
 
                 if (name.matches("Fun\\d+\\$\\$")) { // TODO This seems like a bad idea
                     var returnType = FunNGenerator.getReturnType(params);
                     var className = FunNGenerator.getSpecializedClassName(FunNGenerator.getArguments(params), returnType);
-                    if (!compiler.usedFunNSuperTypes.contains(params.size())) {
-                        compiler.usedFunNSuperTypes.add(params.size());
+                    if (!usedFunNSuperTypes.contains(params.size())) {
+                        usedFunNSuperTypes.add(params.size());
                         var code = FunNGenerator.generateSuperBytecode(params.size() - 1, returnType != null ? 1 : 0);
                         var superClassName = FunNGenerator.getSuperClassName(params.size() - 1, returnType != null ? 1 : 0);
-                        compiler.auxiliaries.put(superClassName, code);
+                        try {
+                            classLoader.findClass(superClassName);
+                        } catch (ClassNotFoundException e) {
+                            try {
+                                classLoader.loadClass(code);
+                            } catch (LinkageError ignored) {}
+                        }
+                        auxiliaries.put(superClassName, code);
                     }
                     FunNGenerator.GenericParameters gep = null;
-                    if (!compiler.usedFunN.containsKey(className)) {
+                    if (!usedFunN.containsKey(className)) {
                         gep = new FunNGenerator.GenericParameters(params, returnType != null ? 1 : 0);
-                        compiler.usedFunN.put(className, gep);
+                        usedFunN.put(className, gep);
                     } else {
-                        gep = compiler.usedFunN.get(className);
+                        gep = usedFunN.get(className);
                     }
                     return flattenFunNType(params, gep);
                 }
@@ -863,7 +756,7 @@ public class ASTToTargetAST {
 
             @Override
             public TargetType visit(SuperWildcardType superWildcardType) {
-                return new TargetSuperWildcard(convert(superWildcardType.getInnerType(), generics, compiler));
+                return new TargetSuperWildcard(convert(superWildcardType.getInnerType(), generics));
             }
 
             @Override
@@ -873,7 +766,7 @@ public class ASTToTargetAST {
 
             @Override
             public TargetType visit(ExtendsWildcardType extendsWildcardType) {
-                return new TargetExtendsWildcard(convert(extendsWildcardType.getInnerType(), generics, compiler));
+                return new TargetExtendsWildcard(convert(extendsWildcardType.getInnerType(), generics));
             }
 
             @Override

src/main/java/de/dhbwstuttgart/target/generate/GenerateGenerics.java

@@ -1,13 +1,10 @@
 package de.dhbwstuttgart.target.generate;
 
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.parser.JavaTXParser;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.syntaxtree.type.Void;
-import de.dhbwstuttgart.target.Target;
 import de.dhbwstuttgart.target.tree.type.TargetGenericType;
 import de.dhbwstuttgart.target.tree.type.TargetType;
 import de.dhbwstuttgart.typeinference.result.PairTPHEqualTPH;
@@ -21,7 +18,7 @@ import java.util.stream.Stream;
 
 public abstract class GenerateGenerics {
 
-    private final JavaTXCompiler compiler;
+    private final ASTToTargetAST astToTargetAST;
 
     public class TPH {
         private final TypePlaceholder wrap;
@@ -137,21 +134,21 @@ public abstract class GenerateGenerics {
     Map<TPH, RefTypeOrTPHOrWildcardOrGeneric> concreteTypes = new HashMap<>();
     Map<TypePlaceholder, TypePlaceholder> equality = new HashMap<>();
 
-    GenerateGenerics(JavaTXCompiler compiler, ResultSet constraints) {
-        this.compiler = compiler;
+    GenerateGenerics(ASTToTargetAST astToTargetAST, ResultSet constraints) {
+        this.astToTargetAST = astToTargetAST;
         for (var constraint : constraints.results) {
             if (constraint instanceof PairTPHsmallerTPH p) {
-                Target.logger.info(p.left + " " + p.left.getVariance());
+                System.out.println(p.left + " " + p.left.getVariance());
                 simplifiedConstraints.add(new PairLT(new TPH(p.left), new TPH(p.right)));
             } else if (constraint instanceof PairTPHEqualTPH p) {
                 equality.put(p.getLeft(), p.getRight());
             } else if (constraint instanceof PairTPHequalRefTypeOrWildcardType p) {
-                Target.logger.info(p.left + " = " + p.right);
+                System.out.println(p.left + " = " + p.right);
                 concreteTypes.put(new TPH(p.left), p.right);
             }
         }
 
-        Target.logger.info("Simplified constraints: " + simplifiedConstraints);
+        System.out.println("Simplified constraints: " + simplifiedConstraints);
     }
 
     /*public record GenericsState(Map<TPH, RefTypeOrTPHOrWildcardOrGeneric> concreteTypes, Map<TypePlaceholder, TypePlaceholder> equality) {}
@@ -251,7 +248,7 @@ public abstract class GenerateGenerics {
                 equality.put(entry.getKey(), to);
             }
         }
-        Target.logger.info(from + " -> " + to + " " + from.getVariance());
+        System.out.println(from + " -> " + to + " " + from.getVariance());
         //from.setVariance(to.getVariance());
         equality.put(from, to);
         referenced.remove(new TPH(from));
@@ -284,7 +281,7 @@ public abstract class GenerateGenerics {
             Set<TPH> typeVariablesOfClass,
             Set<Pair> result
     ) {
-        var userDefinedGenericsOfClass = owner.getUserDefinedGenerics();
+        var userDefinedGenericsOfClass = astToTargetAST.userDefinedGenerics.get(owner);
 
         // Type variables with bounds that are also type variables of the method
         for (var typeVariable : new HashSet<>(typeVariables)) {
@@ -320,7 +317,7 @@ public abstract class GenerateGenerics {
                     Set<TPH> T2s = new HashSet<>();
                     findTphs(superType, T2s);
 
-                    Target.logger.info("T1s: " + T1s + " T2s: " + T2s);
+                    System.out.println("T1s: " + T1s + " T2s: " + T2s);
                     //Ende
 
                     superType = methodCall.receiverType;
@@ -332,10 +329,10 @@ public abstract class GenerateGenerics {
 
                     if (methodCall.receiver instanceof ExpressionReceiver expressionReceiver) {
                         if (expressionReceiver.expr instanceof This) {
-                            var optMethod = ASTToTargetAST.findMethod(owner, methodCall.name, methodCall.signatureArguments().stream().map(x -> getTargetType(x)).toList(), GenerateGenerics.this, compiler);
+                            var optMethod = astToTargetAST.findMethod(owner, methodCall.name, methodCall.signatureArguments().stream().map(astToTargetAST::convert).toList());
                             if (optMethod.isEmpty()) return;
                             var method2 = optMethod.get();
-                            Target.logger.info("In: " + method.getName() + " Method: " + method2.getName());
+                            System.out.println("In: " + method.getName() + " Method: " + method2.getName());
                             var generics = family(owner, method2);
 
                             // transitive and
@@ -368,7 +365,7 @@ public abstract class GenerateGenerics {
                                                     if (!T1s.contains(R1) || !T2s.contains(R2)) continue;
 
                                                     var newPair = new PairLT(R1, R2);
-                                                    Target.logger.info("New pair: " + newPair);
+                                                    System.out.println("New pair: " + newPair);
                                                     newPairs.add(newPair);
 
                                                     if (!containsRelation(result, newPair))
@@ -570,7 +567,7 @@ public abstract class GenerateGenerics {
     Set<Pair> generics(ClassOrInterface owner, Method method) {
         if (computedGenericsOfMethods.containsKey(method)) {
             var cached = computedGenericsOfMethods.get(method);
-            Target.logger.info("Cached " + method.getName() + ": " + cached);
+            System.out.println("Cached " + method.getName() + ": " + cached);
             return cached;
         }
 
@@ -599,7 +596,7 @@ public abstract class GenerateGenerics {
 
         normalize(result, classGenerics, usedTphs);
 
-        Target.logger.info(this.getClass().getSimpleName() + " " + method.name + ": " + result);
+        System.out.println(this.getClass().getSimpleName() + " " + method.name + ": " + result);
         return result;
     }
 
@@ -678,7 +675,7 @@ public abstract class GenerateGenerics {
 
         normalize(javaResult, null, referencedByClass);
 
-        Target.logger.info(this.getClass().getSimpleName() + " Class " + classOrInterface.getClassName().getClassName() + ": " + javaResult);
+        System.out.println(this.getClass().getSimpleName() + " Class " + classOrInterface.getClassName().getClassName() + ": " + javaResult);
         return javaResult;
     }
 
@@ -729,7 +726,7 @@ public abstract class GenerateGenerics {
                     if (!added) break;
                 }
 
-                Target.logger.info(chain + " " + chain.stream().map(e -> e.resolve().getVariance()).toList());
+                System.out.println(chain + " " + chain.stream().map(e -> e.resolve().getVariance()).toList());
                 var variance = chain.get(0).resolve().getVariance();
                 if (variance != 1) continue;
                 var index = 0;
@@ -924,7 +921,7 @@ public abstract class GenerateGenerics {
                     for (var pair : infima) {
                         var returnTypes = findTypeVariables(method.getReturnType());
                         var chain = findConnectionToReturnType(returnTypes, input, new HashSet<>(), pair.left);
-                        Target.logger.info("Find: " + pair.left + " " + chain);
+                        System.out.println("Find: " + pair.left + " " + chain);
                         chain.remove(pair.left);
                         if (chain.size() > 0) {
                             for (var tph : chain)
@@ -962,8 +959,8 @@ public abstract class GenerateGenerics {
                         }
                     }
                     newTph.setVariance(variance);
-                    Target.logger.info(infima + " " + infima.stream().map(i -> i.right.resolve().getVariance()).toList());
-                    Target.logger.info("Infima new TPH " + newTph + " variance " + variance);
+                    System.out.println(infima + " " + infima.stream().map(i -> i.right.resolve().getVariance()).toList());
+                    System.out.println("Infima new TPH " + newTph + " variance " + variance);
 
                     //referenced.add(newTph);
                     addToPairs(input, new PairLT(left, new TPH(newTph)));
@@ -1008,8 +1005,8 @@ public abstract class GenerateGenerics {
             }
             var type = concreteTypes.get(new TPH(tph));
             if (type == null) return new TargetGenericType(tph.getName());
-            return ASTToTargetAST.convert(type, this, compiler);
+            return astToTargetAST.convert(type, this);
         }
-        return ASTToTargetAST.convert(in, this, compiler);
+        return astToTargetAST.convert(in, this);
     }
 }

src/main/java/de/dhbwstuttgart/target/generate/GenericsResult.java

@@ -69,4 +69,8 @@ public class GenericsResult {
             return this.generics.getType(tph);
         return type;
     }
+
+    public TargetType resolveTarget(RefTypeOrTPHOrWildcardOrGeneric type) {
+        return this.generics.getTargetType(type);
+    }
 }

src/main/java/de/dhbwstuttgart/target/generate/JavaGenerics.java

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.target.generate;
 
-import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
@@ -8,8 +7,8 @@ import de.dhbwstuttgart.typeinference.result.ResultSet;
 import java.util.Set;
 
 final class JavaGenerics extends GenerateGenerics {
-    JavaGenerics(JavaTXCompiler compiler, ResultSet constraints) {
-        super(compiler, constraints);
+    JavaGenerics(ASTToTargetAST astToTargetAST, ResultSet constraints) {
+        super(astToTargetAST, constraints);
     }
 
     @Override

src/main/java/de/dhbwstuttgart/target/generate/StatementToTargetExpression.java

@@ -8,14 +8,12 @@ import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
-import de.dhbwstuttgart.target.Target;
 import de.dhbwstuttgart.target.tree.MethodParameter;
 import de.dhbwstuttgart.target.tree.TargetMethod;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
 
 import java.lang.reflect.Modifier;
-import java.sql.Array;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
@@ -34,71 +32,54 @@ public class StatementToTargetExpression implements ASTVisitor {
         throw new NotImplementedException();
     }
 
-    private class LambdaCaptureFinder extends TracingStatementVisitor {
-
-        // TODO The same mechanism is implemented in Codegen, maybe use it from there?
-        final Stack<Set<String>> localVariables = new Stack<>();
-        private final List<MethodParameter> parameters;
-        private final List<MethodParameter> captures;
-
-        LambdaCaptureFinder(List<MethodParameter> parameters, List<MethodParameter> captures) {
-            localVariables.push(new HashSet<>());
-            this.parameters = parameters;
-            this.captures = captures;
-        }
-
-        boolean hasLocalVar(String name) {
-            for (var localVariables : this.localVariables) {
-                if (localVariables.contains(name))
-                    return true;
-            }
-            return false;
-        }
-
-        @Override
-        public void visit(Block block) {
-            localVariables.push(new HashSet<>());
-            super.visit(block);
-            localVariables.pop();
-        }
-
-        @Override
-        public void visit(LocalVar localVar) {
-            super.visit(localVar);
-            var capture = new MethodParameter(new TargetTypePattern(converter.convert(localVar.getType()), localVar.name));
-            if (!hasLocalVar(localVar.name) && !parameters.contains(capture) && !captures.contains(capture))
-                captures.add(capture);
-        }
-
-        @Override
-        public void visit(LocalVarDecl varDecl) {
-            var localVariables = this.localVariables.peek();
-            localVariables.add(varDecl.getName());
-        }
-
-        @Override
-        public void visit(LambdaExpression lambda) {
-            var newCaptures = new ArrayList<MethodParameter>();
-            var captureFinder = new LambdaCaptureFinder(createParameters(lambda), newCaptures);
-            lambda.methodBody.accept(captureFinder);
-            newCaptures.removeAll(parameters);
-            captures.addAll(newCaptures);
-        }
-    }
-
-    private List<MethodParameter> createParameters(LambdaExpression lambda) {
-        return StreamSupport.stream(lambda.params.spliterator(), false)
-            .map(p -> (FormalParameter) p)
-            .map(p -> new MethodParameter(new TargetTypePattern(converter.convert(p.getType()), p.getName())))
-            .toList();
-    }
-
     @Override
     public void visit(LambdaExpression lambdaExpression) {
-        var parameters = createParameters(lambdaExpression);
+        var parameters = StreamSupport.stream(lambdaExpression.params.spliterator(), false)
+                .map(p -> (FormalParameter) p)
+                .map(p -> new MethodParameter(new TargetTypePattern(converter.convert(p.getType()), p.getName())))
+                .toList();
+
         List<MethodParameter> captures = new ArrayList<>();
-        var visitor = new LambdaCaptureFinder(parameters, captures);
-        lambdaExpression.methodBody.accept(visitor);
+        lambdaExpression.methodBody.accept(new TracingStatementVisitor() {
+            // TODO The same mechanism is implemented in Codegen, maybe use it from there?
+            final Stack<Set<String>> localVariables = new Stack<>();
+            {
+                localVariables.push(new HashSet<>());
+            }
+
+            boolean hasLocalVar(String name) {
+                for (var localVariables : this.localVariables) {
+                    if (localVariables.contains(name))
+                        return true;
+                }
+                return false;
+            }
+
+            @Override
+            public void visit(Block block) {
+                localVariables.push(new HashSet<>());
+                super.visit(block);
+                localVariables.pop();
+            }
+
+            @Override
+            public void visit(LocalVar localVar) {
+                super.visit(localVar);
+                var capture = new MethodParameter(new TargetTypePattern(converter.convert(localVar.getType()), localVar.name));
+                if (!hasLocalVar(localVar.name) && !parameters.contains(capture) && !captures.contains(capture))
+                    captures.add(capture);
+            }
+
+            @Override
+            public void visit(LocalVarDecl varDecl) {
+                var localVariables = this.localVariables.peek();
+                localVariables.add(varDecl.getName());
+            }
+
+            @Override
+            public void visit(LambdaExpression lambda) {
+            } // Don't look at lambda expressions
+        });
 
         TargetMethod.Signature signature = new TargetMethod.Signature(Set.of(), parameters, converter.convert(lambdaExpression.getReturnType()));;
         var tpe = converter.convert(lambdaExpression.getType());
@@ -139,10 +120,7 @@ public class StatementToTargetExpression implements ASTVisitor {
 
     @Override
     public void visit(BoolExpression bool) {
-        result = switch(bool.operation) {
-        case OR -> new TargetBinaryOp.Or(converter.convert(bool.getType()), converter.convert(bool.lexpr), converter.convert(bool.rexpr));
-        case AND -> new TargetBinaryOp.And(converter.convert(bool.getType()), converter.convert(bool.lexpr), converter.convert(bool.rexpr));
-        };
+        System.out.println("BoolExpression");
     }
 
     @Override
@@ -162,6 +140,7 @@ public class StatementToTargetExpression implements ASTVisitor {
 
     @Override
     public void visit(FieldVar fieldVar) {
+        var isStatic = false;
         var type = converter.convert(fieldVar.receiver.getType());
         var clazz = converter.compiler.getClass(new JavaClassName(type.name()));
         var field = clazz.getField(fieldVar.fieldVarName).orElseThrow();
@@ -255,7 +234,7 @@ public class StatementToTargetExpression implements ASTVisitor {
             isInterface = receiverClass.isInterface();
         }
 
-        Target.logger.info(argList);
+        System.out.println(argList);
         result = new TargetMethodCall(converter.convert(methodCall.getType()), returnType, argList, converter.convert(methodCall.receiver), methodCall.getArgumentList().getArguments().stream().map(converter::convert).toList(), receiverType, methodCall.name, isStatic, isInterface, isPrivate);
     }
 

src/main/java/de/dhbwstuttgart/target/generate/TxGenerics.java

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.target.generate;
 
-import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
@@ -8,8 +7,8 @@ import de.dhbwstuttgart.typeinference.result.ResultSet;
 import java.util.Set;
 
 final class TxGenerics extends GenerateGenerics {
-    TxGenerics(JavaTXCompiler compiler, ResultSet constraints) {
-        super(compiler, constraints);
+    TxGenerics(ASTToTargetAST astToTargetAST, ResultSet constraints) {
+        super(astToTargetAST, constraints);
     }
 
     @Override

src/main/java/de/dhbwstuttgart/target/tree/TargetMethod.java

@@ -36,30 +36,30 @@ public record TargetMethod(int access, String name, TargetBlock block, Signature
     public static String getDescriptor(TargetType returnType, TargetType... parameters) {
         String ret = "(";
         for (var parameterType : parameters) {
-            ret += parameterType.toDescriptor();
+            ret += parameterType.toSignature();
         }
         ret += ")";
         if (returnType == null) ret += "V";
-        else ret += returnType.toDescriptor();
+        else ret += returnType.toSignature();
         return ret;
     }
 
     public static String getSignature(Set<TargetGeneric> generics, List<MethodParameter> parameters, TargetType returnType) {
         String ret = "";
-        if (!generics.isEmpty()) {
+        if (generics.size() > 0) {
             ret += "<";
             for (var generic : generics) {
-                ret += generic.name() + ":" + generic.bound().toSignature();
+                ret += generic.name() + ":" + generic.bound().toDescriptor();
             }
             ret += ">";
         }
         ret += "(";
         for (var param : parameters) {
-            ret += param.pattern().type().toSignature();
+            ret += param.pattern().type().toDescriptor();
         }
         ret += ")";
         if (returnType == null) ret += "V";
-        else ret += returnType.toSignature();
+        else ret += returnType.toDescriptor();
         return ret;
     }
 

src/main/java/de/dhbwstuttgart/target/tree/expression/TargetLiteral.java

@@ -8,42 +8,42 @@ public sealed interface TargetLiteral extends TargetExpression {
     record BooleanLiteral(Boolean value) implements TargetLiteral {
         @Override
         public TargetType type() {
-            return TargetType.boolean_;
+            return TargetType.Boolean;
         }
     }
 
     record CharLiteral(Character value) implements TargetLiteral {
         @Override
         public TargetType type() {
-            return TargetType.char_;
+            return TargetType.Char;
         }
     }
 
     record IntLiteral(Integer value) implements TargetLiteral {
         @Override
         public TargetType type() {
-            return TargetType.int_;
+            return TargetType.Integer;
         }
     }
 
     record LongLiteral(Long value) implements TargetLiteral {
         @Override
         public TargetType type() {
-            return TargetType.long_;
+            return TargetType.Long;
         }
     }
 
     record FloatLiteral(Float value) implements TargetLiteral {
         @Override
         public TargetType type() {
-            return TargetType.float_;
+            return TargetType.Float;
         }
     }
 
     record DoubleLiteral(Double value) implements TargetLiteral {
         @Override
         public TargetType type() {
-            return TargetType.double_;
+            return TargetType.Double;
         }
     }
 

src/main/java/de/dhbwstuttgart/target/tree/type/TargetExtendsWildcard.java

@@ -3,12 +3,12 @@ package de.dhbwstuttgart.target.tree.type;
 public record TargetExtendsWildcard(TargetType innerType) implements TargetType {
     @Override
     public String toSignature() {
-        return "+" + innerType.toSignature();
+        return innerType.toSignature();
     }
 
     @Override
     public String toDescriptor() {
-        return innerType.toDescriptor();
+        return "+" + innerType.toDescriptor();
     }
 
     @Override

src/main/java/de/dhbwstuttgart/target/tree/type/TargetFunNType.java

@@ -36,7 +36,6 @@ public record TargetFunNType(String name, List<TargetType> funNParams, List<Targ
 
     @Override
     public String toSignature() {
-        var args = FunNGenerator.getArguments(funNParams);
-        return "LFun" + args.size() + "$$" + TargetSpecializedType.signatureParameters(funNParams) + ";";
+        return "L" + getInternalName() + ";";
     }
 }

src/main/java/de/dhbwstuttgart/target/tree/type/TargetGenericType.java

@@ -2,12 +2,12 @@ package de.dhbwstuttgart.target.tree.type;
 
 public record TargetGenericType(String name) implements TargetType {
     @Override
-    public String toDescriptor() {
+    public String toSignature() {
         return "Ljava/lang/Object;"; // TODO Use bounds for this?
     }
 
     @Override
-    public String toSignature() {
+    public String toDescriptor() {
         return "T" + getInternalName() + ";";
     }
 

src/main/java/de/dhbwstuttgart/target/tree/type/TargetRefType.java

@@ -12,6 +12,11 @@ public record TargetRefType(String name, List<TargetType> params) implements Tar
         return this.name.replaceAll("\\.", "/");
     }
 
+    @Override
+    public String toSignature() {
+        return "L" + getInternalName() + ";";
+    }
+
     // Type erasure means we need to override hashCode and equals to only consider the name
     @Override
     public int hashCode() {

src/main/java/de/dhbwstuttgart/target/tree/type/TargetSpecializedType.java

@@ -6,27 +6,16 @@ public sealed interface TargetSpecializedType extends TargetType permits TargetF
     List<TargetType> params();
 
     @Override
-    default String toSignature() {
+    default String toDescriptor() {
         String ret = "L" + getInternalName();
-        ret += signatureParameters(params());
-        ret += ";";
-        return ret;
-    }
-
-    static String signatureParameters(List<TargetType> params) {
-        var ret = "";
-        if (!params.isEmpty()) {
+        if (params().size() > 0) {
             ret += "<";
-            for (var param : params) {
-                ret += param.toSignature();
+            for (var param : params()) {
+                ret += param.toDescriptor();
             }
             ret += ">";
         }
+        ret += ";";
         return ret;
     }
-
-    @Override
-    default String toDescriptor() {
-        return "L" + getInternalName() + ";";
-    }
 }

src/main/java/de/dhbwstuttgart/target/tree/type/TargetSuperWildcard.java

@@ -3,12 +3,12 @@ package de.dhbwstuttgart.target.tree.type;
 public record TargetSuperWildcard(TargetType innerType) implements TargetType {
     @Override
     public String toSignature() {
-        return "-" + innerType.toSignature();
+        return innerType.toSignature();
     }
 
     @Override
     public String toDescriptor() {
-        return innerType.toDescriptor();
+        return "-" + innerType.toDescriptor();
     }
 
     @Override

src/main/java/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java

@@ -9,8 +9,13 @@ import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 
+import org.antlr.v4.runtime.Token;
 
+import javax.swing.text.html.Option;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;

src/main/java/de/dhbwstuttgart/typeinference/assumptions/MethodAssumption.java

@@ -19,11 +19,11 @@ public class MethodAssumption extends Assumption{
     private ClassOrInterface receiver;
     private RefTypeOrTPHOrWildcardOrGeneric retType;
     List<? extends RefTypeOrTPHOrWildcardOrGeneric> params;
-    private final boolean isInherited;
-    private final boolean isOverridden;
+    private final Boolean isInherited;
+    private final Boolean isOverridden;
 
     public MethodAssumption(ClassOrInterface receiver, RefTypeOrTPHOrWildcardOrGeneric retType,
-                            List<? extends RefTypeOrTPHOrWildcardOrGeneric> params, TypeScope scope, boolean isInherited, boolean isOverridden){
+                            List<? extends RefTypeOrTPHOrWildcardOrGeneric> params, TypeScope scope, Boolean isInherited, Boolean isOverridden){
         super(scope);
         this.receiver = receiver;
         this.retType = retType;
@@ -73,11 +73,11 @@ public class MethodAssumption extends Assumption{
         return TYPEStmt.getReceiverType(receiver, resolver);
     }
     
-    public boolean isInherited() {
+    public Boolean isInherited() {
     	return isInherited;
     }
     
-    public boolean isOverridden() {
+    public Boolean isOverridden() {
     	return isOverridden;
     }
 }

src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java

@@ -1,24 +1,15 @@
 package de.dhbwstuttgart.typeinference.constraints;
 
-import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
-import de.dhbwstuttgart.server.packet.dataContainers.KeyStorage;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.ISerialNode;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialList;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialMap;
-import de.dhbwstuttgart.server.packet.dataContainers.serialized.SerialUUID;
-import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
+import java.util.Collection;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
-public class Constraint<A extends IConstraintElement> extends HashSet<A> implements Comparable<Constraint<A>>, ISerializableData {
+public class Constraint<A> extends HashSet<A> {
 	private static final long serialVersionUID = 1L;
-	private boolean isInherited = false;//wird beides nur für die Method-Constraints benoetigt
-	private boolean isImplemented = false;
+	private Boolean isInherited = false;//wird beides nur für die Method-Constraints benoetigt
+	private Boolean isImplemented = false;
 	
 	/*
 	 * wird verwendet um bei der Codegenerierung die richtige Methoden - Signatur
@@ -31,32 +22,28 @@ public class Constraint<A extends IConstraintElement> extends HashSet<A> impleme
 	public Constraint() {
 		super();
 	}
-
-  public Constraint(int initialCapacity) {
-    super(initialCapacity);
-  }
-
-	public Constraint(boolean isInherited, boolean isImplemented) {
+	
+	public Constraint(Boolean isInherited, Boolean isImplemented) {
 		this.isInherited = isInherited;
 		this.isImplemented = isImplemented;
 	}
 	
-	public Constraint(boolean isInherited, boolean isImplemented, Constraint<A> extendConstraint, Set<A> methodSignatureConstraint) {
+	public Constraint(Boolean isInherited, Boolean isImplemented, Constraint<A> extendConstraint, Set<A> methodSignatureConstraint) {
 		this.isInherited = isInherited;
 		this.isImplemented = isImplemented;
 		this.extendConstraint = extendConstraint;
 		this.methodSignatureConstraint = methodSignatureConstraint;
 	}
 	
-	public void setIsInherited(boolean isInherited) {
+	public void setIsInherited(Boolean isInherited) {
 		this.isInherited = isInherited;
 	}
 	
-	public boolean isInherited() {
+	public Boolean isInherited() {
 		return isInherited;
 	}
 	
-	public boolean isImplemented() {
+	public Boolean isImplemented() {
 		return isImplemented;
 	}
 	
@@ -76,96 +63,15 @@ public class Constraint<A extends IConstraintElement> extends HashSet<A> impleme
 		methodSignatureConstraint = c;
 	}
 
-  public <B extends IConstraintElement> Constraint<B> createdMapped(Function<A,B> mapper) {
-    Constraint<B> result = new Constraint<>(this.size());
-    for (A element : this) {
-      result.add(mapper.apply(element));
-    }
-    return result;
-  }
-
 	public String toString() {
-    return super.toString() + "\nisInherited = " + isInherited
-      + " isOveridden = " + isImplemented
-      + " msc[" + methodSignatureConstraint.size() + "] = " + methodSignatureConstraint
-      //" + extendsContraint: "  + (extendConstraint != null ? extendConstraint.toStringBase() : "null" )
-      + "\n";
+		return super.toString() + "\nisInherited = " + isInherited + " isOveridden = " + isImplemented
+				+ methodSignatureConstraint
+				//" + extendsContraint: "  + (extendConstraint != null ? extendConstraint.toStringBase() : "null" ) 
+				+ "\n" ;
 	}
 	
 	public String toStringBase() {
 		return super.toString();
 	}
-
-
-  @Override
-  public int compareTo(Constraint<A> o) {
-    return this.toString().compareTo(o.toString());
-  }
-
-  private String serialUUID = null;
-
-  @Override
-  public SerialUUID toSerial(KeyStorage keyStorage) {
-    final String uuid = serialUUID == null ? keyStorage.getIdentifier() : serialUUID;
-    if (serialUUID == null) serialUUID = uuid;
-
-    if (!keyStorage.isAlreadySerialized(uuid)) {
-      SerialMap serialized = new SerialMap();
-      keyStorage.putSerialized(uuid, serialized);
-      serialized.put("isInherited", isInherited);
-      serialized.put("isImplemented", isImplemented);
-      serialized.put("extendedConstraint", extendConstraint == null ? null :
-        extendConstraint.toSerial(keyStorage));
-      Function<A, ISerialNode> pairMapper = pair -> {
-        if (pair instanceof Pair simplePair) return simplePair.toSerial(keyStorage);
-        if (pair instanceof UnifyPair unifyPair) return unifyPair.toSerial(keyStorage);
-        throw new RuntimeException("No serialization is supported for type " + pair.getClass().getName());
-      };
-      serialized.put("methodSignatureConstraint", methodSignatureConstraint == null ? null :
-        SerialList.fromMapped(methodSignatureConstraint, pairMapper));
-      serialized.put("setElements", SerialList.fromMapped(this, pairMapper));
-    }
-
-    // return only the unique key
-    return new SerialUUID(uuid);
-  }
-
-  public static <T extends IConstraintElement> Constraint<T> fromSerial(SerialUUID serialUUID, UnifyContext context, Class<T> target, KeyStorage keyStorage) {
-    String uuid = serialUUID.uuid;
-
-    if (!keyStorage.isAlreadyUnserialized(uuid)) {
-      Constraint<T> constraint = new Constraint<>();
-      // immediately add the object to the context to prevent infinite recursion
-      keyStorage.putUnserialized(uuid, constraint);
-
-      // retrieve the serialized data und start unserializing it
-      SerialMap data = keyStorage.getSerialized(uuid);
-      constraint.isInherited = data.getValue("isInherited").getOf(Boolean.class);
-      constraint.isImplemented = data.getValue("isImplemented").getOf(Boolean.class);
-      constraint.extendConstraint = Optional.ofNullable(data.getUUIDOrNull("extendedConstraint"))
-        .map(v -> Constraint.fromSerial(v, context, target, keyStorage))
-        .orElse(null);
-
-      // to convert the maps back to elements, we sadly have to do some assumptions about the generic types...
-      Function<ISerialNode, T> pairUnmapper = pairData -> {
-        if (target == Pair.class && pairData instanceof SerialMap pairMap) {
-          return (T) Pair.fromSerial(pairMap, context);
-        }
-        if (target == UnifyPair.class && pairData instanceof SerialUUID pairUUID) {
-          return (T) UnifyPair.fromSerial(pairUUID, context, keyStorage);
-        }
-        throw new RuntimeException("No serialization is supported for target type " + target.getName());
-      };
-
-      constraint.methodSignatureConstraint =
-        Optional.ofNullable(data.getListOrNull("methodSignatureConstraint"))
-          .map(l -> l.stream().map(pairUnmapper).collect(Collectors.toSet()))
-          .orElse(null);
-      constraint.addAll(
-        data.getList("setElements")
-          .stream().map(pairUnmapper).toList());
-    }
-
-    return keyStorage.getUnserialized(uuid, Constraint.class);
-  }
+	
 }