feat: fix error by reintroducing name generator and add server tests

.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: '24'
+          java-version: '23'
           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: '24'
-        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

@@ -0,0 +1,40 @@
+#!/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 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"
+
+# mvn clean compile -DskipTests package
+## prefix each stderr line with " | "
+# exec 2> >(trap "" INT TERM; sed 's/^/ | /' >&2)
+# echo -e "\nMatrix test:\n |"
+# time java -jar target/JavaTXcompiler-0.1-jar-with-dependencies.jar resources/bytecode/javFiles/Matrix.jav >/dev/null;
+
+
+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,79 +12,75 @@ 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>
+			<version>9.5</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>
 	</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>
 					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>24</source>
-                    <target>24</target>
+                    <source>23</source>
+                    <target>23</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>
@@ -96,7 +92,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>
@@ -109,7 +105,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>

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/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/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;
     };
-}
+}

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

@@ -13,7 +13,6 @@ import org.objectweb.asm.*;
 import java.lang.invoke.*;
 import java.lang.reflect.Modifier;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static org.objectweb.asm.Opcodes.*;
 import static de.dhbwstuttgart.target.tree.expression.TargetBinaryOp.*;
@@ -85,16 +84,14 @@ public class Codegen {
         int localCounter;
         MethodVisitor mv;
         TargetType returnType;
-        boolean isStatic = false;
 
         Stack<BreakEnv> breakStack = new Stack<>();
         Stack<Integer> switchResultValue = new Stack<>();
 
-        State(TargetType returnType, MethodVisitor mv, int localCounter, boolean isStatic) {
+        State(TargetType returnType, MethodVisitor mv, int localCounter) {
             this.returnType = returnType;
             this.mv = mv;
             this.localCounter = localCounter;
-            this.isStatic = isStatic;
         }
 
         void enterScope() {
@@ -132,7 +129,6 @@ public class Codegen {
     }
 
     private void boxPrimitive(State state, TargetType type) {
-        if (type instanceof TargetExtendsWildcard ew) type = ew.innerType();
         var mv = state.mv;
         if (type.equals(TargetType.Boolean) || type.equals(TargetType.boolean_)) {
             mv.visitMethodInsn(INVOKESTATIC, "java/lang/Boolean", "valueOf", "(Z)Ljava/lang/Boolean;", false);
@@ -154,7 +150,6 @@ public class Codegen {
     }
 
     private void unboxPrimitive(State state, TargetType type) {
-        if (type instanceof TargetExtendsWildcard ew) type = ew.innerType();
         var mv = state.mv;
         if (type.equals(TargetType.Boolean)) {
             mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Boolean", "booleanValue", "()Z", false);
@@ -230,16 +225,13 @@ public class Codegen {
     }
 
     private void convertTo(State state, TargetType source, TargetType dest) {
-        if (source instanceof TargetExtendsWildcard ew) source = ew.innerType();
-        if (dest instanceof TargetExtendsWildcard ew) dest = ew.innerType();
-
         var mv = state.mv;
         if (source.equals(dest))
             return;
         if (source.equals(TargetType.Long)) {
-            if (dest.equals(TargetType.Integer))
+            if (dest.equals(TargetType.Integer)) {
                 mv.visitInsn(L2I);
-            else if (dest.equals(TargetType.Float))
+            } else if (dest.equals(TargetType.Float))
                 mv.visitInsn(L2F);
             else if (dest.equals(TargetType.Double))
                 mv.visitInsn(L2D);
@@ -282,8 +274,6 @@ public class Codegen {
                 mv.visitInsn(I2F);
             else if (dest.equals(TargetType.Double))
                 mv.visitInsn(I2D);
-        } else if (source.equals(TargetType.Boolean)) {
-            unboxPrimitive(state, dest);
         } else if (isFunctionalInterface(source) && isFunctionalInterface(dest) &&
                 !(source instanceof TargetFunNType && dest instanceof TargetFunNType)) {
             boxFunctionalInterface(state, source, dest);
@@ -645,7 +635,7 @@ public class Codegen {
         } else if (op.expr() instanceof TargetFieldVar fieldVar) {
             generate(state, fieldVar.left());
             mv.visitInsn(SWAP);
-            mv.visitFieldInsn(PUTFIELD, fieldVar.owner().getInternalName(), fieldVar.right(), fieldVar.type().toDescriptor());
+            mv.visitFieldInsn(PUTFIELD, fieldVar.owner().getInternalName(), fieldVar.right(), fieldVar.type().toSignature());
         }
     }
 
@@ -767,16 +757,6 @@ public class Codegen {
         }
     }
 
-    private static TargetType removeGenerics(TargetType param) {
-        return switch (param) {
-            case null -> null;
-            case TargetFunNType funNType -> new TargetFunNType(funNType.name(), funNType.funNParams(), List.of(), funNType.returnArguments());
-            case TargetRefType refType -> new TargetRefType(refType.name());
-            case TargetGenericType targetGenericType -> TargetType.Object;
-            default -> param;
-        };
-    }
-
     private void generateLambdaExpression(State state, TargetLambdaExpression lambda) {
         var mv = state.mv;
 
@@ -788,8 +768,7 @@ public class Codegen {
 
         var parameters = new ArrayList<>(lambda.captures());
         parameters.addAll(signature.parameters());
-        parameters = parameters.stream().map(param -> param.withType(removeGenerics(param.pattern().type()))).collect(Collectors.toCollection(ArrayList::new));
-        var implSignature = new TargetMethod.Signature(Set.of(), parameters, removeGenerics(lambda.signature().returnType()));
+        var implSignature = new TargetMethod.Signature(Set.of(), parameters, lambda.signature().returnType());
 
         TargetMethod impl;
         if (lambdas.containsKey(lambda)) {
@@ -797,22 +776,21 @@ public class Codegen {
         } else {
             var name = "lambda$" + lambdaCounter++;
 
-            impl = new TargetMethod(state.isStatic ? ACC_STATIC : 0, name, lambda.block(), implSignature, null);
-            generateMethod(impl, state);
+            impl = new TargetMethod(0, name, lambda.block(), implSignature, null);
+            generateMethod(impl);
             lambdas.put(lambda, impl);
         }
 
         var mt = MethodType.methodType(CallSite.class, MethodHandles.Lookup.class, String.class, MethodType.class, MethodType.class, MethodHandle.class, MethodType.class);
 
         var bootstrap = new Handle(H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", "metafactory", mt.toMethodDescriptorString(), false);
-        var handle = new Handle(state.isStatic ? H_INVOKESTATIC : H_INVOKEVIRTUAL, clazz.getName(), impl.name(), implSignature.getDescriptor(), false);
+        var handle = new Handle(H_INVOKEVIRTUAL, clazz.getName(), impl.name(), implSignature.getDescriptor(), false);
 
         var params = new ArrayList<TargetType>();
-        if(!state.isStatic) params.add(new TargetRefType(clazz.qualifiedName().toString()));
+        params.add(new TargetRefType(clazz.qualifiedName().getClassName()));
         params.addAll(lambda.captures().stream().map(mp -> mp.pattern().type()).toList());
 
-        if (!state.isStatic)
-            mv.visitVarInsn(ALOAD, 0);
+        mv.visitVarInsn(ALOAD, 0);
         for (var index = 0; index < lambda.captures().size(); index++) {
             var capture = lambda.captures().get(index);
             var pattern = (TargetTypePattern) capture.pattern();
@@ -947,7 +925,7 @@ public class Codegen {
                         mv.visitInsn(DUP);
                     else
                         mv.visitInsn(DUP_X1);
-                    mv.visitFieldInsn(dot.isStatic() ? PUTSTATIC : PUTFIELD, dot.owner().getInternalName(), dot.right(), fieldType.toDescriptor());
+                    mv.visitFieldInsn(dot.isStatic() ? PUTSTATIC : PUTFIELD, dot.owner().getInternalName(), dot.right(), fieldType.toSignature());
                 }
                 default -> throw new CodeGenException("Invalid assignment");
             }
@@ -964,7 +942,7 @@ public class Codegen {
         case TargetFieldVar dot: {
             if (!dot.isStatic())
                 generate(state, dot.left());
-            mv.visitFieldInsn(dot.isStatic() ? GETSTATIC : GETFIELD, dot.left().type().getInternalName(), dot.right(), dot.type().toDescriptor());
+            mv.visitFieldInsn(dot.isStatic() ? GETSTATIC : GETFIELD, dot.left().type().getInternalName(), dot.right(), dot.type().toSignature());
             unboxPrimitive(state, dot.type());
             break;
         }
@@ -1428,7 +1406,7 @@ public class Codegen {
             throw new CodeGenException("Couldn't find suitable field accessor for '" + type.name() + "'");
         var field = clazz.getFieldDecl().get(i);
         var fieldType = converter.convert(field.getType());
-        state.mv.visitMethodInsn(INVOKEVIRTUAL, type.getInternalName(), field.getName(), "()" + fieldType.toDescriptor(), false);
+        state.mv.visitMethodInsn(INVOKEVIRTUAL, type.getInternalName(), field.getName(), "()" + fieldType.toSignature(), false);
     }
 
     private void bindPattern(State state, TargetType type, TargetPattern pat, Label start, int index, int depth) {
@@ -1533,14 +1511,14 @@ public class Codegen {
         //if ((access & ACC_PRIVATE) == 0 && (access & ACC_PROTECTED) == 0) // TODO Implement access modifiers properly
         //    access |= ACC_PUBLIC;
 
-        cw.visitField(access, field.name(), field.type().toDescriptor(), field.type().toSignature(), null);
+        cw.visitField(access, field.name(), field.type().toSignature(), field.type().toDescriptor(), null);
     }
 
     private void generateStaticConstructor(TargetMethod constructor) {
         MethodVisitor mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "<clinit>", "()V", null, null);
         mv.visitCode();
 
-        var state = new State(null, mv, 0, true);
+        var state = new State(null, mv, 0);
         generate(state, constructor.block());
 
         mv.visitInsn(RETURN);
@@ -1554,7 +1532,7 @@ public class Codegen {
             mv.visitAttribute(new JavaTXSignatureAttribute(constructor.getTXSignature()));
         
         mv.visitCode();
-        var state = new State(null, mv, 1, false);
+        var state = new State(null, mv, 1);
         for (var param : constructor.parameters()) {
             var pattern = param.pattern();
             if (pattern instanceof TargetTypePattern tp)
@@ -1600,31 +1578,9 @@ public class Codegen {
             }
         }
     }
+
     private void generateMethod(TargetMethod method) {
-        generateMethod(method, null);
-    }
-
-    private void generateMainMethod() {
-        var mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null);
-        mv.visitCode();
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitMethodInsn(INVOKESTATIC, "java/util/List", "of", "([Ljava/lang/Object;)Ljava/util/List;", true);
-        mv.visitMethodInsn(INVOKESTATIC, new TargetRefType(clazz.qualifiedName().toString()).getInternalName(), "main", "(Ljava/util/List;)V", false);
-        mv.visitInsn(RETURN);
-        mv.visitMaxs(0, 0);
-        mv.visitEnd();
-    }
-
-    private void generateMethod(TargetMethod method, State parent) {
         var access = method.access();
-
-        var params = method.signature().parameters();
-        if (method.name().equals("main") && method.isStatic() && params.size() == 1 &&
-            params.getFirst().pattern().type().equals(new TargetRefType("java.util.List", List.of(new TargetRefType("java.lang.String"))))) {
-
-            generateMainMethod();
-        }
-
         if (method.block() == null)
             access |= ACC_ABSTRACT;
         if (clazz instanceof TargetInterface)
@@ -1638,10 +1594,7 @@ public class Codegen {
 
         if (method.block() != null) {
             mv.visitCode();
-            var state = new State(method.signature().returnType(), mv, method.isStatic() ? 0 : 1, method.isStatic());
-            if (parent != null) {
-                state.scope.parent = parent.scope;
-            }
+            var state = new State(method.signature().returnType(), mv, method.isStatic() ? 0 : 1);
             var offset = 1;
             for (var param : method.signature().parameters()) {
                 state.createVariable(param.pattern().name(), param.pattern().type());
@@ -1651,8 +1604,6 @@ public class Codegen {
                     bindLocalVariables(state, cp, offset);
                 offset++;
             }
-            //if (parent != null) System.out.println("parent: " + parent.scope.locals.keySet());
-            //System.out.println(state.scope.locals.keySet());
             generate(state, method.block());
             if (method.signature().returnType() == null)
                 mv.visitInsn(RETURN);
@@ -1666,12 +1617,12 @@ public class Codegen {
         if (!generics.isEmpty()) {
             ret += "<";
             for (var generic : generics) {
-                ret += generic.name() + ":" + generic.bound().toSignature();
+                ret += generic.name() + ":" + generic.bound().toDescriptor();
             }
             ret += ">";
         }
         if (clazz.superType() != null)
-            ret += clazz.superType().toSignature();
+            ret += clazz.superType().toDescriptor();
         for (var intf : clazz.implementingInterfaces()) {
             ret += intf.toSignature();
         }
@@ -1759,7 +1710,7 @@ public class Codegen {
 
             // Generate wrapper method
             var mv = cw2.visitMethod(ACC_PUBLIC, toMethod.name, toDescriptor, null, null);
-            var state = new State(null, mv, 0, false);
+            var state = new State(null, mv, 0);
 
             mv.visitVarInsn(ALOAD, 0);
             mv.visitFieldInsn(GETFIELD, className, "wrapped", pair.from.toDescriptor());
@@ -1783,7 +1734,7 @@ public class Codegen {
 
             cw2.visitEnd();
             var bytes = cw2.toByteArray();
-            compiler.auxiliaries.put(className, bytes);
+            converter.auxiliaries.put(className, bytes);
 
             // TODO These class loading shenanigans happen in a few places, the tests load the classes individually.
             // Instead we should just look at the folder.
@@ -1791,7 +1742,7 @@ public class Codegen {
                 converter.classLoader.findClass(className);
             } catch (ClassNotFoundException e) {
                 try {
-                    converter.classLoader.loadClass(className, bytes);
+                    converter.classLoader.loadClass(bytes);
                 } catch (LinkageError ignored) {}
             }
         }
@@ -1826,7 +1777,7 @@ public class Codegen {
         bootstrapArgs[1] = String.join(";", clazz.fields().stream().map(TargetField::name).toArray(String[]::new));
         for (var i = 0; i < clazz.fields().size(); i++) {
             var field = clazz.fields().get(i);
-            var fieldRef = new Handle(H_GETFIELD, clazz.getName(), field.name(), field.type().toDescriptor(), false);
+            var fieldRef = new Handle(H_GETFIELD, clazz.getName(), field.name(), field.type().toSignature(), false);
             bootstrapArgs[i + 2] = fieldRef;
         }
 

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);
@@ -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;

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

@@ -5,42 +5,61 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.*;
-public class ConsoleInterface {
-	private static final String directory = System.getProperty("user.dir");
 
-	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);
+public class ConsoleInterface {
+  private static final String directory = System.getProperty("user.dir");
+
+  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();
+    Optional<Integer> serverPort = Optional.empty();
+    Optional<String> unifyServer = Optional.empty();
+
+    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\n" +
+        "\t[--server-mode <port>]\n" +
+        "\t[--unify-server <url>]\n");
+      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));
         }
-		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));
-            }
-        }
-		JavaTXCompiler compiler = new JavaTXCompiler(input, classpath, outputPath != null ? new File(outputPath) : null);
-		//compiler.typeInference();
-		compiler.generateBytecode();
-	}
+      } else if (arg.equals("--server-mode")) {
+        serverPort = Optional.of(Integer.parseInt(it.next()));
+      } else if (arg.equals("--unify-server")) {
+        unifyServer = Optional.of(it.next());
+      } else {
+        input.add(new File(arg));
+      }
+    }
+
+    if (serverPort.isPresent()) {
+      if (unifyServer.isPresent()) throw new RuntimeException("Cannot use unifyServer when in server mode!");
+
+      JavaTXServer server = new JavaTXServer(serverPort.get());
+      server.listen();
+    }
+    else {
+      JavaTXCompiler compiler = new JavaTXCompiler(input, classpath, outputPath != null ? new File(outputPath) : null, unifyServer);
+      //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,6 +12,7 @@ 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.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.Method;
@@ -37,10 +36,13 @@ 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;
@@ -63,29 +65,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 JavaTXCompiler INSTANCE;
 	final CompilationEnvironment environment;
 	Boolean resultmodel = true;
-    public final Map<File, SourceFile> sourceFiles = new HashMap<>();
+	public final Map<File, SourceFile> sourceFiles = new HashMap<>();
 
-    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;
+	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<>();
+	private final Optional<String> unifyServer;
 
 	public DirectoryClassLoader getClassLoader() {
 		return classLoader;
 	}
-   
+
 	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
-		this(Arrays.asList(sourceFile), List.of(), new File("."));
+		this(Arrays.asList(sourceFile), List.of(), new File("."), Optional.empty());
 	}
 
 	public JavaTXCompiler(File sourceFile, Boolean log) throws IOException, ClassNotFoundException {
@@ -94,10 +96,18 @@ public class JavaTXCompiler {
 	}
 
 	public JavaTXCompiler(List<File> sourceFiles) throws IOException, ClassNotFoundException {
-		this(sourceFiles, List.of(), new File("."));
+		this(sourceFiles, List.of(), new File("."), Optional.empty());
 	}
 
 	public JavaTXCompiler(List<File> sources, List<File> contextPath, File outputPath) throws IOException, ClassNotFoundException {
+		this(sources, contextPath, outputPath, Optional.empty());
+	}
+
+	public JavaTXCompiler(List<File> sources, List<File> contextPath, File outputPath, Optional<String> unifyServer) throws IOException, ClassNotFoundException {
+		// ensure new default placeholder registry for tests
+		defaultClientPlaceholderRegistry = new PlaceholderRegistry();
+
+		this.unifyServer = unifyServer;
 		var path = new ArrayList<>(contextPath);
 		if (contextPath.isEmpty()) {
 			// When no contextPaths are given, the working directory is the sources root
@@ -307,13 +317,14 @@ public class JavaTXCompiler {
 		Set<Set<UnifyPair>> results = new HashSet<>();
 		UnifyResultModel urm = null;
 		// urm.addUnifyResultListener(resultListener);
+		UnifyContext context = new UnifyContext(logFile, log, 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);
+			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, getClassLoader(), this, context.placeholderRegistry());
 			System.out.println(finiteClosure);
 			urm = new UnifyResultModel(cons, finiteClosure);
 			urm.addUnifyResultListener(resultListener);
-			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons);
+			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons, context.placeholderRegistry());
 
 			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
 				UnifyType lhs, rhs;
@@ -327,13 +338,12 @@ public class JavaTXCompiler {
 			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));
 			}
-			logFile.flush();
+			// logFile.flush();
 			Set<PlaceholderType> varianceTPHold;
 			Set<PlaceholderType> varianceTPH = new HashSet<>();
 			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
@@ -349,7 +359,7 @@ public class JavaTXCompiler {
 			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);
+			TypeUnify.unifyAsync(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
 		} catch (IOException e) {
 			System.err.println("kein LogFile");
 		}
@@ -372,13 +382,14 @@ public class JavaTXCompiler {
 
 		final ConstraintSet<Pair> cons = getConstraints(file);
 		Set<Set<UnifyPair>> results = new HashSet<>();
+		PlaceholderRegistry placeholderRegistry = new PlaceholderRegistry();
 		try {
 			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);
+			FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses.stream().toList(), logFile, classLoader, this, placeholderRegistry);
 			System.out.println(finiteClosure);
-			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons);
+			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons, placeholderRegistry);
 			System.out.println("xxx1");
 			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
 				UnifyType lhs, rhs;
@@ -394,18 +405,12 @@ public class JavaTXCompiler {
 			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();
-			List<UnifyPair> andConstraintsSorted = unifyCons.getUndConstraints().stream()
-					.sorted(Comparator.comparing(UnifyPair::getPairOp).thenComparing(UnifyPair::getLhsType, Comparator.comparing(UnifyType::getName)))
-					.collect(Collectors.toList());
-
-			System.out.println(andConstraintsSorted);
-
+			// logFile.flush();
+			System.out.println("Unify nach Oder-Constraints-Anpassung:" + unifyCons.toString());
 			Set<PlaceholderType> varianceTPHold;
 			Set<PlaceholderType> varianceTPH = new HashSet<>();
 			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
@@ -422,23 +427,24 @@ public class JavaTXCompiler {
 			/*
 			 * 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) {
+
+		  if (unifyServer.isPresent()) {
+				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+				UnifyContext context = new UnifyContext(logFile, log, true, urm, usedTasks, placeholderRegistry);
+				SocketClient socketClient = new SocketClient(unifyServer.get());
+				return socketClient.execute(finiteClosure, cons, unifyCons, context);
+		  }
+			else if (resultmodel) {
 				/* UnifyResultModel Anfang */
 				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
 				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
 				urm.addUnifyResultListener(li);
-				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm, usedTasks);
-				//System.out.println("RESULT Final: " + li.getResults());
-				var finalResults = li.getResults().stream().sorted().toList();
-				int i = 0;
-				System.out.println("RESULT Final: ");
-				for (var result : finalResults){
-					System.out.println("Result: " + i++);
-					System.out.println(result.getSortedResults());
-				}
+				UnifyContext context = new UnifyContext(logFile, log, true, urm, usedTasks, placeholderRegistry);
+				TypeUnify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
+				System.out.println("RESULT Final: " + li.getResults());
 				System.out.println("Constraints for Generated Generics: " + " ???");
 				logFile.write("RES_FINAL: " + li.getResults().toString() + "\n");
-				logFile.flush();
+				// logFile.flush();
 				return li.getResults();
 			}
 			/* UnifyResultModel End */
@@ -446,115 +452,37 @@ public class JavaTXCompiler {
 				// 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);
+				UnifyContext context = new UnifyContext(logFile, log, false, new UnifyResultModel(cons, finiteClosure), usedTasks, placeholderRegistry);
+				Set<Set<UnifyPair>> result = TypeUnify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
 				System.out.println("RESULT: " + result);
 				logFile.write("RES: " + result.toString() + "\n");
-				logFile.flush();
+				// logFile.flush();
 				results.addAll(result);
 
 				results = results.stream().map(x -> {
-					Optional<Set<UnifyPair>> res = new RuleSet().subst(x.stream().map(y -> {
+					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().applyTypeUnificationRules(res.get(), finiteClosure);
+						return new TypeUnifyTask(context).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();
+				// logFile.flush();
+				logFile.write("PLACEHOLDERS: " + placeholderRegistry);
+				// logFile.flush();
 			}
 		} catch (IOException e) {
 			System.err.println("kein LogFile");
 		}
-		return results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons))))).collect(Collectors.toList());
+		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<>();
-		allClasses.addAll(getAvailableClasses(sf));
-		allClasses.addAll(sf.getClasses());
-		var newClasses = CompilationEnvironment.loadDefaultPackageClasses(sf.getPkgName(), file, this).stream().map(ASTFactory::createClass).collect(Collectors.toSet());
-		for (var clazz : newClasses) {
-			// Don't load classes that get recompiled
-			if (sf.getClasses().stream().anyMatch(nf -> nf.getClassName().equals(clazz.getClassName())))
-				continue;
-			if (allClasses.stream().noneMatch(old -> old.getClassName().equals(clazz.getClassName())))
-				allClasses.add(clazz);
-		}
-
-		final ConstraintSet<Pair> cons = getConstraints(file);
-		Set<Set<UnifyPair>> results = new HashSet<>();
-		try {
-			Writer logFile = new OutputStreamWriter(new NullOutputStream());
-			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses.stream().toList(), logFile, classLoader, this);
-			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons);
-			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;
-
-			};
-
-
-			unifyCons = unifyCons.map(distributeInnerVars);
-			TypeUnify unify = new TypeUnify();
-			Set<PlaceholderType> varianceTPHold;
-			Set<PlaceholderType> varianceTPH = new HashSet<>();
-			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
-
-			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints();
-
-			if (resultmodel) {
-				/* UnifyResultModel Anfang */
-				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
-				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
-				urm.addUnifyResultListener(li);
-				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm, usedTasks);
-				generateBytecode(sf, li.getResults());
-				return new LanguageServerTransferObject(li.getResults(), sf, ASTTypePrinter.print(sf), generatedGenerics);
-			}
-			/* UnifyResultModel End */
-			else {
-				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
-				results.addAll(result);
-
-				results = results.stream().map(x -> {
-					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().applyTypeUnificationRules(res.get(), finiteClosure);
-					} else
-						return x; // wenn nichts veraendert wurde wird x zurueckgegeben
-				}).collect(Collectors.toCollection(HashSet::new));
-			}
-		} catch (ClassNotFoundException e) {
-		}
-		generateBytecode(sf, results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons))))).collect(Collectors.toList()));
-		return new LanguageServerTransferObject(results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons))))).collect(Collectors.toList()), sf, ASTTypePrinter.print(sf), generatedGenerics);
-	}
-
-
-
 	/**
 	 * Vererbt alle Variancen bei Paaren (a <. theta) oder (Theta <. a) wenn a eine Variance !=0 hat auf alle Typvariablen in Theta.
 	 * 
@@ -684,10 +612,6 @@ public class JavaTXCompiler {
 		}
 	}
 
-	/**
-	 * @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;
@@ -729,12 +653,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;
 	}
 

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

@@ -0,0 +1,31 @@
+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);
+    isRunning = true;
+  }
+
+  public void listen() {
+    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
 	 */

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

@@ -0,0 +1,11 @@
+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());
-        }
-    }
-
-    /**
-     * 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/SourceLoc.java

@@ -1,4 +1,25 @@
 package de.dhbwstuttgart.parser;
 
-public record SourceLoc(String file, int line) {
+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)
+    );
+  }
+
 }

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

@@ -12,6 +12,7 @@ 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.*;
@@ -26,16 +27,21 @@ public class FCGenerator {
      *
      * @param availableClasses - Alle geparsten Klassen
      */
-    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<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<Pair> toFC(Collection<ClassOrInterface> availableClasses, ClassLoader classLoader) throws ClassNotFoundException {
+    public static Set<Pair> toFC(Collection<ClassOrInterface> availableClasses, ClassLoader classLoader, PlaceholderRegistry placeholderRegistry) 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);
+        	List<Pair> newPairs = getSuperTypes(cly, availableClasses, gtvs, classLoader, placeholderRegistry);
             pairs.addAll(newPairs);
             
             //For all Functional Interfaces FI: FunN$$<... args auf dem Functional Interface ...> <. FI is added to FC 
@@ -75,8 +81,13 @@ public class FCGenerator {
      * @param forType
      * @return
      */
-    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses, ClassLoader classLoader) throws ClassNotFoundException {
-        return getSuperTypes(forType, availableClasses, new HashMap<>(), classLoader);
+    private static List<Pair> getSuperTypes(
+      ClassOrInterface forType,
+      Collection<ClassOrInterface> availableClasses,
+      ClassLoader classLoader,
+      PlaceholderRegistry placeholderRegistry
+    ) throws ClassNotFoundException {
+        return getSuperTypes(forType, availableClasses, new HashMap<>(), classLoader, placeholderRegistry);
     }
 
     /**
@@ -87,8 +98,13 @@ public class FCGenerator {
      * @return
      * @throws ClassNotFoundException
      */
-    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses,
-                                            HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs, ClassLoader classLoader) throws ClassNotFoundException {
+    private static List<Pair> getSuperTypes(
+      ClassOrInterface forType,
+      Collection<ClassOrInterface> availableClasses,
+      HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs,
+      ClassLoader classLoader,
+      PlaceholderRegistry placeholderRegistry
+    ) throws ClassNotFoundException {
         List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
         //Die GTVs, die in forType hinzukommen:
         HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> newGTVs = new HashMap<>();
@@ -147,7 +163,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);
+                superTypes = getSuperTypes(superClass, availableClasses, newGTVs, classLoader, placeholderRegistry);
             }
 
             retList.add(ret);

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

@@ -150,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); 
@@ -1065,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) {
@@ -1075,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 {
@@ -1099,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/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);
     }

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

@@ -0,0 +1,158 @@
+package de.dhbwstuttgart.server;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+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 java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+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 {
+
+  // use a latch to wait until the connection is closed by the remote host
+  private final CountDownLatch closeLatch = new CountDownLatch(1);
+  // temporarily: The received unify result
+  // TODO: replace with uuid and future system, such that responses can be mapped by a uuid to fulfill a Future
+  private UnifyResultPacket unifyResultPacket;
+
+  public SocketClient(String url) {
+    super(URI.create(url), Map.of(
+      "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>");
+    }
+  }
+
+  public SocketClient(String host, int port, boolean secure) {
+    super(URI.create(String.format("%s://%s:%d/", secure ? "wss" : "ws", host, port)));
+  }
+
+  /**
+   * The main method for connecting, requesting and waiting for the server to unify.
+   * This is synchronized to prevent multiple webSockets connections at the moment, but it is not called from any
+   * thread except the main thread right now and is not necessary at all, probably. Maybe remove it later
+   */
+  synchronized public List<ResultSet> execute(
+    FiniteClosure finiteClosure,
+    ConstraintSet<Pair> constraintSet,
+    ConstraintSet<UnifyPair> unifyConstraintSet,
+    UnifyContext context
+  ) throws JsonProcessingException {
+
+    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);
+      }
+
+      // send the unify task request
+      UnifyRequestPacket packet = new UnifyRequestPacket(finiteClosure, constraintSet, unifyConstraintSet, context.placeholderRegistry());
+      String json = PacketContainer.serialize(packet);
+      this.send(json);
+
+      // block the thread, until the connection is closed by the remote host (usually after sending the results)
+      this.waitUntilClosed();
+      // wait for the connection to fully close
+      this.closeBlocking();
+    } catch (InterruptedException exception) {
+      System.err.println("Server connection interrupted: " + exception);
+      this.notifyAll();
+      throw new RuntimeException("Aborted server connection", exception);
+    }
+    catch (Exception exception) {
+      throw new RuntimeException("Exception occurred in server connection: ", exception);
+    }
+
+    // detect error cases, in which no error was thrown, but also no result was sent back from the server
+    if (this.unifyResultPacket == null) {
+      throw new RuntimeException("Did not receive server response but closed connection already");
+    }
+
+    return unifyResultPacket.getResultSet(context);
+  }
+
+  /**
+   *  Specific client-side implementations to handle incoming packets
+   */
+  protected void handleReceivedPacket(IPacket packet) {
+    if (packet instanceof IServerToClientPacket serverToClientPacket) {
+
+      try {
+        serverToClientPacket.onHandle(this.getConnection(), this);
+      }
+      catch (Exception exception) {
+        this.closeLatch.countDown();
+        this.close();
+        throw exception;
+      }
+
+      return;
+    }
+
+    System.err.println("Received package of invalid type + " + packet.getClass().getName());
+    this.close();
+  }
+
+  public void setUnifyResultSets(UnifyResultPacket unifyResultPacket) {
+    this.unifyResultPacket = unifyResultPacket;
+  }
+
+  @Override
+  public void onOpen(ServerHandshake handshakedata) {
+    System.out.println("Connected to server with status " + handshakedata.getHttpStatus());
+  }
+
+  @Override
+  public void onMessage(String message) {
+    // System.out.println("received: " + message);
+    IPacket packet = PacketContainer.deserialize(message);
+    this.handleReceivedPacket(packet);
+  }
+
+  @Override
+  public void onClose(int code, String reason, boolean remote) {
+    System.out.println(
+      "Disconnected from server " +
+        "with code " + code + " " +
+        (reason.isEmpty() ? "" : "and reason " + reason + " ") +
+        "(closed by remote: " + remote + ")"
+    );
+    this.closeLatch.countDown();
+  }
+
+  @Override
+  public void onError(Exception e) {
+    System.out.println("Error: " + e.getMessage());
+    e.printStackTrace();
+  }
+
+  public void waitUntilClosed() throws InterruptedException {
+    closeLatch.await();
+  }
+}

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

@@ -0,0 +1,203 @@
+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 java.net.InetSocketAddress;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.java_websocket.WebSocket;
+import org.java_websocket.handshake.ClientHandshake;
+import org.java_websocket.server.WebSocketServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SocketServer extends WebSocketServer {
+
+  /**
+   * Increase this every time a breaking change to the server communication is done.
+   * This will prevent errors when server version and client version do not match.
+   */
+  public static final String packetProtocolVersion = "1";
+
+  public static final Logger log = LoggerFactory.getLogger(SocketServer.class);
+
+  public SocketServer(int port) {
+    super(new InetSocketAddress(port));
+  }
+
+  @Override
+  public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) {
+    String ppv = clientHandshake.getFieldValue("packetProtocolVersion");
+    if (!ppv.equals(packetProtocolVersion)) {
+      try {
+        ErrorPacket errorPacket = ErrorPacket.create(
+          "Mismatch in packet protocol version! Client (you): " + ppv + " and Server (me): " + packetProtocolVersion,
+          true
+        );
+        webSocket.send(PacketContainer.serialize(errorPacket));
+      }
+      catch (JsonProcessingException exception) {
+        System.err.println("Failed to serialize json: " + exception);
+      }
+      webSocket.close(1);
+      return;
+    }
+
+
+    SocketData socketData = new SocketData(UUID.randomUUID().toString());
+    webSocket.setAttachment(socketData);
+    System.out.println("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
+      try (ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor()) {
+        Runnable task = () -> {
+          if (webSocket.<SocketData>getAttachment().unhandledTasks.get() == 0 || !webSocket.isOpen()) {
+            return;
+          }
+          sendMessage(webSocket, "No task received after 10 seconds. Closing connection...");
+          webSocket.close();
+        };
+        executor.schedule(task, 10, TimeUnit.SECONDS);
+        executor.shutdown();
+      }
+
+      // and finally, when your program wants to exit
+    } catch (Exception e) {
+      log.error("e: ", e);
+      webSocket.close(1, e.getMessage());
+    }
+  }
+
+  @Override
+  public void onClose(WebSocket webSocket, int code, String reason, boolean remote) {
+    SocketData socketData = webSocket.getAttachment();
+    System.out.println("Connection closed: " + socketData.id);
+    System.out.println(
+      "Disconnected client " + socketData.id + " " +
+        "with code " + code + " " +
+        (reason.isEmpty() ? "" : "and reason " + reason + " ") +
+        "(closed by client: " + remote + ")"
+    );
+
+  }
+
+  @Override
+  public void onMessage(WebSocket webSocket, String s) {
+    // System.out.println("Received: " + s.substring(0, 50));
+    IPacket reconstructedPacket = PacketContainer.deserialize(s);
+    try {
+      this.onPacketReceived(webSocket, reconstructedPacket);
+    } catch (JsonProcessingException e) {
+      this.log("Error on processing incoming package: " + e.getMessage(), webSocket);
+    }
+  }
+
+  @Override
+  public void onError(WebSocket webSocket, Exception e) {
+    log(e.getMessage(), webSocket);
+    webSocket.close();
+  }
+
+  @Override
+  public void onStart() {
+    System.out.println("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 = new MessagePacket();
+      message.message = text;
+      webSocket.send(PacketContainer.serialize(message));
+    } catch (Exception e) {
+      System.err.println("Failed to send message: " + text);
+      log.error("e: ", e);
+    }
+  }
+
+  /**
+   * A shorthand method for sending error messages to the client
+   */
+  public void sendError(WebSocket webSocket, String text) {
+    try {
+      ErrorPacket error = new ErrorPacket();
+      error.error = text;
+      webSocket.send(PacketContainer.serialize(error));
+    } catch (Exception e) {
+      System.err.println("Failed to send error: " + text);
+      log.error("e: ", e);
+    }
+  }
+
+  /**
+   *  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 amount of tasks per connection
+    final int maxTasks = 100;
+    if (socketData.totalTasks.get() >= maxTasks) {
+      sendError(webSocket, "Exceeded the maximum amount of " + maxTasks + " tasks per session");
+      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);
+
+      // if the websocket has 0 unhandled Tasks, close the connection
+      int remainingUnhandledTasks = socketData.unhandledTasks.decrementAndGet();
+      if (remainingUnhandledTasks <= 0) {
+        sendMessage(webSocket, "All requested tasks finished! Closing connection...");
+        webSocket.close();
+      }
+    });
+  }
+
+  public void log(String msg, WebSocket webSocket) {
+    SocketData socketData = webSocket == null ? new SocketData("???") : webSocket.getAttachment();
+    System.out.println("["+socketData.id+"] " + 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 SocketData(String id) {
+      this.id = id;
+    }
+  }
+
+}

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

@@ -0,0 +1,30 @@
+package de.dhbwstuttgart.server.packet;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import de.dhbwstuttgart.server.SocketClient;
+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, 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 socketServer) {}
+
+  @JsonIgnore
+  public void onHandle(WebSocket webSocket, SocketServer socketServer) {}
+
+}

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

@@ -0,0 +1,41 @@
+package de.dhbwstuttgart.server.packet;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import de.dhbwstuttgart.server.SocketClient;
+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 IClientToServerPacket, IServerToClientPacket {
+
+  /**
+   * The error endpoint for messages from the server, that should be logged out outputted
+   */
+  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) {
+    System.err.println("[socket] " + "ErrorPacket: " + this.error);
+    if (this.isFatal) {
+      throw new RuntimeException("Received fatal error from server: " + this.error);
+    }
+  }
+
+  @JsonIgnore
+  public void onHandle(WebSocket webSocket, SocketServer socketServer) {
+    socketServer.log("ErrorPacket: " + this.error, webSocket);
+  }
+
+}

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

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

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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,29 @@
+package de.dhbwstuttgart.server.packet;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import de.dhbwstuttgart.server.SocketClient;
+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, IServerToClientPacket {
+
+  /**
+   * If available, the error that caused this package to appear
+   */
+  public String error = "<unknown error>";
+
+
+  @JsonIgnore
+  public void onHandle(WebSocket webSocket, SocketClient socketClient) {
+    System.err.println("[socket] " + "InvalidPacket: " + this.error);
+  }
+
+  @JsonIgnore
+  public void onHandle(WebSocket webSocket, SocketServer socketServer) {
+    socketServer.log("InvalidPacket: " + this.error, webSocket);
+  }
+
+}

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

@@ -0,0 +1,36 @@
+package de.dhbwstuttgart.server.packet;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import de.dhbwstuttgart.server.SocketClient;
+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, 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) {
+    System.err.println("[socket] " + this.message);
+
+  }
+
+  @JsonIgnore
+  public void onHandle(WebSocket webSocket, SocketServer socketServer) {
+    socketServer.log(this.message, webSocket);
+  }
+
+}

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

@@ -0,0 +1,90 @@
+package de.dhbwstuttgart.server.packet;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * 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;
+
+
+  /**
+   * 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;
+    // Add new packets here and in the deserialize method
+
+    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;
+      // Add new packets here and in the serialize method
+
+      throw new RuntimeException("Cannot map received json to any known packet class");
+    } catch (Exception e) {
+      System.out.println(e);
+      InvalidPacket packet = new InvalidPacket();
+      packet.error = e.getMessage();
+      return packet;
+    }
+  }
+
+
+}

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

@@ -0,0 +1,145 @@
+package de.dhbwstuttgart.server.packet;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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 java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashSet;
+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 {
+
+  public SerialMap finiteClosure;
+  public SerialMap constraintSet;
+  public SerialMap unifyConstraintSet;
+  public SerialMap serialKeyStorage;
+  public SerialValue<?> placeholders;
+  public SerialList<SerialMap> factoryplaceholders;
+
+  @JsonIgnore
+  private KeyStorage keyStorage = new KeyStorage();
+  @JsonIgnore
+  private boolean keyStorageLoaded = false;
+
+  public UnifyRequestPacket() {}
+
+  public UnifyRequestPacket(
+    FiniteClosure finiteClosure,
+    ConstraintSet<Pair> constraintSet,
+    ConstraintSet<UnifyPair> unifyConstraintSet,
+    PlaceholderRegistry placeholderRegistry
+  ) {
+    // store contraint and finite closure
+    this.finiteClosure = finiteClosure.toSerial(keyStorage);
+    this.constraintSet = constraintSet.toSerial(keyStorage);
+    this.unifyConstraintSet = unifyConstraintSet.toSerial(keyStorage);
+    // store placeholder registry
+    var serialRegistry = placeholderRegistry.toSerial(keyStorage);
+    this.placeholders = serialRegistry.getValue("ph");
+    this.factoryplaceholders = serialRegistry.getList("factoryPh").assertListOfMaps();
+    // store referenced objects separately
+    this.serialKeyStorage = keyStorage.toSerial(keyStorage);
+  }
+
+
+  @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...");
+    System.out.println("Client " + webSocket.<SocketServer.SocketData>getAttachment().id + " requested a unification. Starting now...");
+
+    try {
+      var placeholderRegistry = new PlaceholderRegistry();
+      ArrayList<String> existingPlaceholders = (ArrayList) this.placeholders.getOf(ArrayList.class);
+      existingPlaceholders.forEach(placeholderRegistry::addPlaceholder);
+
+      var unifyContext = new UnifyContext(Writer.nullWriter(), false, true,
+        new UnifyResultModel(new ConstraintSet<>(), new FiniteClosure(new HashSet<>(), null, 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();
+
+      System.out.println("Finished unification for client " + webSocket.<SocketServer.SocketData>getAttachment().id);
+      socketServer.sendMessage(webSocket, "Unification finished. Found " + resultSets.size() + " result sets");
+
+      if (webSocket.isOpen()) {
+        UnifyResultPacket resultPacket = UnifyResultPacket.create(resultSets);
+        webSocket.send(PacketContainer.serialize(resultPacket));
+      }
+    } catch (Exception e) {
+      System.err.println(e);
+      SocketServer.log.error("e: ", e);
+    }
+  }
+
+}

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

@@ -0,0 +1,43 @@
+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 static UnifyResultPacket create(List<ResultSet> resultSets) {
+    UnifyResultPacket serialized = new UnifyResultPacket();
+    KeyStorage keyStorage = new KeyStorage();
+    serialized.results = SerialList.fromMapped(resultSets, resultSet -> resultSet.toSerial(keyStorage));
+    serialized.keyStorage = keyStorage.toSerial(keyStorage);
+    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) {
+    System.out.println("[socket] Received unify result");
+    socketClient.setUnifyResultSets(this);
+  }
+
+
+}

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,103 @@
+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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,74 @@
+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

@@ -0,0 +1,84 @@
+package de.dhbwstuttgart.server.packet.dataContainers.serialized;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.util.HashMap;
+import java.util.Map;
+import javax.annotation.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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,28 @@
+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/factory/NameGenerator.java

@@ -1,5 +1,8 @@
 package de.dhbwstuttgart.syntaxtree.factory;
 
+import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.core.JavaTXServer;
+
 public class NameGenerator {
 
     private static String strNextName = "A";
@@ -13,10 +16,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                          
@@ -30,7 +29,11 @@ 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,5 +1,6 @@
 package de.dhbwstuttgart.syntaxtree.factory;
 
+import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
 import java.io.Writer;
 import java.lang.reflect.Modifier;
 import java.util.*;
@@ -31,9 +32,13 @@ import org.antlr.v4.runtime.Token;
 
 public class UnifyTypeFactory {
 	
-	private static ArrayList<PlaceholderType> PLACEHOLDERS = new ArrayList<>(); 
-
-    public static FiniteClosure generateFC(List<ClassOrInterface> fromClasses, Writer logFile, ClassLoader classLoader, JavaTXCompiler compiler) throws ClassNotFoundException {
+    public static FiniteClosure generateFC(
+      List<ClassOrInterface> fromClasses,
+      Writer logFile,
+      ClassLoader classLoader,
+      JavaTXCompiler compiler,
+      PlaceholderRegistry placeholderRegistry
+    ) throws ClassNotFoundException {
         /*
         Die transitive Hülle muss funktionieren.
         Man darf schreiben List<A> extends AL<A>
@@ -44,7 +49,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), logFile, compiler);
+        return new FiniteClosure(FCGenerator.toUnifyFC(compiler, fromClasses, classLoader, placeholderRegistry), logFile, compiler, placeholderRegistry);
     }
 
     public static UnifyPair generateSmallerPair(UnifyType tl, UnifyType tr, SourceLoc location){
@@ -67,23 +72,23 @@ public class UnifyTypeFactory {
      * Convert from
      * ASTType -> UnifyType
      */
-    public static UnifyType convert(JavaTXCompiler compiler, RefTypeOrTPHOrWildcardOrGeneric t, Boolean innerType){
+    public static UnifyType convert(JavaTXCompiler compiler, RefTypeOrTPHOrWildcardOrGeneric t, Boolean innerType, PlaceholderRegistry placeholderRegistry){
         if (t instanceof GenericRefType){
-            return UnifyTypeFactory.convert(compiler, (GenericRefType)t, innerType);
+            return UnifyTypeFactory.convert(compiler, (GenericRefType)t, innerType, placeholderRegistry);
         } else if (t instanceof TypePlaceholder){
-            return UnifyTypeFactory.convert(compiler, (TypePlaceholder)t, innerType);
+            return UnifyTypeFactory.convert(compiler, (TypePlaceholder)t, innerType, placeholderRegistry);
         } else if (t instanceof ExtendsWildcardType){
-            return UnifyTypeFactory.convert(compiler, (ExtendsWildcardType)t, innerType);
+            return UnifyTypeFactory.convert(compiler, (ExtendsWildcardType)t, innerType, placeholderRegistry);
         } else if (t instanceof SuperWildcardType) {
-            return UnifyTypeFactory.convert(compiler, (SuperWildcardType) t, innerType);
+            return UnifyTypeFactory.convert(compiler, (SuperWildcardType) t, innerType, placeholderRegistry);
         } else if (t instanceof RefType){
-            return UnifyTypeFactory.convert(compiler, (RefType)t, innerType);
+            return UnifyTypeFactory.convert(compiler, (RefType)t, innerType, placeholderRegistry);
         }
         //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){
+    public static UnifyType convert(JavaTXCompiler compiler, RefType t, Boolean innerType, PlaceholderRegistry placeholderRegistry){
         //Check if it is a FunN Type:
         Pattern p = Pattern.compile("Fun(\\d+)[$][$]");
         Matcher m = p.matcher(t.getName().toString());
@@ -91,76 +96,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);
+                return convertFunN(compiler, t.getParaList(), false, placeholderRegistry);
             }
         }
         UnifyType ret;
         List<UnifyType> params = new ArrayList<>();
         if (t.getParaList() != null) {
             for (RefTypeOrTPHOrWildcardOrGeneric pT : t.getParaList()) {
-                params.add(UnifyTypeFactory.convert(compiler, pT, true));
+                params.add(UnifyTypeFactory.convert(compiler, pT, true, placeholderRegistry));
             }
         }
 
         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)).toList();
+            var methodParams = method.getParameterList().getFormalparalist().stream().map(x -> convert(compiler, x.getType(), true, placeholderRegistry)).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), generics);
+            return new FunInterfaceType(t.getName().toString(), new TypeParams(params), methodParams, convert(compiler, method.getReturnType(), true, placeholderRegistry), generics);
         }
 
         return new ReferenceType(t.getName().toString(),new TypeParams(params));
     }
 
-    public static UnifyType convertFunN(JavaTXCompiler compiler, List<RefTypeOrTPHOrWildcardOrGeneric> paraList, Boolean innerType){
+    public static UnifyType convertFunN(JavaTXCompiler compiler, List<RefTypeOrTPHOrWildcardOrGeneric> paraList, Boolean innerType, PlaceholderRegistry placeholderRegistry){
         UnifyType ret;
         List<UnifyType> params = new ArrayList<>();
         if(paraList != null && paraList.size() > 0){
             for(RefTypeOrTPHOrWildcardOrGeneric pT : paraList){
-                params.add(UnifyTypeFactory.convert(compiler, pT, false));
+                params.add(UnifyTypeFactory.convert(compiler, pT, false, placeholderRegistry));
             }
         }
         ret = FunNType.getFunNType(new TypeParams(params));
         return ret;
     }
 
-    public static UnifyType convert(JavaTXCompiler compiler, TypePlaceholder tph, Boolean innerType){
+    public static UnifyType convert(JavaTXCompiler compiler, TypePlaceholder tph, Boolean innerType, PlaceholderRegistry placeholderRegistry) {
     	if (tph.getName().equals("AFR")) {
     		System.out.println("XXX"+innerType);
     	}
-    	PlaceholderType ntph = new PlaceholderType(tph.getName(), tph.getVariance());
+    	PlaceholderType ntph = new PlaceholderType(tph.getName(), tph.getVariance(), placeholderRegistry);
     	ntph.setVariance(tph.getVariance());
     	ntph.setOrCons(tph.getOrCons());
     	ntph.setWildcardtable(tph.getWildcardtable());
-    	int in = PLACEHOLDERS.indexOf(ntph);
+    	int in = placeholderRegistry.UnifyTypeFactory_PLACEHOLDERS.indexOf(ntph);
 		if (in == -1) {
-			PLACEHOLDERS.add(ntph);
+        placeholderRegistry.UnifyTypeFactory_PLACEHOLDERS.add(ntph);
 			ntph.setInnerType(innerType);
 			return ntph;
 		}
 		else {
-			 PlaceholderType oldpht = PLACEHOLDERS.get(in);
+			 PlaceholderType oldpht = placeholderRegistry.UnifyTypeFactory_PLACEHOLDERS.get(in);
 			 oldpht.setInnerType(oldpht.isInnerType() || innerType);
 			 return oldpht;
 		}
     }
 
-    public static UnifyType convert(JavaTXCompiler compiler, GenericRefType t, Boolean innerType){
+    public static UnifyType convert(JavaTXCompiler compiler, GenericRefType t, Boolean innerType, PlaceholderRegistry placeholderRegistry){
         return new ReferenceType(t.getParsedName(), true);
     }
 
-    public static UnifyType convert(JavaTXCompiler compiler, WildcardType t, Boolean innerType){
+    public static UnifyType convert(JavaTXCompiler compiler, WildcardType t, Boolean innerType, PlaceholderRegistry placeholderRegistry){
         if(t.isExtends())
-            return new ExtendsType(UnifyTypeFactory.convert(compiler, t.getInnerType(), false));
+            return new ExtendsType(UnifyTypeFactory.convert(compiler, t.getInnerType(), false, placeholderRegistry));
         else if(t.isSuper())
-            return new SuperType(UnifyTypeFactory.convert(compiler, t.getInnerType(), false));
+            return new SuperType(UnifyTypeFactory.convert(compiler, t.getInnerType(), false, placeholderRegistry));
         else throw new NotImplementedException();
     }
 
 
-    public static ConstraintSet<UnifyPair> convert(JavaTXCompiler compiler, ConstraintSet<Pair> constraints) {
-        return constraints.map(c -> UnifyTypeFactory.convert(compiler, c));
+    public static ConstraintSet<UnifyPair> convert(JavaTXCompiler compiler, ConstraintSet<Pair> constraints, PlaceholderRegistry placeholderRegistry) {
+        return constraints.map(c -> UnifyTypeFactory.convert(compiler, c, placeholderRegistry));
     }
 
     //NEVER USED
@@ -171,30 +176,30 @@ public class UnifyTypeFactory {
     //	return unifyPairConstraint;
     //}
 
-    public static UnifyPair convert(JavaTXCompiler compiler, Pair p) {
+    public static UnifyPair convert(JavaTXCompiler compiler, Pair p, PlaceholderRegistry placeholderRegistry) {
     	UnifyPair ret = null;
         if(p.GetOperator().equals(PairOperator.SMALLERDOT)) {
-             ret = generateSmallerDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false)
-                    , UnifyTypeFactory.convert(compiler, p.TA2, false), p.getLocation());
+             ret = generateSmallerDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false, placeholderRegistry)
+                    , UnifyTypeFactory.convert(compiler, p.TA2, false, placeholderRegistry), p.getLocation());
             //return ret;
         }else if(p.GetOperator().equals(PairOperator.SMALLERNEQDOT)) {
-             ret = generateSmallNotEqualDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false)
-                    , UnifyTypeFactory.convert(compiler, p.TA2, false), p.getLocation());
+             ret = generateSmallNotEqualDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false, placeholderRegistry)
+                    , UnifyTypeFactory.convert(compiler, p.TA2, false, placeholderRegistry), p.getLocation());
             //return ret;
         }else if(p.GetOperator().equals(PairOperator.EQUALSDOT)) {
-             ret = generateEqualDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false)
-                    , UnifyTypeFactory.convert(compiler, p.TA2, false), p.getLocation());
+             ret = generateEqualDotPair(UnifyTypeFactory.convert(compiler, p.TA1, false, placeholderRegistry)
+                    , UnifyTypeFactory.convert(compiler, p.TA2, false, placeholderRegistry), p.getLocation());
             //return ret;
         }else if(p.GetOperator().equals(PairOperator.SMALLER)){
-            ret =  generateSmallerPair(UnifyTypeFactory.convert(compiler, p.TA1, false),
-                    UnifyTypeFactory.convert(compiler, p.TA2, false), p.getLocation());
+            ret =  generateSmallerPair(UnifyTypeFactory.convert(compiler, p.TA1, false, placeholderRegistry),
+                    UnifyTypeFactory.convert(compiler, p.TA2, false, placeholderRegistry), 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")) {
-        		System.out.println("");
+        		// System.out.println("");
         	}
         	((PlaceholderType)rhs).enableWildcardtable();
         }
@@ -203,7 +208,7 @@ public class UnifyTypeFactory {
         		&& ((PlaceholderType)rhs).isWildcardable()
         		&&	(lhs = ret.getLhsType()) instanceof PlaceholderType) {
         	if (rhs.getName().equals("AQ")) {
-        		System.out.println("");
+        		// System.out.println("");
         	}
         	((PlaceholderType)lhs).enableWildcardtable();
         }
@@ -214,16 +219,16 @@ public class UnifyTypeFactory {
      * Convert from
      * UnifyType -> ASTType
      */
-    public static Set<ResultPair> convert(Set<UnifyPair> unifyPairSet, Map<String,TypePlaceholder> tphs) {
+    public static Set<ResultPair> convert(Set<UnifyPair> unifyPairSet, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
         return unifyPairSet.stream().map(
-                unifyPair -> convert(unifyPair, tphs))
+                unifyPair -> convert(unifyPair, tphs, placeholderRegistry))
                         .collect(Collectors.toSet());
     }
 
-    public static ResultPair convert(UnifyPair mp, Map<String,TypePlaceholder> tphs) {
+    public static ResultPair convert(UnifyPair mp, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
     	if (mp == null) { return null;} //kann bei basePairs passieren
-        RefTypeOrTPHOrWildcardOrGeneric tl = UnifyTypeFactory.convert(mp.getLhsType(), tphs);
-        RefTypeOrTPHOrWildcardOrGeneric tr = UnifyTypeFactory.convert(mp.getRhsType(), tphs);
+        RefTypeOrTPHOrWildcardOrGeneric tl = UnifyTypeFactory.convert(mp.getLhsType(), tphs, placeholderRegistry);
+        RefTypeOrTPHOrWildcardOrGeneric tr = UnifyTypeFactory.convert(mp.getRhsType(), tphs, placeholderRegistry);
         if(tl instanceof TypePlaceholder){
             if(tr instanceof TypePlaceholder) {
 
@@ -232,7 +237,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));
+                    return new PairTPHsmallerTPH((TypePlaceholder)tl, (TypePlaceholder)tr, convert(mp.getBasePair(), tphs, placeholderRegistry));
                 }
             }else if(tr instanceof RefType){
                 return new PairTPHequalRefTypeOrWildcardType((TypePlaceholder)tl, (RefType) tr);
@@ -244,51 +249,51 @@ public class UnifyTypeFactory {
         }else return new PairNoResult(tl, tr);//throw new NotImplementedException();
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(ReferenceType t, Map<String,TypePlaceholder> tphs) {
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(ReferenceType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
         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),new NullToken());
+        RefType ret = new RefType(new JavaClassName(t.getName()),convert(t.getTypeParams(), tphs, placeholderRegistry),new NullToken());
         return ret;
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(FunNType t, Map<String,TypePlaceholder> tphs) {
-        RefType ret = new RefType(new JavaClassName(t.getName()), convert(t.getTypeParams(), tphs), new NullToken());
+    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());
         return ret;
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(SuperType t, Map<String,TypePlaceholder> tphs) {
-        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getSuperedType(), tphs);
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(SuperType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
+        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getSuperedType(), tphs, placeholderRegistry);
         return new SuperWildcardType(innerType, new NullToken());
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(ExtendsType t, Map<String,TypePlaceholder> tphs) {
-        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getExtendedType(), tphs);
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(ExtendsType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
+        RefTypeOrTPHOrWildcardOrGeneric innerType = convert(t.getExtendedType(), tphs, placeholderRegistry);
         return new ExtendsWildcardType(innerType, new NullToken());
     }
 
-    public static RefTypeOrTPHOrWildcardOrGeneric convert(PlaceholderType t, Map<String,TypePlaceholder> tphs) {
+    public static RefTypeOrTPHOrWildcardOrGeneric convert(PlaceholderType t, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
         TypePlaceholder ret = tphs.get(t.getName());
         if(ret == null){ //Dieser TPH wurde vom Unifikationsalgorithmus erstellt
-            ret = TypePlaceholder.fresh(new NullToken());
+            ret = TypePlaceholder.fresh(new NullToken(), placeholderRegistry);
             tphs.put(t.getName(), ret);
         }
         ret.setVariance(t.getVariance());
         return ret;
     }
 
-    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);
+    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);
         throw new NotImplementedException("Der Typ "+t+" kann nicht umgewandelt werden");
     }
 
-    private static List<RefTypeOrTPHOrWildcardOrGeneric> convert(TypeParams typeParams, Map<String,TypePlaceholder> tphs) {
+    private static List<RefTypeOrTPHOrWildcardOrGeneric> convert(TypeParams typeParams, Map<String,TypePlaceholder> tphs, PlaceholderRegistry placeholderRegistry) {
         List<RefTypeOrTPHOrWildcardOrGeneric> ret = new ArrayList<>();
         for(UnifyType uT : typeParams){
-            RefTypeOrTPHOrWildcardOrGeneric toAdd = convert(uT, tphs);
+            RefTypeOrTPHOrWildcardOrGeneric toAdd = convert(uT, tphs, placeholderRegistry);
             ret.add(toAdd);
         }
         return ret;

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

@@ -1,8 +1,13 @@
 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;
@@ -15,7 +20,7 @@ import java.util.Objects;
  * 
  */
 
-public class ExtendsWildcardType extends WildcardType{
+public class ExtendsWildcardType extends WildcardType implements ISerializableData {
 	
 	/**
 	* Author: Arne Lüdtke<br/>
@@ -68,4 +73,22 @@ public class ExtendsWildcardType extends WildcardType{
 		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,57 +1,77 @@
 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
-{
-    private String name;
+public class GenericRefType extends RefTypeOrTPHOrWildcardOrGeneric implements ISerializableData {
+  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 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()
+    );
+  }
 }
 

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

@@ -1,8 +1,15 @@
 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;
@@ -11,122 +18,137 @@ import java.util.List;
 import java.util.Objects;
 
 
-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 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 RefType(JavaClassName fullyQualifiedName, Token offset)
-    {
-        this(fullyQualifiedName, new ArrayList<>(), offset);
+  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 boolean isPrimitive() {
-        return primitiveFlag;
-    }
+    if (!Objects.equals(this.name, refObj.name)) return false;
+    boolean ret = true;
 
-    @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 += ">";
+    //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));
         }
-        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);
-    }
 
-    public RefType(JavaClassName fullyQualifiedName, List<RefTypeOrTPHOrWildcardOrGeneric> parameter, Token offset, boolean primitiveFlag) {
-        super(offset);
-        this.name = (fullyQualifiedName);
-        this.parameter = parameter;
-        this.primitiveFlag = primitiveFlag;
-    }
+  @Override
+  public void accept(ASTVisitor visitor) {
+    visitor.visit(this);
+  }
 
-    public JavaClassName getName()
-    {
-        return name;
-    }
+  @Override
+  public <A> A acceptTV(TypeVisitor<A> visitor) {
+    return visitor.visit(this);
+  }
 
-    public List<RefTypeOrTPHOrWildcardOrGeneric> getParaList(){
-    	if(this.parameter==null)return new ArrayList<>();
-    	return this.parameter;
-    }
+  @Override
+  public void accept(ResultSetVisitor visitor) {
+    visitor.visit(this);
+  }
 
-    /**
-     * 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;
-        }
-    }
-    	
+  @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)));
 
-    @Override
-    public void accept(ASTVisitor visitor) {
-        visitor.visit(this);
-    }
+    // 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 <A> A acceptTV(TypeVisitor<A> visitor) {
-        return visitor.visit(this);
-    }
-
-    @Override
-    public void accept(ResultSetVisitor 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)
+    );
+  }
 }
 

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

@@ -1,11 +1,17 @@
 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{
+public abstract class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode implements ISerializableData {
     public RefTypeOrTPHOrWildcardOrGeneric(Token offset) {
         super(offset);
     }
@@ -18,5 +24,26 @@ public abstract class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode{
     
     @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,9 +1,13 @@
 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;
@@ -16,7 +20,7 @@ import java.util.Objects;
  * 
  */
 
-public class SuperWildcardType extends WildcardType{
+public class SuperWildcardType extends WildcardType implements ISerializableData {
 
 	/**
 	* Author: Arne Lüdtke<br/>
@@ -80,4 +84,22 @@ public class SuperWildcardType extends WildcardType{
 		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,9 +1,12 @@
 package de.dhbwstuttgart.syntaxtree.type;
-import java.util.Hashtable;
+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 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;
@@ -16,7 +19,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
+public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric implements ISerializableData
 {
 	private final String name;
 	
@@ -65,7 +68,12 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
     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);
     }
@@ -139,4 +147,26 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
 	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,14 +1,32 @@
 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
+public class Void extends RefType implements ISerializableData
 {
     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/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,8 +12,6 @@ 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.tree.*;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
@@ -37,6 +35,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;
 
@@ -61,19 +60,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) {
@@ -83,9 +80,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) {
@@ -95,13 +92,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());
         }
@@ -109,16 +102,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;
@@ -356,14 +349,19 @@ public class ASTToTargetAST {
         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);
@@ -425,7 +423,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;
@@ -469,6 +467,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) {
@@ -739,6 +744,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);
     }
@@ -771,15 +781,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;
@@ -807,24 +809,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) {
@@ -836,31 +842,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);
                         try {
-                            compiler.classLoader.findClass(superClassName);
+                            classLoader.findClass(superClassName);
                         } catch (ClassNotFoundException e) {
                             try {
-                                compiler.classLoader.loadClass(superClassName, code);
+                                classLoader.loadClass(code);
                             } catch (LinkageError ignored) {}
                         }
-                        compiler.auxiliaries.put(superClassName, code);
+                        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);
                 }
@@ -869,7 +875,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
@@ -879,7 +885,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,7 +1,5 @@
 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.*;
@@ -20,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;
@@ -136,8 +134,8 @@ 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) {
                 System.out.println(p.left + " " + p.left.getVariance());
@@ -283,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)) {
@@ -331,7 +329,7 @@ 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();
                             System.out.println("In: " + method.getName() + " Method: " + method2.getName());
@@ -1007,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

@@ -14,7 +14,6 @@ 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;
@@ -33,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());
@@ -138,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

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/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

@@ -33,4 +33,9 @@ public record TargetFunNType(String name, List<TargetType> funNParams, List<Targ
     public String getInternalName() {
         return name;
     }
+
+    @Override
+    public String toSignature() {
+        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,21 +6,16 @@ public sealed interface TargetSpecializedType extends TargetType permits TargetF
     List<TargetType> params();
 
     @Override
-    default String toSignature() {
+    default String toDescriptor() {
         String ret = "L" + getInternalName();
-        if (!params().isEmpty()) {
+        if (params().size() > 0) {
             ret += "<";
             for (var param : params()) {
-                ret += param.toSignature();
+                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,13 +9,8 @@ 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/constraints/Constraint.java

@@ -1,81 +1,159 @@
 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.ArrayList;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 
-public class Constraint<A> extends HashSet<A> implements Comparable<Constraint<A>> {
-	private static final long serialVersionUID = 1L;
-	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
-	 * auszuwaehlen 
-	 */
-	/*private*/ Set<A> methodSignatureConstraint = new HashSet<>();
-	
-	private Constraint<A> extendConstraint = null;
-	
-	public Constraint() {
-		super();
-	}
-	
-	public Constraint(Boolean isInherited, Boolean isImplemented) {
-		this.isInherited = isInherited;
-		this.isImplemented = isImplemented;
-	}
-	
-	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) {
-		this.isInherited = isInherited;
-	}
-	
-	public Boolean isInherited() {
-		return isInherited;
-	}
-	
-	public Boolean isImplemented() {
-		return isImplemented;
-	}
-	
-	public Constraint<A> getExtendConstraint() {
-		return extendConstraint;
-	}
-	
-	public void setExtendConstraint(Constraint<A> c) {
-		extendConstraint = c;
-	}
-	
-	public Set<A> getmethodSignatureConstraint() {
-		return methodSignatureConstraint;
-	}
-	
-	public void setmethodSignatureConstraint(Set<A> c) {
-		methodSignatureConstraint = c;
-	}
+public class Constraint<A extends IConstraintElement> extends HashSet<A> implements ISerializableData {
+  private static final long serialVersionUID = 1L;
+  private Boolean isInherited = false;//wird beides nur für die Method-Constraints benoetigt
+  private Boolean isImplemented = false;
 
-	public String toString() {
-		return super.toString() + "\nisInherited = " + isInherited + " isOveridden = " + isImplemented
-				+ methodSignatureConstraint
-				//" + extendsContraint: "  + (extendConstraint != null ? extendConstraint.toStringBase() : "null" ) 
-				+ "\n" ;
-	}
-	
-	public String toStringBase() {
-		return super.toString();
-	}
+  /*
+   * wird verwendet um bei der Codegenerierung die richtige Methoden - Signatur
+   * auszuwaehlen
+   */
+  /*private*/ Set<A> methodSignatureConstraint = new HashSet<>();
+
+  private Constraint<A> extendConstraint = null;
+
+  public Constraint() {
+    super();
+  }
+
+  public Constraint(Boolean isInherited, Boolean isImplemented) {
+    this.isInherited = isInherited;
+    this.isImplemented = isImplemented;
+  }
+
+  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) {
+    this.isInherited = isInherited;
+  }
+
+  public Boolean isInherited() {
+    return isInherited;
+  }
+
+  public Boolean isImplemented() {
+    return isImplemented;
+  }
+
+  public Constraint<A> getExtendConstraint() {
+    return extendConstraint;
+  }
+
+  public void setExtendConstraint(Constraint<A> c) {
+    extendConstraint = c;
+  }
+
+  public Set<A> getmethodSignatureConstraint() {
+    return methodSignatureConstraint;
+  }
+
+  public void setmethodSignatureConstraint(Set<A> c) {
+    methodSignatureConstraint = c;
+  }
+
+  public String toString() {
+    return super.toString() + "\nisInherited = " + isInherited
+      + " isOveridden = " + isImplemented
+      + " msc[" + methodSignatureConstraint.size() + "] = " + methodSignatureConstraint
+      //" + extendsContraint: "  + (extendConstraint != null ? extendConstraint.toStringBase() : "null" )
+      + "\n";
+  }
+
+  public String toStringBase() {
+    return super.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);
+  }
 
-	@Override
-	public int compareTo(Constraint<A> o) {
-		return this.toString().compareTo(o.toString());
-	}
 }

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

@@ -1,63 +1,80 @@
 package de.dhbwstuttgart.typeinference.constraints;
 
 
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
+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.typeinference.unify.GuavaSetOperations;
-import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 
+import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
 import java.util.*;
 import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-public class ConstraintSet<A> {
-    Constraint<A> undConstraints = new Constraint<>();
-    List<Set<Constraint<A>>> oderConstraints = new ArrayList<>();
+public class ConstraintSet<A extends IConstraintElement> implements ISerializableData {
+  Constraint<A> undConstraints = new Constraint<>();
+  List<Set<Constraint<A>>> oderConstraints = new ArrayList<>();
 
-    public void addUndConstraint(A p){
-        undConstraints.add(p);
-    }
+  public void addUndConstraint(A p) {
+    undConstraints.add(p);
+  }
 
-    public void addOderConstraint(Set<Constraint<A>> methodConstraints) {
-        oderConstraints.add(methodConstraints);
-    }
+  public void addOderConstraint(Set<Constraint<A>> methodConstraints) {
+    oderConstraints.add(methodConstraints);
+  }
 
-    public void addAllUndConstraint(Constraint<A> allUndConstraints){
-        undConstraints.addAll(allUndConstraints);
-    }
-    
-    public void addAllOderConstraint(List<Set<Constraint<A>>> allOderConstraints){
-        this.oderConstraints.addAll(allOderConstraints);
-    }
-    
-    public void addAll(ConstraintSet constraints) {
-        this.addAllUndConstraint(constraints.undConstraints);
-        this.addAllOderConstraint(constraints.oderConstraints);
-    }
+  public void addAllUndConstraint(Constraint<A> allUndConstraints) {
+    undConstraints.addAll(allUndConstraints);
+  }
 
-    @Override
-    public String toString(){
-    	BinaryOperator<String> b = (x,y) -> x+y;
-        return "\nUND:" + this.undConstraints.toString() + "\n" + 
-    		   "ODER:" + this.oderConstraints.stream().reduce("", (x,y) -> x.toString()+ "\n"  +y, b);
-        		//cartesianProduct().toString();
-    }
+  public void addAllOderConstraint(List<Set<Constraint<A>>> allOderConstraints) {
+    this.oderConstraints.addAll(allOderConstraints);
+  }
 
-    public Set<List<Constraint<A>>> cartesianProduct(){
-        Set<Constraint<A>> toAdd = new HashSet<>();
-        toAdd.add(undConstraints);
-        List<Set<Constraint<A>>> allConstraints = new ArrayList<>();
-        allConstraints.add(toAdd);
-        allConstraints.addAll(oderConstraints);
-        return new GuavaSetOperations().cartesianProduct(allConstraints);
-    }
+  public void addAll(ConstraintSet constraints) {
+    this.addAllUndConstraint(constraints.undConstraints);
+    this.addAllOderConstraint(constraints.oderConstraints);
+  }
 
-    public <B> ConstraintSet<B> map(Function<? super A, ? extends B> o) {
-    	Hashtable<Constraint<A>,Constraint<B>> CSA2CSB = new Hashtable<>();
-        ConstraintSet<B> ret = new ConstraintSet<>();
-        ret.undConstraints = undConstraints.stream().map(o).collect(Collectors.toCollection(Constraint<B>::new));
-        List<Set<Constraint<B>>> newOder = new ArrayList<>();
+  @Override
+  public String toString() {
+    BinaryOperator<String> b = (x, y) -> x + y;
+    return "\nUND:\n" + this.undConstraints.toString() +
+      "ODER:" + this.oderConstraints.stream().reduce("", (x, y) -> x + "\n\t" + y, b) +
+      "\n";
+    //cartesianProduct().toString();
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof ConstraintSet<?> other)) return false;
+    return Objects.equals(undConstraints, other.undConstraints)
+      && Objects.equals(oderConstraints, other.oderConstraints);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(undConstraints, oderConstraints);
+  }
+
+  public Set<List<Constraint<A>>> cartesianProduct() {
+    Set<Constraint<A>> toAdd = new HashSet<>();
+    toAdd.add(undConstraints);
+    List<Set<Constraint<A>>> allConstraints = new ArrayList<>();
+    allConstraints.add(toAdd);
+    allConstraints.addAll(oderConstraints);
+    return new GuavaSetOperations().cartesianProduct(allConstraints);
+  }
+
+  public <B extends IConstraintElement> ConstraintSet<B> map(Function<? super A, ? extends B> o) {
+    Hashtable<Constraint<A>, Constraint<B>> CSA2CSB = new Hashtable<>();
+    ConstraintSet<B> ret = new ConstraintSet<>();
+    ret.undConstraints = undConstraints.stream().map(o).collect(Collectors.toCollection(Constraint<B>::new));
+    List<Set<Constraint<B>>> newOder = new ArrayList<>();
         /*
         for(Set<Constraint<A>> oderConstraint : oderConstraints){
         	oderConstraint.forEach(as -> {
@@ -68,25 +85,25 @@ public class ConstraintSet<A> {
             	CSA2CSB.put(as, newConst);} );
         }
         */
-        
-        for(Set<Constraint<A>> oderConstraint : oderConstraints){
-            newOder.add(
-                    oderConstraint.stream().map((Constraint<A> as) -> {
-                    	
-                    	Constraint<B> newConst = as.stream()
-                    			.map(o)
-                    			.collect(Collectors.toCollection((
-                    					() -> new Constraint<B> (as.isInherited(),
-                    											 as.isImplemented(),
-                    											 (as.getExtendConstraint() != null)
-                    											     ? as.getExtendConstraint().stream().map(o).collect(Collectors.toCollection(Constraint::new))
-                    											     : null,
-                    							                 as.getmethodSignatureConstraint().stream().map(o).collect(Collectors.toCollection(HashSet::new)))) 
-                    			));                    							
-                    	
-                    	//CSA2CSB.put(as, newConst);
-                    	
-                    	return newConst;
+
+    for (Set<Constraint<A>> oderConstraint : oderConstraints) {
+      newOder.add(
+        oderConstraint.stream().map((Constraint<A> as) -> {
+
+          Constraint<B> newConst = as.stream()
+            .map(o)
+            .collect(Collectors.toCollection((
+              () -> new Constraint<B>(as.isInherited(),
+                as.isImplemented(),
+                (as.getExtendConstraint() != null)
+                  ? as.getExtendConstraint().stream().map(o).collect(Collectors.toCollection(Constraint::new))
+                  : null,
+                as.getmethodSignatureConstraint().stream().map(o).collect(Collectors.toCollection(HashSet::new))))
+            ));
+
+          //CSA2CSB.put(as, newConst);
+
+          return newConst;
                     	
                     	/*
                     	Constraint<B> bs = CSA2CSB.get(as);
@@ -95,36 +112,60 @@ public class ConstraintSet<A> {
                     	}
                     	return bs;
                     	*/
-                    }).collect(Collectors.toSet())
-            );
-        }
-        
-        ret.oderConstraints = newOder;
-        return ret;
+        }).collect(Collectors.toSet())
+      );
     }
-    
-    public void forEach (Consumer<? super A> c) {
-        undConstraints.stream().forEach(c);
-        for(Set<Constraint<A>> oderConstraint : oderConstraints){
-            oderConstraint.parallelStream().forEach((Constraint<A> as) ->
-                            as.stream().forEach(c));
-        }
+
+    ret.oderConstraints = newOder;
+    return ret;
+  }
+
+  public void forEach(Consumer<? super A> c) {
+    undConstraints.stream().forEach(c);
+    for (Set<Constraint<A>> oderConstraint : oderConstraints) {
+      oderConstraint.parallelStream().forEach((Constraint<A> as) ->
+        as.stream().forEach(c));
     }
-    
-    public Set<A> getAll () {
-    	Set<A> ret = new HashSet<>();
-        ret.addAll(undConstraints);
-        for(Set<Constraint<A>> oderConstraint : oderConstraints){
-            oderConstraint.parallelStream().forEach((Constraint<A> as) -> ret.addAll(as));
-        }
-        return ret;
-    }
-    
-    public List<Set<Constraint<A>>> getOderConstraints() {
-    	return oderConstraints;
-    }
-    
-    public Set<A> getUndConstraints() {
-    	return undConstraints;
+  }
+
+  public Set<A> getAll() {
+    Set<A> ret = new HashSet<>(undConstraints);
+    for (Set<Constraint<A>> oderConstraint : oderConstraints) {
+      oderConstraint.parallelStream().forEach(ret::addAll);
     }
+    return ret;
+  }
+
+  public List<Set<Constraint<A>>> getOderConstraints() {
+    return oderConstraints;
+  }
+
+  public Set<A> getUndConstraints() {
+    return undConstraints;
+  }
+
+  @Override
+  public SerialMap toSerial(KeyStorage keyStorage) {
+    SerialMap serialized = new SerialMap();
+    serialized.put("undConstraints", undConstraints.toSerial(keyStorage));
+    serialized.put("oderConstraints", SerialList.fromMapped(oderConstraints, oderConstraintSet ->
+      SerialList.fromMapped(oderConstraintSet, oderConstraint ->
+        oderConstraint.toSerial(keyStorage))
+    ));
+    return serialized;
+  }
+
+  public static <T extends IConstraintElement> ConstraintSet<T> fromSerial(SerialMap data, UnifyContext context, Class<T> target, KeyStorage keyStorage) {
+    ConstraintSet<T> constraintSet = new ConstraintSet<>();
+
+    constraintSet.undConstraints = Constraint.fromSerial(data.getUUID("undConstraints"), context, target, keyStorage);
+    constraintSet.oderConstraints = data.getList("oderConstraints").assertListOfLists().stream()
+      .map(oderConstraintSetData -> oderConstraintSetData.assertListOfUUIDs().stream()
+        .map(oderConstraintData -> Constraint.fromSerial(oderConstraintData, context, target, keyStorage))
+        .collect(Collectors.toSet())
+      ).toList();
+
+    return constraintSet;
+  }
+
 }

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

@@ -0,0 +1,4 @@
+package de.dhbwstuttgart.typeinference.constraints;
+
+public interface IConstraintElement {
+}

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

@@ -1,72 +1,70 @@
 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.SerialMap;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.SourceLoc;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.antlr.v4.runtime.Token;
 
 
-public class Pair implements Serializable
-{
-    public final RefTypeOrTPHOrWildcardOrGeneric TA1;
-    public final RefTypeOrTPHOrWildcardOrGeneric TA2;
+public class Pair implements Serializable, IConstraintElement, ISerializableData {
+  public final RefTypeOrTPHOrWildcardOrGeneric TA1;
+  public final RefTypeOrTPHOrWildcardOrGeneric TA2;
 
-    private SourceLoc location;
+  private SourceLoc location;
 
-    private PairOperator eOperator = PairOperator.SMALLER;
-    private Boolean noUnification = false;
-    
+  private PairOperator eOperator = PairOperator.SMALLER;
+  private Boolean noUnification = false;
 
-    private Pair(RefTypeOrTPHOrWildcardOrGeneric TA1, RefTypeOrTPHOrWildcardOrGeneric TA2 )
-    {
-        this.TA1 = TA1;
-        this.TA2 = TA2;
-        if(TA1 == null || TA2 == null)
-            throw new NullPointerException();
-        eOperator = PairOperator.SMALLER;
-    }
 
-    public Pair(RefTypeOrTPHOrWildcardOrGeneric TA1, RefTypeOrTPHOrWildcardOrGeneric TA2, PairOperator eOp)
-    {
-        // Konstruktor
-        this(TA1,TA2);
-        this.eOperator = eOp;
-    }
+  private Pair(RefTypeOrTPHOrWildcardOrGeneric TA1, RefTypeOrTPHOrWildcardOrGeneric TA2) {
+    this.TA1 = TA1;
+    this.TA2 = TA2;
+    if (TA1 == null || TA2 == null)
+      throw new NullPointerException();
+    eOperator = PairOperator.SMALLER;
+  }
 
-    public Pair(RefTypeOrTPHOrWildcardOrGeneric TA1, RefTypeOrTPHOrWildcardOrGeneric TA2, PairOperator e0p, SourceLoc location) {
-        this(TA1, TA2, e0p);
-        this.location = location;
-    }
-    
-    public Pair(RefTypeOrTPHOrWildcardOrGeneric TA1, RefTypeOrTPHOrWildcardOrGeneric TA2, PairOperator eOp, Boolean noUnification)
-    {
-        // Konstruktor
-        this(TA1,TA2);
-        this.eOperator = eOp;
-        this.noUnification = noUnification;
-    }
+  public Pair(RefTypeOrTPHOrWildcardOrGeneric TA1, RefTypeOrTPHOrWildcardOrGeneric TA2, PairOperator eOp) {
+    // Konstruktor
+    this(TA1, TA2);
+    this.eOperator = eOp;
+  }
 
-    public SourceLoc getLocation() {
-        return this.location;
-    }
-    
-    public String toString()
-    {
-        // otth: Gibt ein Paar als String aus --> zum Debuggen und Vergleichen
-        String strElement1 = "NULL";
-        String strElement2 = "NULL";
-        String Operator = "<.";
-        
-        if( TA1 != null )
-             strElement1 = TA1.toString();
-    
-        if( TA2 != null )
-           strElement2 = TA2.toString();
+  public Pair(RefTypeOrTPHOrWildcardOrGeneric TA1, RefTypeOrTPHOrWildcardOrGeneric TA2, PairOperator e0p, SourceLoc location) {
+    this(TA1, TA2, e0p);
+    this.location = location;
+  }
+
+  public Pair(RefTypeOrTPHOrWildcardOrGeneric TA1, RefTypeOrTPHOrWildcardOrGeneric TA2, PairOperator eOp, Boolean noUnification) {
+    // Konstruktor
+    this(TA1, TA2);
+    this.eOperator = eOp;
+    this.noUnification = noUnification;
+  }
+
+  public SourceLoc getLocation() {
+    return this.location;
+  }
+
+  public String toString() {
+    // otth: Gibt ein Paar als String aus --> zum Debuggen und Vergleichen
+    String strElement1 = "NULL";
+    String strElement2 = "NULL";
+    String Operator = "<.";
+
+    if (TA1 != null)
+      strElement1 = TA1.toString();
+
+    if (TA2 != null)
+      strElement2 = TA2.toString();
         
        /* PL ausskommentiert 2018-05-24
         if(OperatorEqual())
@@ -76,80 +74,104 @@ public class Pair implements Serializable
         if(OperatorSmallerExtends())
         	Operator = "<?";
         	*/
-        
-        return "\n(" + strElement1 + " " + eOperator.toString() + " " + strElement2 + ")";
-        
-       /*- Equals: " + bEqual*/
-    }
 
-    /**
-     * <br/>Author: J�rg B�uerle
-     * @param obj
-     * @return
-     */
-    public boolean equals(Object obj)
-    {
-        boolean ret = true;
-        ret &= (obj instanceof Pair);
-        if(!ret)return ret;
-        ret &= ((Pair)obj).TA1.equals(this.TA1);
-        ret &= ((Pair)obj).TA2.equals(this.TA2);
-        return ret;
-    }
+    return "\n(P: " + strElement1 + " " + eOperator.toString() + " " + strElement2 + ")";
 
-    /**
-	* Author: Arne Lüdtke<br/>
-	* Abfrage, ob Operator vom Typ Equal ist.
-	*/
-    public boolean OperatorEqual()
-    {
-    	return eOperator == PairOperator.EQUALSDOT;
-    }
-    
-    /**
-	* Author: Arne Lüdtke<br/>
-	* Abfrage, ob Operator vom Typ Smaller ist.
-	*/
-    public boolean OperatorSmaller()
-    {
-    	return eOperator == PairOperator.SMALLER;
-    }
-    
-    /**
-	* Author: Arne Lüdtke<br/>
-	* Abfrage, ob Operator vom Typ SmallerExtends ist.
-	*/
-    public boolean OperatorSmallerExtends()
-    {
-    	return eOperator == PairOperator.SMALLERDOTWC;
-    }
-    
-    /**
-	* Author: Arne Lüdtke<br/>
-	* Gibt den Operator zurück.
-	*/
-    public PairOperator GetOperator()
-    {
-    	return eOperator;
-    }
+    /*- Equals: " + bEqual*/
+  }
 
-    public boolean OperatorSmallerDot() {
-        return eOperator == PairOperator.SMALLERDOT;
-    }
-    
-    
-    static public Map<String, TypePlaceholder> generateTPHMap(ConstraintSet<Pair> constraints) {
-        HashMap<String, TypePlaceholder> ret = new HashMap<>();
-        constraints.map((Pair p) -> {
-            if (p.TA1 instanceof TypePlaceholder) {
-                ret.put(((TypePlaceholder) p.TA1).getName(), (TypePlaceholder) p.TA1);
-            }
-            if (p.TA2 instanceof TypePlaceholder) {
-                ret.put(((TypePlaceholder) p.TA2).getName(), (TypePlaceholder) p.TA2);
-            }
-            return null;
-        });
-        return ret;
-    }
+  /**
+   * <br/>Author: J�rg B�uerle
+   *
+   * @param obj
+   * @return
+   */
+  public boolean equals(Object obj) {
+    return (
+      (obj instanceof Pair pairObj) &&
+        pairObj.TA1.equals(this.TA1) &&
+        pairObj.TA2.equals(this.TA2)
+    );
+  }
+
+  /**
+   * Author: Arne Lüdtke<br/>
+   * Abfrage, ob Operator vom Typ Equal ist.
+   */
+  public boolean OperatorEqual() {
+    return eOperator == PairOperator.EQUALSDOT;
+  }
+
+  /**
+   * Author: Arne Lüdtke<br/>
+   * Abfrage, ob Operator vom Typ Smaller ist.
+   */
+  public boolean OperatorSmaller() {
+    return eOperator == PairOperator.SMALLER;
+  }
+
+  /**
+   * Author: Arne Lüdtke<br/>
+   * Abfrage, ob Operator vom Typ SmallerExtends ist.
+   */
+  public boolean OperatorSmallerExtends() {
+    return eOperator == PairOperator.SMALLERDOTWC;
+  }
+
+  /**
+   * Author: Arne Lüdtke<br/>
+   * Gibt den Operator zurück.
+   */
+  public PairOperator GetOperator() {
+    return eOperator;
+  }
+
+  public boolean OperatorSmallerDot() {
+    return eOperator == PairOperator.SMALLERDOT;
+  }
+
+
+  static public Map<String, TypePlaceholder> generateTPHMap(ConstraintSet<Pair> constraints) {
+    HashMap<String, TypePlaceholder> ret = new HashMap<>();
+    constraints.map((Pair p) -> {
+      if (p.TA1 instanceof TypePlaceholder) {
+        ret.put(((TypePlaceholder) p.TA1).getName(), (TypePlaceholder) p.TA1);
+      }
+      if (p.TA2 instanceof TypePlaceholder) {
+        ret.put(((TypePlaceholder) p.TA2).getName(), (TypePlaceholder) p.TA2);
+      }
+      return null;
+    });
+    return ret;
+  }
+
+  @Override
+  public SerialMap toSerial(KeyStorage keyStorage) {
+    // because toString() will output TA1 and TA2 recursively, we can ignore potential infinite recursion here too
+    SerialMap serialized = new SerialMap();
+    serialized.put("ta1", this.TA1.toSerial(keyStorage));
+    serialized.put("ta2", this.TA2.toSerial(keyStorage));
+    serialized.put("op", this.eOperator.toString());
+    serialized.put("noUnification", this.noUnification ? 1 : 0);
+    serialized.put("location", this.location == null ? null : this.location.toSerial(keyStorage));
+    return serialized;
+  }
+
+  public static Pair fromSerial(SerialMap data, UnifyContext context) {
+    String op = data.getValue("op").getOf(String.class);
+    SerialMap ta1 = data.getMap("ta1");
+    SerialMap ta2 = data.getMap("ta2");
+    Boolean noUnification = data.getValue("noUnification").getOf(Integer.class) == 1;
+    SerialMap location = data.getMapOrNull("location");
+
+    var pair = new Pair(
+      RefTypeOrTPHOrWildcardOrGeneric.fromSerial(ta1, context),
+      RefTypeOrTPHOrWildcardOrGeneric.fromSerial(ta2, context),
+      PairOperator.fromString(op),
+      noUnification
+    );
+    if (location != null) pair.location = SourceLoc.fromSerial(location);
+    return pair;
+  }
 }
 // ino.end

src/main/java/de/dhbwstuttgart/typeinference/result/PairNoResult.java

@@ -1,15 +1,19 @@
 package de.dhbwstuttgart.typeinference.result;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
+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.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 
 /**
  * enthaelt alle Paare, die in einem Ergebnis nicht vorkommen koennen
  * sie sind noetig fuer origPairs in PairTPHsmallerTPH, da hier auch
  * Paare vorkommen koennen die keine Result sind (z.B. bei FunN$$)
  */
-public class PairNoResult extends ResultPair<RefTypeOrTPHOrWildcardOrGeneric, RefTypeOrTPHOrWildcardOrGeneric>{
+public class PairNoResult extends ResultPair<RefTypeOrTPHOrWildcardOrGeneric, RefTypeOrTPHOrWildcardOrGeneric>
+implements ISerializableData {
     //public final TypePlaceholder left;
     //public final TypePlaceholder right;
     
@@ -17,7 +21,7 @@ public class PairNoResult extends ResultPair<RefTypeOrTPHOrWildcardOrGeneric, Re
      * urspruengliches Paar aus diesem dieses Resultpair erzeugt wurde
      * wichtig fuer generated Generics
      */
-    ResultPair origPair;
+    ResultPair<?,?> origPair;
 
     public PairNoResult(RefTypeOrTPHOrWildcardOrGeneric left, RefTypeOrTPHOrWildcardOrGeneric right){
         super(left, right);
@@ -29,4 +33,24 @@ public class PairNoResult extends ResultPair<RefTypeOrTPHOrWildcardOrGeneric, Re
     	throw new NotImplementedException();
         //visitor.visit(this);
     }
+
+    @Override
+    public SerialMap toSerial(KeyStorage keyStorage) {
+        SerialMap serialized = new SerialMap();
+        serialized.put("left", this.getLeft().toSerial(keyStorage));
+        serialized.put("right", this.getRight().toSerial(keyStorage));
+        // create the wrapper and put this as the object
+        var serializedWrapper = super.toSerial(keyStorage);
+        serializedWrapper.put("object", serialized);
+        return serializedWrapper;
+    }
+
+    public static PairNoResult fromSerial2(SerialMap data, UnifyContext context) {
+        SerialMap left = data.getMap("left");
+        SerialMap right = data.getMap("right");
+        return new PairNoResult(
+          RefTypeOrTPHOrWildcardOrGeneric.fromSerial(left, context),
+          RefTypeOrTPHOrWildcardOrGeneric.fromSerial(right, context)
+        );
+    }
 }

src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHEqualTPH.java

@@ -1,9 +1,13 @@
 package de.dhbwstuttgart.typeinference.result;
 
+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.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 
-public class PairTPHEqualTPH extends ResultPair<TypePlaceholder, TypePlaceholder> {
+public class PairTPHEqualTPH extends ResultPair<TypePlaceholder, TypePlaceholder> implements ISerializableData {
     public PairTPHEqualTPH(TypePlaceholder tl, TypePlaceholder tr) {
         super(tl, tr);
     }
@@ -12,4 +16,24 @@ public class PairTPHEqualTPH extends ResultPair<TypePlaceholder, TypePlaceholder
     public void accept(ResultPairVisitor visitor) {
         visitor.visit(this);
     }
+
+    @Override
+    public SerialMap toSerial(KeyStorage keyStorage) {
+        SerialMap serialized = new SerialMap();
+        serialized.put("left", this.getLeft().toSerial(keyStorage));
+        serialized.put("right", this.getRight().toSerial(keyStorage));
+        // create the wrapper and put this as the object
+        var serializedWrapper = super.toSerial(keyStorage);
+        serializedWrapper.put("object", serialized);
+        return serializedWrapper;
+    }
+
+    public static PairTPHEqualTPH fromSerial2(SerialMap data, UnifyContext context) {
+        SerialMap left = data.getMap("left");
+        SerialMap right = data.getMap("right");
+        return new PairTPHEqualTPH(
+          (TypePlaceholder) RefTypeOrTPHOrWildcardOrGeneric.fromSerial(left, context),
+          (TypePlaceholder) RefTypeOrTPHOrWildcardOrGeneric.fromSerial(right, context)
+        );
+    }
 }

src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHequalRefTypeOrWildcardType.java

@@ -1,13 +1,17 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+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.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 
 /**
  * Steht für A =. RefType
  */
-public class PairTPHequalRefTypeOrWildcardType extends ResultPair{
+public class PairTPHequalRefTypeOrWildcardType extends ResultPair<TypePlaceholder, RefTypeOrTPHOrWildcardOrGeneric>
+implements ISerializableData {
     public final TypePlaceholder left;
     public final RefTypeOrTPHOrWildcardOrGeneric right;
 
@@ -26,4 +30,24 @@ public class PairTPHequalRefTypeOrWildcardType extends ResultPair{
     public String toString() {
     	return "(" + left.toString() + " = " + right.toString() + ")";
     }
+
+    @Override
+    public SerialMap toSerial(KeyStorage keyStorage) {
+        SerialMap serialized = new SerialMap();
+        serialized.put("left", this.getLeft().toSerial(keyStorage));
+        serialized.put("right", this.getRight().toSerial(keyStorage));
+        // create the wrapper and put this as the object
+        var serializedWrapper = super.toSerial(keyStorage);
+        serializedWrapper.put("object", serialized);
+        return serializedWrapper;
+    }
+
+    public static PairTPHequalRefTypeOrWildcardType fromSerial2(SerialMap data, UnifyContext context) {
+        SerialMap left = data.getMap("left");
+        SerialMap right = data.getMap("right");
+        return new PairTPHequalRefTypeOrWildcardType(
+          (TypePlaceholder)RefTypeOrTPHOrWildcardOrGeneric.fromSerial(left, context),
+          RefTypeOrTPHOrWildcardOrGeneric.fromSerial(right, context)
+        );
+    }
 }

src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHsmallerTPH.java

@@ -1,12 +1,17 @@
 package de.dhbwstuttgart.typeinference.result;
 
+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.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 
 /**
  * Steht für: A <. B
  */
-public class PairTPHsmallerTPH extends ResultPair{
+public class PairTPHsmallerTPH extends ResultPair<TypePlaceholder,TypePlaceholder>
+  implements ISerializableData {
     public final TypePlaceholder left;
     public final TypePlaceholder right;
     
@@ -14,7 +19,7 @@ public class PairTPHsmallerTPH extends ResultPair{
      * urspruengliches Paar aus diesem dieses Resultpair erzeugt wurde
      * wichtig fuer generated Generics
      */
-    ResultPair origPair;
+    ResultPair<?,?> origPair;
 
     public PairTPHsmallerTPH(TypePlaceholder left, TypePlaceholder right){
         super(left, right);
@@ -22,7 +27,7 @@ public class PairTPHsmallerTPH extends ResultPair{
         this.right = right;
     }
 
-    public PairTPHsmallerTPH(TypePlaceholder left, TypePlaceholder right, ResultPair origPair){
+    public PairTPHsmallerTPH(TypePlaceholder left, TypePlaceholder right, ResultPair<?,?> origPair){
     	this(left, right);
     	this.origPair = origPair;
     }
@@ -36,4 +41,24 @@ public class PairTPHsmallerTPH extends ResultPair{
     public String toString() {
     	return "(" + left.toString() + " < " + right.toString() + ")";
     }
+
+    @Override
+    public SerialMap toSerial(KeyStorage keyStorage) {
+        SerialMap serialized = new SerialMap();
+        serialized.put("left", this.getLeft().toSerial(keyStorage));
+        serialized.put("right", this.getRight().toSerial(keyStorage));
+        // create the wrapper and put this as the object
+        var serializedWrapper = super.toSerial(keyStorage);
+        serializedWrapper.put("object", serialized);
+        return serializedWrapper;
+    }
+
+    public static PairTPHsmallerTPH fromSerial2(SerialMap data, UnifyContext context) {
+        SerialMap left = data.getMap("left");
+        SerialMap right = data.getMap("right");
+        return new PairTPHsmallerTPH(
+          (TypePlaceholder) RefTypeOrTPHOrWildcardOrGeneric.fromSerial(left, context),
+          (TypePlaceholder) RefTypeOrTPHOrWildcardOrGeneric.fromSerial(right, context)
+        );
+    }
 }

src/main/java/de/dhbwstuttgart/typeinference/result/ResultPair.java

@@ -1,11 +1,17 @@
 package de.dhbwstuttgart.typeinference.result;
 
+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.server.packet.dataContainers.serialized.SerialValue;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.typeinference.unify.UnifyContext;
 
 /**
  * Paare, welche das Unifikationsergebnis darstellen
  */
-public abstract class ResultPair<A extends RefTypeOrTPHOrWildcardOrGeneric, B extends RefTypeOrTPHOrWildcardOrGeneric> implements Comparable<ResultPair<A,B>> {
+public abstract class ResultPair<A extends RefTypeOrTPHOrWildcardOrGeneric,B extends RefTypeOrTPHOrWildcardOrGeneric>
+implements ISerializableData {
     private final A left;
     private final B right;
 
@@ -59,13 +65,34 @@ public abstract class ResultPair<A extends RefTypeOrTPHOrWildcardOrGeneric, B ex
 		return true;
 	}
 
-	@Override
-	public int compareTo(ResultPair<A, B> o) {
-		if (o == null) {
-			return 1; // this is greater than null
-		}
 
-		return o.left.toString().compareTo(this.left.toString());
+	@Override
+	public SerialMap toSerial(KeyStorage keyStorage) {
+		SerialMap serialized = new SerialMap();
+		String type = switch (this) {
+      case PairNoResult _ -> "pnr";
+      case PairTPHEqualTPH _ -> "ptet";
+      case PairTPHsmallerTPH _ -> "ptst";
+      case PairTPHequalRefTypeOrWildcardType _ -> "ptertwt";
+      default -> throw new RuntimeException("No type defined for ResultPair of class " + this.getClass().getName());
+    };
+    serialized.put("type", type);
+		// 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 <A extends RefTypeOrTPHOrWildcardOrGeneric,B extends RefTypeOrTPHOrWildcardOrGeneric> ResultPair<A,B>
+	fromSerial(SerialMap data, UnifyContext context) {
+		String type = data.getValue("type").getOf(String.class);
+		SerialMap object = data.getMap("object");
+
+    return switch (type) {
+      case "pnr" -> (ResultPair) PairNoResult.fromSerial2(object, context);
+      case "ptet" -> (ResultPair) PairTPHEqualTPH.fromSerial2(object, context);
+      case "ptst" -> (ResultPair) PairTPHsmallerTPH.fromSerial2(object, context);
+      case "ptertwt" -> (ResultPair) PairTPHequalRefTypeOrWildcardType.fromSerial2(object, context);
+      default -> throw new RuntimeException("Could not unserialize class of unhandled type " + type);
+    };
 	}
-   
 }

src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java

@@ -1,8 +1,14 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import java.util.Collections;
+import com.google.common.collect.Ordering;
+import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
+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.typeinference.unify.UnifyContext;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
@@ -12,167 +18,177 @@ import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import java.util.stream.Collectors;
 
 @SuppressWarnings("rawtypes")
-public class ResultSet implements Comparable<ResultSet>{
+public class ResultSet implements ISerializableData {
 
-    public final Set<ResultPair> results;
-    public Set<ResultPair<TypePlaceholder, TypePlaceholder>> genIns;
+  public final Set<ResultPair> results;
+  public Set<ResultPair<TypePlaceholder, TypePlaceholder>> genIns;
 
-    public ResultSet(Set<ResultPair> set){
-        this.results = set;
-        this.genIns = new HashSet<>();
-        results.forEach(x -> { if (x instanceof PairTPHsmallerTPH) { this.genIns.add(x);}} );
+  public ResultSet(Set<ResultPair> set) {
+    this.results = set;
+    this.genIns = new HashSet<>();
+    results.forEach(x -> {
+      if (x instanceof PairTPHsmallerTPH) {
+        this.genIns.add(x);
+      }
+    });
+  }
+
+  public boolean contains(ResultPair toCheck) {
+    return this.results.contains(toCheck);
+  }
+
+  public void remove(ResultPair toCheck) {
+    results.remove(toCheck);
+  }
+
+  public ResolvedType resolveType(RefTypeOrTPHOrWildcardOrGeneric type) {
+    if (type instanceof TypePlaceholder)
+      return new Resolver(this).resolve((TypePlaceholder) type);
+    if (type instanceof GenericRefType) return new ResolvedType(type, new HashSet<>());
+    if (type instanceof RefType) {
+      RelatedTypeWalker related = new RelatedTypeWalker(null, this);
+      type.accept(related);
+      return new ResolvedType(type, related.relatedTPHs);
+    } else {
+      throw new NotImplementedException();
+      //return new ResolvedType(type,new HashSet<>());
     }
+  }
 
-    public List<ResultPair> getSortedResults() {
-    	return results.stream().sorted().toList();
-    }
-    
-    public boolean contains(ResultPair toCheck) {
-    	return this.results.contains(toCheck);
-    }
-    
-    public void remove(ResultPair toCheck) {
-    	results.remove(toCheck);
+  public String toString() {
+    var results = new ArrayList<>(this.results);
+    results.sort(
+      Comparator
+        .comparingInt((ResultPair o) -> o.getLeft().toString().length())
+        .thenComparing(o -> o.getLeft().toString())
+        .thenComparingInt(o -> o.getRight().toString().length())
+        .thenComparing(o -> o.getRight().toString())
+    );
+    return results.toString();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o instanceof ResultSet other) {
+      // sort both result lists
+      var thisElements = new ArrayList<>(this.results);
+      thisElements.sort(Ordering.usingToString());
+      var otherElements = new ArrayList<>(other.results);
+      otherElements.sort(Ordering.usingToString());
+
+      return thisElements.equals(otherElements);
+    } else {
+      return false;
     }
+  }
 
-    public ResolvedType resolveType(RefTypeOrTPHOrWildcardOrGeneric type) {
-        if(type instanceof TypePlaceholder)
-            return new Resolver(this).resolve((TypePlaceholder)type);
-        if(type instanceof GenericRefType)return new ResolvedType(type, new HashSet<>());
-        if(type instanceof RefType) {
-            RelatedTypeWalker related = new RelatedTypeWalker(null, this);
-            type.accept(related);
-            return new ResolvedType(type, related.relatedTPHs);
-        } else {
-            throw new NotImplementedException();
-            //return new ResolvedType(type,new HashSet<>());
-        }
-    }
+  @Override
+  public int hashCode() {
+    return results.hashCode();
+  }
 
-    public String toString() {
-    	return results.toString();
-    }
+  @Override
+  public SerialMap toSerial(KeyStorage keyStorage) {
+    SerialMap serialized = new SerialMap();;
+    serialized.put("results", SerialList.fromMapped(results, result -> result.toSerial(keyStorage)));
+    return serialized;
+  }
 
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof ResultSet) {
-			ResultSet other = (ResultSet)o;
-			return this.results.equals(other.results);
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		return results.hashCode();
-	}
-
-    @Override
-    public int compareTo(ResultSet o) {
-        List<ResultPair> thisSorted = this.getSortedResults();
-        List<ResultPair> otherSorted = o.getSortedResults();
-        int sizeCompare = Integer.compare(thisSorted.size(), otherSorted.size());
-        if (sizeCompare != 0) return sizeCompare;
-
-        for (int i = 0; i < thisSorted.size(); i++) {
-            int cmp = thisSorted.get(i).compareTo(otherSorted.get(i));
-            if (cmp != 0) return cmp;
-        }
-
-        return 0;
-    }
+  public static ResultSet fromSerial(SerialMap data, UnifyContext context) {
+    var resultsData = data.getList("results").assertListOfMaps();
+    return new ResultSet(resultsData.stream().map(resultData -> ResultPair.fromSerial(resultData, context)).collect(Collectors.toSet()));
+  }
 }
 
 class Resolver implements ResultSetVisitor {
-    private final ResultSet result;
-    private TypePlaceholder toResolve;
-    private RefTypeOrTPHOrWildcardOrGeneric resolved;
-    private final Set<GenericInsertPair> additionalTPHs = new HashSet<>();
-    private ResultPair<?,?> currentPair;
+  private final ResultSet result;
+  private TypePlaceholder toResolve;
+  private RefTypeOrTPHOrWildcardOrGeneric resolved;
+  private final Set<GenericInsertPair> additionalTPHs = new HashSet<>();
+  private ResultPair<?, ?> currentPair;
 
-    public Resolver(ResultSet resultPairs){
-        this.result = resultPairs;
+  public Resolver(ResultSet resultPairs) {
+    this.result = resultPairs;
+  }
+
+  public ResolvedType resolve(TypePlaceholder tph) {
+    toResolve = tph;
+    resolved = null;
+    System.out.println(tph.toString());
+    for (ResultPair<?, ?> resultPair : result.results) {
+      if (resultPair instanceof PairTPHEqualTPH && ((PairTPHEqualTPH) resultPair).getLeft().equals(toResolve)) {
+        currentPair = resultPair;
+        return resolve(((PairTPHEqualTPH) resultPair).getRight());
+      }
+    }
+    for (ResultPair<?, ?> resultPair : result.results) {
+      currentPair = resultPair;
+      resultPair.accept(this);
+    }
+    if (resolved == null) {//TPH kommt nicht im Result vor:
+      resolved = tph;
     }
 
-    public ResolvedType resolve(TypePlaceholder tph){
-        toResolve = tph;
-        resolved = null;
-        System.out.println(tph.toString());
-        for(ResultPair<?,?> resultPair : result.results) {
-            if(resultPair instanceof PairTPHEqualTPH && ((PairTPHEqualTPH) resultPair).getLeft().equals(toResolve)){
-            	currentPair = resultPair;
-                return resolve(((PairTPHEqualTPH) resultPair).getRight());
-            }
-        }
-        for(ResultPair<?,?> resultPair : result.results){
-        	currentPair = resultPair;
-            resultPair.accept(this);
-        }
-        if(resolved==null){//TPH kommt nicht im Result vor:
-            resolved = tph;
-        }
+    ResolvedType result = new ResolvedType(resolved, additionalTPHs);//resolved;
+    result.setResultPair(currentPair);
+    return result;
+  }
 
-        ResolvedType result = new ResolvedType(resolved, additionalTPHs);//resolved;
-        result.setResultPair(currentPair);
-        return result;
+  @Override
+  public void visit(PairTPHsmallerTPH p) {
+    currentPair = p;
+    if (p.left.equals(toResolve)) {
+      additionalTPHs.add(new GenericInsertPair(p.left, p.right));
+      additionalTPHs.addAll(new RelatedTypeWalker(p.right, result).relatedTPHs);
     }
+    if (p.right.equals(toResolve))
+      additionalTPHs.addAll(new RelatedTypeWalker(p.left, result).relatedTPHs);
+  }
 
-    @Override
-    public void visit(PairTPHsmallerTPH p) {
-    	currentPair = p;
-        if(p.left.equals(toResolve)){
-            additionalTPHs.add(new GenericInsertPair(p.left, p.right));
-            additionalTPHs.addAll(new RelatedTypeWalker(p.right, result).relatedTPHs);
-        }
-        if(p.right.equals(toResolve))
-            additionalTPHs.addAll(new RelatedTypeWalker(p.left, result).relatedTPHs);
+  @Override
+  public void visit(PairTPHequalRefTypeOrWildcardType p) {
+    currentPair = p;
+    if (p.left.equals(toResolve)) {
+      resolved = p.right;
+      RelatedTypeWalker related = new RelatedTypeWalker(null, result);
+      p.right.accept(related);
+      additionalTPHs.addAll(related.relatedTPHs);
     }
+  }
 
-    @Override
-    public void visit(PairTPHequalRefTypeOrWildcardType p) {
-    	currentPair = p;
-        if(p.left.equals(toResolve)){
-            resolved = p.right;
-            RelatedTypeWalker related = new RelatedTypeWalker(null, result);
-            p.right.accept(related);
-            additionalTPHs.addAll(related.relatedTPHs);
-        }
-    }
+  @Override
+  public void visit(PairTPHEqualTPH p) {
+    //Do nothing. Dieser Fall wird in der resolve-Methode abgefangen
+  }
 
-    @Override
-    public void visit(PairTPHEqualTPH p) {
-        //Do nothing. Dieser Fall wird in der resolve-Methode abgefangen
-    }
+  @Override
+  public void visit(RefType refType) {
 
-    @Override
-    public void visit(RefType refType) {
+  }
 
-    }
+  @Override
+  public void visit(GenericRefType genericRefType) {
 
-    @Override
-    public void visit(GenericRefType genericRefType) {
+  }
 
-    }
+  @Override
+  public void visit(SuperWildcardType superWildcardType) {
 
-    @Override
-    public void visit(SuperWildcardType superWildcardType) {
+  }
 
-    }
+  @Override
+  public void visit(TypePlaceholder typePlaceholder) {
 
-    @Override
-    public void visit(TypePlaceholder typePlaceholder) {
+  }
 
-    }
+  @Override
+  public void visit(ExtendsWildcardType extendsWildcardType) {
 
-    @Override
-    public void visit(ExtendsWildcardType extendsWildcardType) {
+  }
 
-    }
-    
-    
 
 }
 
@@ -182,149 +198,150 @@ class Resolver implements ResultSetVisitor {
 @SuppressWarnings("rawtypes")
 class TPHResolver implements ResultSetVisitor {
 
-    private final TypePlaceholder tph;
-    Set<GenericInsertPair> resolved = new HashSet<>();
-    private final ResultSet resultSet;
+  private final TypePlaceholder tph;
+  Set<GenericInsertPair> resolved = new HashSet<>();
+  private final ResultSet resultSet;
 
-    TPHResolver(TypePlaceholder tph, ResultSet resultSet){
-        this.resultSet = resultSet;
-        this.tph = tph;
-        for(ResultPair p : resultSet.results){
-            p.accept(this);
-        }
-        if(resolved.size() == 0){
-            resolved.add(new GenericInsertPair(tph, null));
-        }
+  TPHResolver(TypePlaceholder tph, ResultSet resultSet) {
+    this.resultSet = resultSet;
+    this.tph = tph;
+    for (ResultPair p : resultSet.results) {
+      p.accept(this);
     }
-
-    @Override
-    public void visit(PairTPHsmallerTPH p) {
-        if(p.left.equals(tph) || p.right.equals(tph)){
-            resolved.add(new GenericInsertPair(p.left, p.right));
-        }
+    if (resolved.size() == 0) {
+      resolved.add(new GenericInsertPair(tph, null));
     }
+  }
 
-    @Override
-    public void visit(PairTPHequalRefTypeOrWildcardType p) {
-        TypePlaceholder otherSide = null;
-        if(p.right.equals(tph)){
-            otherSide = p.left;
-        }
-        if(otherSide != null){
-            Set<ResultPair> newResultSet = new HashSet<>(this.resultSet.results);
-            newResultSet.remove(p);
-            resolved.addAll(new TPHResolver(otherSide, new ResultSet(newResultSet)).resolved);
-        }
+  @Override
+  public void visit(PairTPHsmallerTPH p) {
+    if (p.left.equals(tph) || p.right.equals(tph)) {
+      resolved.add(new GenericInsertPair(p.left, p.right));
     }
+  }
 
-    @Override
-    public void visit(PairTPHEqualTPH p) {
-        //ignorieren. Wird vom Resolver behandelt
+  @Override
+  public void visit(PairTPHequalRefTypeOrWildcardType p) {
+    TypePlaceholder otherSide = null;
+    if (p.right.equals(tph)) {
+      otherSide = p.left;
     }
-
-    @Override
-    public void visit(RefType refType) {
-
+    if (otherSide != null) {
+      Set<ResultPair> newResultSet = new HashSet<>(this.resultSet.results);
+      newResultSet.remove(p);
+      resolved.addAll(new TPHResolver(otherSide, new ResultSet(newResultSet)).resolved);
     }
+  }
 
-    @Override
-    public void visit(GenericRefType genericRefType) {
+  @Override
+  public void visit(PairTPHEqualTPH p) {
+    //ignorieren. Wird vom Resolver behandelt
+  }
 
-    }
+  @Override
+  public void visit(RefType refType) {
 
-    @Override
-    public void visit(SuperWildcardType superWildcardType) {
+  }
 
-    }
+  @Override
+  public void visit(GenericRefType genericRefType) {
 
-    @Override
-    public void visit(TypePlaceholder typePlaceholder) {
+  }
 
-    }
+  @Override
+  public void visit(SuperWildcardType superWildcardType) {
 
-    @Override
-    public void visit(ExtendsWildcardType extendsWildcardType) {
+  }
 
-    }
+  @Override
+  public void visit(TypePlaceholder typePlaceholder) {
+
+  }
+
+  @Override
+  public void visit(ExtendsWildcardType extendsWildcardType) {
+
+  }
 }
 
 @SuppressWarnings("rawtypes")
 class RelatedTypeWalker implements ResultSetVisitor {
 
-    final Set<GenericInsertPair> relatedTPHs = new HashSet<>();
-    private final TypePlaceholder toResolve;
-    private final ResultSet resultSet;
+  final Set<GenericInsertPair> relatedTPHs = new HashSet<>();
+  private final TypePlaceholder toResolve;
+  private final ResultSet resultSet;
 
-    /**
-     * Läuft über das resultSet und speichert alle TPHs, welche mit start in Verbindung stehen
-     * @param start - kann null sein, wenn der Walker für einen RefType benutzt wird
-     * @param resultSet
-     */
-    RelatedTypeWalker(TypePlaceholder start, ResultSet resultSet){
-        this.toResolve = start;
-        this.resultSet = resultSet;
-        int resolved = 0;
-        do{
-            resolved = relatedTPHs.size();
-            for(ResultPair p : resultSet.results){
-                p.accept(this);
-                p.accept(this);
-            }
-        }while(resolved - relatedTPHs.size() > 0);
-    }
+  /**
+   * Läuft über das resultSet und speichert alle TPHs, welche mit start in Verbindung stehen
+   *
+   * @param start     - kann null sein, wenn der Walker für einen RefType benutzt wird
+   * @param resultSet
+   */
+  RelatedTypeWalker(TypePlaceholder start, ResultSet resultSet) {
+    this.toResolve = start;
+    this.resultSet = resultSet;
+    int resolved = 0;
+    do {
+      resolved = relatedTPHs.size();
+      for (ResultPair p : resultSet.results) {
+        p.accept(this);
+        p.accept(this);
+      }
+    } while (resolved - relatedTPHs.size() > 0);
+  }
 
-    @Override
-    public void visit(PairTPHsmallerTPH p) {
-        if(p.getRight().equals(toResolve)){
-            relatedTPHs.addAll(new TPHResolver(p.right, resultSet).resolved);
-            //relatedTPHs.addAll(new RelatedTypeWalker(p.right, resultSet).relatedTPHs);
-        }
-        if(p.getLeft().equals(toResolve)){
-            relatedTPHs.addAll(new TPHResolver(p.left, resultSet).resolved);
-            //relatedTPHs.addAll(new RelatedTypeWalker(p.left, resultSet).relatedTPHs);
-        }
+  @Override
+  public void visit(PairTPHsmallerTPH p) {
+    if (p.getRight().equals(toResolve)) {
+      relatedTPHs.addAll(new TPHResolver(p.right, resultSet).resolved);
+      //relatedTPHs.addAll(new RelatedTypeWalker(p.right, resultSet).relatedTPHs);
     }
+    if (p.getLeft().equals(toResolve)) {
+      relatedTPHs.addAll(new TPHResolver(p.left, resultSet).resolved);
+      //relatedTPHs.addAll(new RelatedTypeWalker(p.left, resultSet).relatedTPHs);
+    }
+  }
 
-    @Override
-    public void visit(PairTPHequalRefTypeOrWildcardType p) {
-        if(p.getLeft().equals(toResolve)){
-            p.getRight().accept(this);
-        }
+  @Override
+  public void visit(PairTPHequalRefTypeOrWildcardType p) {
+    if (p.getLeft().equals(toResolve)) {
+      p.getRight().accept(this);
     }
+  }
 
-    @Override
-    public void visit(PairTPHEqualTPH p) {
-        //Kann ignoriert werden. Diese Fälle werden vom Resolver behandelt
-    }
+  @Override
+  public void visit(PairTPHEqualTPH p) {
+    //Kann ignoriert werden. Diese Fälle werden vom Resolver behandelt
+  }
 
     /*
     Die folgenden Funktionen fügen alle TPHs an die relatedTPHs an, denen sie begegnen:
     Das wird verwendet, wenn alle relatedTPHs aus den Parametern eines RefTypes angefügt werden sollen
      */
 
-    @Override
-    public void visit(RefType refType) {
-        for(RefTypeOrTPHOrWildcardOrGeneric param : refType.getParaList()){
-            param.accept(this);
-        }
+  @Override
+  public void visit(RefType refType) {
+    for (RefTypeOrTPHOrWildcardOrGeneric param : refType.getParaList()) {
+      param.accept(this);
     }
+  }
 
-    @Override
-    public void visit(SuperWildcardType superWildcardType) {
-        superWildcardType.getInnerType().accept(this);
-    }
+  @Override
+  public void visit(SuperWildcardType superWildcardType) {
+    superWildcardType.getInnerType().accept(this);
+  }
 
-    @Override
-    public void visit(TypePlaceholder typePlaceholder) {
-        relatedTPHs.addAll(new TPHResolver(typePlaceholder, resultSet).resolved);
-    }
+  @Override
+  public void visit(TypePlaceholder typePlaceholder) {
+    relatedTPHs.addAll(new TPHResolver(typePlaceholder, resultSet).resolved);
+  }
 
-    @Override
-    public void visit(ExtendsWildcardType extendsWildcardType) {
-        extendsWildcardType.getInnerType().accept(this);
-    }
+  @Override
+  public void visit(ExtendsWildcardType extendsWildcardType) {
+    extendsWildcardType.getInnerType().accept(this);
+  }
 
-    @Override
-    public void visit(GenericRefType genericRefType) {
-    }
+  @Override
+  public void visit(GenericRefType genericRefType) {
+  }
 }

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java

@@ -1,7 +1,6 @@
 package de.dhbwstuttgart.typeinference.typeAlgo;
 
 import de.dhbwstuttgart.exceptions.DebugException;
-import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.SourceLoc;
 import de.dhbwstuttgart.parser.antlr.Java17Parser;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
@@ -10,18 +9,15 @@ import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.statement.Statement;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.target.tree.type.TargetRefType;
 import de.dhbwstuttgart.typeinference.assumptions.FieldAssumption;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
 import de.dhbwstuttgart.util.BiRelation;
 import org.antlr.v4.runtime.Token;
 
-import java.lang.reflect.Modifier;
 import java.util.*;
 
 public class TYPE {
@@ -91,25 +87,12 @@ public class TYPE {
         TypeInferenceBlockInformation blockInfo = new TypeInferenceBlockInformation(info.getAvailableClasses(), currentClass, m);
         TYPEStmt methodScope = new TYPEStmt(blockInfo);
         ConstraintSet constraintSet = new ConstraintSet();
+        m.getParameterList().getFormalparalist().forEach(el -> {
+            if(el instanceof RecordPattern){
+                constraintSet.addAll(addRecursiveParameterConstraints((RecordPattern) el, blockInfo));
 
-        if (m.name.equals("main") && Modifier.isStatic(m.modifier) && m.getParameterList().getFormalparalist().size() == 1) {
-            // Add constraint for main method
-            var firstParam = m.getParameterList().getParameterAt(0);
-
-            constraintSet.addUndConstraint(new Pair(firstParam.getType(),
-                new RefType(new JavaClassName("java.util.List"),
-                    List.of(new RefType(new JavaClassName("java.lang.String"), new NullToken())),
-                    new NullToken()),
-                PairOperator.EQUALSDOT));
-        } else {
-            m.getParameterList().getFormalparalist().forEach(el -> {
-                if (el instanceof RecordPattern rp){
-                    constraintSet.addAll(addRecursiveParameterConstraints(rp, blockInfo));
-                }
-            });
-        }
-
-
+            }
+        });
         m.block.accept(methodScope);
         constraintSet.addAll(methodScope.getConstraints());
         return constraintSet;

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java

@@ -1,6 +1,7 @@
 //PL 2018-12-19: Merge chekcen
 package de.dhbwstuttgart.typeinference.typeAlgo;
 
+import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -73,7 +74,7 @@ public class TYPEStmt implements StatementVisitor {
 
     @Override
     public void visit(LambdaExpression lambdaExpression) {
-        TypePlaceholder tphRetType = TypePlaceholder.fresh(new NullToken(), -1, false);
+        TypePlaceholder tphRetType = TypePlaceholder.fresh(new NullToken());
         List<RefTypeOrTPHOrWildcardOrGeneric> lambdaParams = lambdaExpression.params.getFormalparalist().stream().map((formalParameter -> formalParameter.getType())).collect(Collectors.toList());
         lambdaParams.add(tphRetType);
         // lambdaParams.add(0,tphRetType);
@@ -635,7 +636,6 @@ public class TYPEStmt implements StatementVisitor {
             params.add(resolver.resolve(new GenericRefType(gtv.getName(), new NullToken())));
         }
         RefTypeOrTPHOrWildcardOrGeneric receiverType;
-        
         if (receiver instanceof FunNClass) {
             receiverType = new RefType(new JavaClassName(receiver.getClassName().toString() + "$$"), params, new NullToken()); // new FunN(params);
         } else {

src/main/java/de/dhbwstuttgart/typeinference/unify/ConcurrentSetMergeTask.java

@@ -0,0 +1,64 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.RecursiveTask;
+
+public class ConcurrentSetMergeTask<T> extends RecursiveTask<Set<T>> {
+
+  public static <E> Set<E> merge(List<Set<E>> list) {
+    if (list.isEmpty()) {
+      return new HashSet<>();
+    }
+    var task = new ConcurrentSetMergeTask<>(list, 0, list.size());
+    return task.compute();
+  }
+
+  private static final int LIST_THRESHOLD = 3;
+  private static final int ELEMENT_THRESHOLD = 1000;
+
+  private final List<Set<T>> list;
+  private final int start;
+  private final int end;
+
+  private ConcurrentSetMergeTask(List<Set<T>> list, int start, int end) {
+    this.list = list;
+    this.start = start;
+    this.end = end;
+  }
+
+  @Override
+  protected Set<T> compute() {
+    int size = end - start;
+
+    int totalElements = 0;
+    for (int i = start+1; i < end; i++) {
+      totalElements += list.get(i).size();
+    }
+
+    System.out.println("ConcurrentSetMerge? -> " + (size <= LIST_THRESHOLD || totalElements < ELEMENT_THRESHOLD ? "true" : "false"));
+
+
+    // size will always be at least one
+    if (true || size <= LIST_THRESHOLD || totalElements < ELEMENT_THRESHOLD) {
+      Set<T> result = this.list.get(start);
+      for (int i = start+1; i < end; i++) {
+        result.addAll(list.get(i));
+      }
+      return result;
+    } else {
+      int mid = start + (size / 2);
+      ConcurrentSetMergeTask<T> leftTask = new ConcurrentSetMergeTask<>(list, start, mid);
+      ConcurrentSetMergeTask<T> rightTask = new ConcurrentSetMergeTask<>(list, mid, end);
+
+      leftTask.fork();
+      Set<T> rightResult = rightTask.compute();
+      Set<T> leftResult = leftTask.join();
+
+      // Merge results
+      leftResult.addAll(rightResult);
+      return leftResult;
+    }
+  }
+}

src/main/java/de/dhbwstuttgart/typeinference/unify/PlaceholderRegistry.java

@@ -0,0 +1,84 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import de.dhbwstuttgart.server.packet.dataContainers.ISerializableData;
+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.unify.model.PlaceholderType;
+import java.util.ArrayList;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Calculate unique placeholder names
+ */
+public class PlaceholderRegistry implements ISerializableData {
+
+  private final Set<String> existingPlaceholders = ConcurrentHashMap.newKeySet();
+  private final AtomicInteger placeholderCount = new AtomicInteger();
+  public ArrayList<PlaceholderType> UnifyTypeFactory_PLACEHOLDERS = new ArrayList<>();
+
+  /**
+   * Add a placeholder into the list of existing ones, as soon as a new PlaceholderType is created
+   *
+   * @param placeholderName The placeholder to add
+   */
+  public void addPlaceholder(String placeholderName) {
+    this.existingPlaceholders.add(placeholderName);
+  }
+
+  /**
+   * Generate a random placeholder name, that is unique to this context
+   *
+   * @return  The generated name
+   */
+  public String generateFreshPlaceholderName() {
+    String name;
+    do {
+      int pc = placeholderCount.incrementAndGet();
+      name = getUppercaseTokenFromInt(pc);
+    }
+    while (existingPlaceholders.contains(name));
+    this.addPlaceholder(name);
+    return name;
+  }
+
+  public PlaceholderRegistry deepClone() {
+    PlaceholderRegistry pr2 = new PlaceholderRegistry();
+    this.existingPlaceholders.forEach(pr2::addPlaceholder);
+    pr2.UnifyTypeFactory_PLACEHOLDERS.addAll(this.UnifyTypeFactory_PLACEHOLDERS);
+    pr2.placeholderCount.set(this.placeholderCount.get());
+    return pr2;
+  }
+
+  /**
+   * Generate a token that consists of uppercase letters and contains the given prefix and suffix from the value i
+   *
+   * @param i       The value that will be represented as a token
+   * @return        The generated token
+   */
+  private String getUppercaseTokenFromInt(int i) {
+    StringBuilder sb = new StringBuilder();
+    while (i >= 0) {
+      sb.append((char)(i % 26 + 65));
+      i = i / 26 - 1;
+    }
+    //sb.append(suffix);
+    return sb.toString();
+  }
+
+  @Override
+  public String toString() {
+    return this.existingPlaceholders.toString();
+  }
+
+  @Override
+  public SerialMap toSerial(KeyStorage keyStorage) {
+    SerialMap serialized = new SerialMap();
+    serialized.put("ph", new SerialValue<>(new ArrayList<>(this.existingPlaceholders)));
+    serialized.put("factoryPh", SerialList.fromMapped(this.UnifyTypeFactory_PLACEHOLDERS, t -> t.toSerial(keyStorage)));
+    return serialized;
+  }
+}

src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java

@@ -38,14 +38,17 @@ import org.apache.commons.io.output.NullOutputStream;
 public class RuleSet implements IRuleSet{
 	
 	Writer logFile;
+	final PlaceholderRegistry placeholderRegistry;
 	
-	public RuleSet() {
+	public RuleSet(PlaceholderRegistry placeholderRegistry) {
 		super();
-		logFile = new OutputStreamWriter(new NullOutputStream());
+		logFile = OutputStreamWriter.nullWriter();
+		this.placeholderRegistry = placeholderRegistry;
 	}
 	
-	RuleSet(Writer logFile) {
+	RuleSet(Writer logFile, PlaceholderRegistry placeholderRegistry) {
 		this.logFile = logFile;
+		this.placeholderRegistry = placeholderRegistry;
 	}
 	
 	@Override
@@ -864,7 +867,7 @@ public class RuleSet implements IRuleSet{
 		try {
 			logFile.write("FUNgreater: " + pair + "\n");
 				logFile.write("FUNred: " + result + "\n");
-				logFile.flush();
+				// logFile.flush();
 			}
 		catch (IOException e) {
 			System.out.println("logFile-Error");
@@ -939,10 +942,10 @@ public class RuleSet implements IRuleSet{
 		
 		UnifyType[] freshPlaceholders = new UnifyType[funNLhsType.getTypeParams().size()];
 		for(int i = 0; i < freshPlaceholders.length-1; i++) {
-			freshPlaceholders[i] = PlaceholderType.freshPlaceholder();
+			freshPlaceholders[i] = PlaceholderType.freshPlaceholder(placeholderRegistry);
 			((PlaceholderType)freshPlaceholders[i]).setVariance(inversVariance);
 		}
-		freshPlaceholders[freshPlaceholders.length-1] = PlaceholderType.freshPlaceholder();
+		freshPlaceholders[freshPlaceholders.length-1] = PlaceholderType.freshPlaceholder(placeholderRegistry);
 		((PlaceholderType)freshPlaceholders[freshPlaceholders.length-1]).setVariance(variance);
 		result.add(new UnifyPair(funNLhsType.getTypeParams().get(funNLhsType.getTypeParams().size()-1), freshPlaceholders[funNLhsType.getTypeParams().size()-1], PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
 		
@@ -960,7 +963,7 @@ public class RuleSet implements IRuleSet{
 		try {
 			logFile.write("FUNgreater: " + pair + "\n");
 			logFile.write("FUNgreater: " + result + "\n");
-			logFile.flush();
+			// logFile.flush();
 		}
 	catch (IOException e) {
 		System.out.println("lofFile-Error");
@@ -988,10 +991,10 @@ public class RuleSet implements IRuleSet{
 		
 		UnifyType[] freshPlaceholders = new UnifyType[funNRhsType.getTypeParams().size()];
 		for(int i = 0; i < freshPlaceholders.length-1; i++) {
-			freshPlaceholders[i] = PlaceholderType.freshPlaceholder();
+			freshPlaceholders[i] = PlaceholderType.freshPlaceholder(placeholderRegistry);
 			((PlaceholderType)freshPlaceholders[i]).setVariance(inversVariance);
 		}
-		freshPlaceholders[freshPlaceholders.length-1] = PlaceholderType.freshPlaceholder();
+		freshPlaceholders[freshPlaceholders.length-1] = PlaceholderType.freshPlaceholder(placeholderRegistry);
 		((PlaceholderType)freshPlaceholders[freshPlaceholders.length-1]).setVariance(variance);
 		
 		result.add(new UnifyPair(freshPlaceholders[funNRhsType.getTypeParams().size()-1], funNRhsType.getTypeParams().get(funNRhsType.getTypeParams().size()-1), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
@@ -1010,7 +1013,7 @@ public class RuleSet implements IRuleSet{
 		try {
 			logFile.write("FUNgreater: " + pair + "\n");
 			logFile.write("FUNsmaller: " + result + "\n");
-			logFile.flush();
+			// logFile.flush();
 		}
 	catch (IOException e) {
 		System.out.println("lofFile-Error");
@@ -1051,7 +1054,7 @@ public class RuleSet implements IRuleSet{
 		if(isGen)
 			result.add(new UnifyPair(rhsType, lhsType, PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
 		else {
-			UnifyType freshTph = PlaceholderType.freshPlaceholder();
+			UnifyType freshTph = PlaceholderType.freshPlaceholder(placeholderRegistry);
 			result.add(new UnifyPair(rhsType, new ExtendsType(freshTph), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
 			result.add(new UnifyPair(extendedType, freshTph, PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
 		}
@@ -1079,7 +1082,7 @@ public class RuleSet implements IRuleSet{
 		if(isGen)
 			result.add(new UnifyPair(rhsType, lhsType, PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
 		else {
-			UnifyType freshTph = PlaceholderType.freshPlaceholder();
+			UnifyType freshTph = PlaceholderType.freshPlaceholder(placeholderRegistry);
 			result.add(new UnifyPair(rhsType, new SuperType(freshTph), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
 			Set<UnifyType> fBounded = pair.getfBounded();
 			fBounded.add(lhsType);

src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java

@@ -1,41 +1,41 @@
 package de.dhbwstuttgart.typeinference.unify;
 
-import java.io.FileWriter;
+import de.dhbwstuttgart.util.Logger;
 import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 
-import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 public class TypeUnify {
-	
+
+	private TypeUnify() {}
+
+	private static <T> T joinFuture(CompletableFuture<T> future) {
+		try {
+			return future.get();
+		}
+		catch (InterruptedException | ExecutionException exception) {
+			throw new RuntimeException(exception);
+		}
+	}
+
 	/**
 	 * unify parallel ohne result modell
-	 * @param undConstrains
-	 * @param oderConstraints
-	 * @param fc
-	 * @param logFile
-	 * @param log
-	 * @param cons
-	 * @return
 	 */
-	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-		ForkJoinPool pool = new ForkJoinPool();
-		pool.invoke(unifyTask);
-		Set<Set<UnifyPair>> res =  unifyTask.join();
+	public static Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, UnifyContext unifyContext) {
+		ForkJoinPool pool = TypeUnify.createThreadPool();
+		UnifyContext context = unifyContext.newWithParallel(true).newWithExecutor(pool);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, context, 0);
+		Set<Set<UnifyPair>> res = joinFuture(unifyTask.compute());
 		try {
-			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements + "\n");
-			logFile.flush();
+			unifyContext.logFile().write("\nnoShortendElements: " + TypeUnifyTask.noShortendElements + "\n");
+			// logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no log-File");
@@ -45,46 +45,32 @@ public class TypeUnify {
 	
 	/**
 	 * unify asynchron mit Rückgabe UnifyResultModel ohne dass alle results gesammelt sind
-	 * @param undConstrains
-	 * @param oderConstraints
-	 * @param fc
-	 * @param logFile
-	 * @param log
-	 * @param cons
-	 * @param ret
-	 * @return
 	 */
-	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-		ForkJoinPool pool = new ForkJoinPool();
-		pool.invoke(unifyTask);
-		return ret;
+	public static UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, UnifyContext unifyContext) {
+		ForkJoinPool pool = TypeUnify.createThreadPool();
+		UnifyContext context = unifyContext.newWithExecutor(pool);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, context, 0);
+		unifyTask.compute();
+		return unifyContext.resultModel();
 	}
-	
+
 	/**
 	 * unify parallel mit Rückgabe UnifyResultModel nachdem alle results gesammelt sind
-	 * @param undConstrains
-	 * @param oderConstraints
-	 * @param fc
-	 * @param logFile
-	 * @param log
-	 * @param cons
-	 * @param ret
-	 * @return
 	 */
-	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-		ForkJoinPool pool = new ForkJoinPool();
-		pool.invoke(unifyTask);
-		Set<Set<UnifyPair>> res =  unifyTask.join();
+	public static Set<Set<UnifyPair>> unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, UnifyContext unifyContext) {
+		ForkJoinPool pool = TypeUnify.createThreadPool();
+		UnifyContext context = unifyContext.newWithParallel(true).newWithExecutor(pool);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, context, 0);
+		var result = joinFuture(unifyTask.compute());
+
 		try {
-			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");
-			logFile.flush();
+			unifyContext.logFile().write("\nnoShortendElements: " + TypeUnifyTask.noShortendElements +"\n");
+			// logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no log-File");
 		}
-		return ret;
+		return result;
 	}
 	
 	/*
@@ -97,20 +83,13 @@ public class TypeUnify {
 	
 	/**
 	 * unify sequentiell mit oderconstraints
-	 * @param undConstrains
-	 * @param oderConstraints
-	 * @param fc
-	 * @param logFile
-	 * @param log
-	 * @param cons
-	 * @return
 	 */
-	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, usedTasks);
-		Set<Set<UnifyPair>> res = unifyTask.compute();
+	public static Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, UnifyContext unifyContext) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, unifyContext.newWithParallel(false), 0);
+		Set<Set<UnifyPair>> res = joinFuture(unifyTask.compute());
 		try {
-			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");
-			logFile.flush();
+			unifyContext.logFile().write("\nnoShortendElements: " + TypeUnifyTask.noShortendElements +"\n");
+			// logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no log-File");
@@ -118,4 +97,14 @@ public class TypeUnify {
 		return res;
 	}
 
+	private static ForkJoinPool createThreadPool() {
+		Logger.print("Available processors: " + Runtime.getRuntime().availableProcessors());
+		return new ForkJoinPool(
+			Runtime.getRuntime().availableProcessors(),
+			ForkJoinPool.defaultForkJoinWorkerThreadFactory,
+			null,
+			false
+		);
+	}
+
 }

src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java

@@ -13,54 +13,52 @@ import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+import java.util.concurrent.CompletableFuture;
 
 public class TypeUnify2Task extends TypeUnifyTask {
-       
-       Set<Set<UnifyPair>> setToFlatten;
-       Set<UnifyPair> methodSignatureConstraintUebergabe;
 
-       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Set<UnifyPair> methodSignatureConstraintUebergabe) {
-               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
-               this.setToFlatten = setToFlatten;
-               this.nextSetElement = nextSetElement;
-               this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
-       }
-       
-       Set<UnifyPair> getNextSetElement() {
-    	   return nextSetElement;
-       }
-       
-       @Override
-       protected Set<Set<UnifyPair>> compute() {
-               if (one) {
-                       System.out.println("two");
-               }
-               one = true;
-               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField, methodSignatureConstraintUebergabe);
+  Set<Set<UnifyPair>> setToFlatten;
+  Set<UnifyPair> methodSignatureConstraintUebergabe;
+
+  public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, UnifyContext context, int rekTiefe, Set<UnifyPair> methodSignatureConstraintUebergabe) {
+    super(eq, oderConstraints, fc, context, rekTiefe);
+    this.setToFlatten = setToFlatten;
+    this.nextSetElement = nextSetElement;
+    this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
+  }
+
+  public Set<UnifyPair> getNextSetElement() {
+    return nextSetElement;
+  }
+
+  @Override
+  public CompletableFuture<Set<Set<UnifyPair>>> compute() {
+    if (one) {
+      System.out.println("two");
+    }
+    one = true;
+    CompletableFuture<Set<Set<UnifyPair>>> res =
+      unify2(setToFlatten, eq, oderConstraintsField, fc, context.parallel(), rekTiefeField, methodSignatureConstraintUebergabe);
                /*if (isUndefinedPairSetSet(res)) { 
                        return new HashSet<>(); }
                else
-               */ 
-               //writeLog("xxx");
-               //noOfThread--;
-               synchronized (usedTasks) {
-            	   if (this.myIsCancelled()) {
-   						return new HashSet<>();
-   					}
-   					else {
-   						return res;
-   					}
-   				}
-       	}
-       
-       public void closeLogFile() {
+               */
+    //writeLog("xxx");
+    //noOfThread--;
+    if (this.myIsCancelled()) {
+      return CompletableFuture.completedFuture(new HashSet<>());
+    } else {
+      return res;
+    }
+  }
 
-           try {
-				logFile.close();
-			}
-			catch (IOException ioE) {
-				System.err.println("no log-File" + thNo);
-			}
-           
-       }
+  public void closeLogFile() {
+
+    try {
+      context.logFile().close();
+    } catch (IOException ioE) {
+      System.err.println("no log-File");
+    }
+
+  }
 }

src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTaskHelper.java

@@ -0,0 +1,188 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
+import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyType;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * A collection of capsuled (and thus static) functions to split up large algorithms in TypeUnifyTask
+ */
+public class TypeUnifyTaskHelper {
+
+  /**
+   * Filter all topLevelSets for those with a single element that contain only one pair:
+   *   a <. theta,
+   *   theta <. a or
+   *   a =. theta
+   */
+  public static Set<Set<UnifyPair>> getSingleElementSets(ArrayList<Set<? extends Set<UnifyPair>>> topLevelSets) {
+    return topLevelSets.stream()
+      .filter(x -> x.size() == 1)
+      .map(y -> y.stream().findFirst().get()).collect(Collectors.toSet());
+  }
+
+  /**
+   * Varianzbestimmung Anfang
+   * Oderconstraint, wenn entweder kein Basepair oder unterschiedliche Basepairs => oderConstraint = true;
+   * Varianz =  1 => Argumentvariable
+   * Varianz = -1 => Rückgabevariable
+   * Varianz =  0 => unklar
+   * Varianz =  2 => Operatoren oderConstraints
+   */
+  public static int calculateVariance(List<Set<UnifyPair>> nextSetasList) {
+    Optional<Integer> xi = nextSetasList.stream().map(x -> x.stream().filter(y -> (y.getLhsType() instanceof PlaceholderType && !(y.getRhsType() instanceof PlaceholderType)))
+        .filter(z -> ((PlaceholderType) z.getLhsType()).getVariance() != 0)
+        .map(c -> ((PlaceholderType) c.getLhsType()).getVariance())
+        .reduce((a, b) -> {
+          if (a.intValue() == b.intValue()) return a;
+          else return 0;
+        })) //2 kommt insbesondere bei Oder-Constraints vor
+      .filter(Optional::isPresent)
+      .map(Optional::get)
+      .findAny();
+
+    return xi.orElse(0);
+  }
+
+  /**
+   *
+   */
+  public static int calculateOderConstraintVariance(List<Set<UnifyPair>> nextSetAsList) {
+    Optional<Integer> optVariance =
+      nextSetAsList
+        .getFirst()
+        .stream()
+        .filter(x -> x.getGroundBasePair().getLhsType() instanceof PlaceholderType &&
+          !(x.getRhsType() instanceof PlaceholderType) &&
+          x.getPairOp() == PairOperator.EQUALSDOT)
+        .map(x ->
+          ((PlaceholderType) x.getGroundBasePair().getLhsType()).getVariance())
+        .reduce((n, m) -> (n != 0) ? n : m);
+
+    //Fuer Operatorenaufrufe wird variance auf 2 gesetzt.
+    //da kein Receiver existiert also kein x.getGroundBasePair().getLhsType() instanceof PlaceholderType
+    //Bei Varianz = 2 werden alle Elemente des Kartesischen Produkts abgearbeitet
+    return optVariance.orElse(2);
+  }
+
+
+  /**
+   * Find the first occurrence (if any) of a UnifyPair with operator EQUALSDOT while having
+   * one side equal to its base pair counterpart
+   */
+  public static Optional<UnifyPair> findEqualityConstrainedUnifyPair(Set<UnifyPair> nextSetElement) {
+    return nextSetElement.stream().filter(x ->
+        x.getPairOp()
+        .equals(PairOperator.EQUALSDOT))
+      .filter(x -> //Sicherstellen, dass bei a = ty a auch wirklich die gesuchte Typvariable ist
+        x.getLhsType()
+          .equals(x.getBasePair().getLhsType()) ||
+        x.getLhsType()
+          .equals(x.getBasePair().getRhsType())
+    ).findFirst();
+  }
+
+  /**
+   *  Find all unifyPairs, that associate the identified type variable of origPair with any concrete type. That means:
+   *  If "a = type" is in origPair, then we get all UnifyPairs that contain either "a < typeA" or "typeB < a"
+   */
+  public static Set<UnifyPair> findConstraintsWithSameTVAssociation(UnifyPair origPair, Set<Set<UnifyPair>> singleElementSets) {
+    UnifyType tyVar = origPair.getLhsType();
+    if (!(tyVar instanceof PlaceholderType)) {
+      tyVar = origPair.getRhsType();
+    }
+
+    UnifyType tyVarEF = tyVar;
+    return singleElementSets.stream()
+      .map(xx ->
+        xx.iterator().next())
+      .filter(x ->
+            (x.getLhsType().equals(tyVarEF) && !(x.getRhsType() instanceof PlaceholderType))
+            ||
+            (x.getRhsType().equals(tyVarEF) && !(x.getLhsType() instanceof PlaceholderType))
+      )
+      .collect(Collectors.toCollection(HashSet::new));
+  }
+
+  /**
+   *
+   */
+  public static boolean doesFirstNextSetHasSameBase(List<Set<UnifyPair>> nextSetAsList) {
+    if (nextSetAsList.isEmpty()) {
+      return false;
+    }
+
+    UnifyPair firstBasePair = null;
+
+    for (var unifyPair : nextSetAsList.getFirst().stream().toList()) {
+      var basePair = unifyPair.getBasePair();
+
+      // if any base pair is null, there is NOT always the same base!
+      if (basePair == null) {
+        return false;
+      }
+
+      if (firstBasePair == null) {
+        firstBasePair = basePair;
+      }
+      else if (!basePair.equals(firstBasePair)) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   *  Extracts data from every element in the nested lists of results. What data depends on the given
+   *  extractor function
+   */
+  public static Set<UnifyPair> collectFromThreadResult (
+    Set<Set<UnifyPair>> currentThreadResult,
+    Function<UnifyPair, Set<UnifyPair>> extractor
+  ) {
+    return currentThreadResult.stream()
+      .map(b ->
+        b.stream()
+          .map(extractor)
+          .reduce((y, z) -> {
+            y.addAll(z);
+            return y;
+          })
+          .orElse(new HashSet<>()))
+      .reduce((y, z) -> {
+        y.addAll(z);
+        return y;
+      })
+      .orElse(new HashSet<>());
+  }
+
+  /**
+   *  Extract a list of PlaceholderTypes from a set of pairs, such that each resulting element:
+   *  - Is the LHS of a pair
+   *  - Is a PlaceholderType
+   *  - has a basePair Side that is a PlaceholderType with the same name
+   */
+  public static List<PlaceholderType> extractMatchingPlaceholderTypes(Set<UnifyPair> pairs) {
+    return pairs.stream()
+      .filter(x -> {
+        UnifyType lhs = x.getLhsType();
+        UnifyType baseLhs = x.getBasePair().getLhsType();
+        UnifyType baseRhs = x.getBasePair().getRhsType();
+        return (lhs instanceof PlaceholderType) &&
+          ((baseLhs instanceof PlaceholderType && lhs.getName().equals(baseLhs.getName())) ||
+            (baseRhs instanceof PlaceholderType && lhs.getName().equals(baseRhs.getName())));
+      })
+      .map(x -> (PlaceholderType) x.getLhsType())
+      .collect(Collectors.toCollection(ArrayList::new));
+  }
+
+}

src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyContext.java

@@ -0,0 +1,70 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.io.Writer;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public record UnifyContext(
+  // main log file of a unification
+  Writer logFile,
+  // if logs should be made
+  Boolean log,
+  // if the unify algorithm should run in parallel
+  Boolean parallel,
+  // the model for storing calculated results
+  UnifyResultModel resultModel,
+  // the executor used for thread management in parallel execution
+  ExecutorService executor,
+  // a generator for new placeholders in this unify context
+  PlaceholderRegistry placeholderRegistry,
+  // a control structure to cancel the unification early
+  UnifyTaskModel usedTasks
+) {
+
+  public UnifyContext(
+    Writer logFile,
+    Boolean log,
+    Boolean parallel,
+    UnifyResultModel resultModel,
+    UnifyTaskModel usedTasks,
+    ExecutorService executor,
+    PlaceholderRegistry placeholderRegistry
+  ) {
+    this(logFile, log, parallel, resultModel, executor, placeholderRegistry, usedTasks);
+  }
+
+  public UnifyContext(
+    Writer logFile,
+    Boolean log,
+    Boolean parallel,
+    UnifyResultModel resultModel,
+    UnifyTaskModel usedTasks,
+    PlaceholderRegistry placeholderRegistry
+  ) {
+    this(logFile, log, parallel, resultModel, usedTasks, ForkJoinPool.commonPool(), placeholderRegistry);
+  }
+
+
+  /*
+   * Shortcuts for creating a similar context with some properties changed. This combined with the final properties
+   * causes the UnifyContext to be essentially handled as a
+   */
+
+  public UnifyContext newWithLogFile(Writer logFile) {
+    return new UnifyContext(logFile, log, parallel, resultModel, executor, placeholderRegistry, usedTasks);
+  }
+
+  public UnifyContext newWithParallel(boolean parallel) {
+    return new UnifyContext(logFile, log, parallel, resultModel, executor, placeholderRegistry, usedTasks);
+  }
+
+  public UnifyContext newWithExecutor(ExecutorService executor) {
+    return new UnifyContext(logFile, log, parallel, resultModel, executor, placeholderRegistry, usedTasks);
+  }
+
+  public UnifyContext newWithResultModel(UnifyResultModel resultModel) {
+    return new UnifyContext(logFile, log, parallel, resultModel, executor, placeholderRegistry, usedTasks);
+  }
+
+}

src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultModel.java

@@ -36,19 +36,19 @@ public class UnifyResultModel {
 		listeners.remove(listenerToRemove);
 	}
 	
-	public void notify(Set<Set<UnifyPair>> eqPrimePrimeSet) {
+	public void notify(Set<Set<UnifyPair>> eqPrimePrimeSet, UnifyContext context) {
 		Set<Set<UnifyPair>> eqPrimePrimeSetRet = eqPrimePrimeSet.stream().map(x -> {
-			Optional<Set<UnifyPair>> res = new RuleSet().subst(x.stream().map(y -> { 
+			Optional<Set<UnifyPair>> res = new RuleSet(context.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().applyTypeUnificationRules(res.get(), fc);
+				return new TypeUnifyTask(context).applyTypeUnificationRules(res.get(), fc);
 			}
 			else return x; //wenn nichts veraendert wurde wird x zurueckgegeben
 		}).collect(Collectors.toCollection(HashSet::new));
 		List<ResultSet> newResult = eqPrimePrimeSetRet.stream().map(unifyPairs ->
-           new ResultSet(UnifyTypeFactory.convert(unifyPairs, de.dhbwstuttgart.typeinference.constraints.Pair.generateTPHMap(cons))))
+           new ResultSet(UnifyTypeFactory.convert(unifyPairs, de.dhbwstuttgart.typeinference.constraints.Pair.generateTPHMap(cons), context.placeholderRegistry())))
            .collect(Collectors.toList());
 		UnifyResultEvent evt = new UnifyResultEvent(newResult);