Merge branch 'master' into feat/unify-server-mergeMaster

.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:
@@ -25,4 +22,4 @@ jobs:
           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 93e1a8787cd94c73f4538f6a348f58613893a584
+# git checkout dad468368b86bdd5a3d3b2754b17617cee0a9107 # 1:55
+# git checkout a0c11b60e8c9d7addcbe0d3a09c9ce2924e9d5c0 # 2:25
+# git checkout 4cddf73e6d6c9116d3e1705c4b27a8e7f18d80c3 # 2:27
+# git checkout 6c2d97b7703d954e4a42eef3ec374bcf313af75c # 2:13
+# git checkout f722a00fbb6e69423d48a890e4a6283471763e64 # 1:35
+# git checkout f0a4a51ce65639ce9a9470ff0fdb538fdf9c02cc # 2:19
+# git checkout 1391206dfe59263cdb22f93371cfd1dd5465d97f # 1:29
+
+date "+%Y.%m.%d %H:%M:%S"
+# sed -i -e 's/source>21/source>23/g' pom.xml
+# sed -i -e 's/target>21/target>23/g' pom.xml
+
+
+mvn clean compile -DskipTests package
+time java -jar target/JavaTXcompiler-0.1-jar-with-dependencies.jar resources/bytecode/javFiles/Matrix.jav;
+
+# mvn clean compile test
+
+
+echo -e "\nCleanup... "
+cd -
+rm -rf "$TDIR" 2>/dev/null
+
+echo -e "\nFinished "
+date "+%Y.%m.%d %H:%M:%S"
+echo -e "\n "
+

pom.xml

@@ -44,29 +44,30 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<artifactId>asm</artifactId>
 			<version>9.8</version>
 		</dependency>
+		<dependency>
+			<groupId>org.java-websocket</groupId>
+			<artifactId>Java-WebSocket</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.17.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.diogonunes</groupId>
+			<artifactId>JColor</artifactId>
+			<version>5.5.1</version>
+		</dependency>
 	</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>
@@ -84,7 +85,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<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>
@@ -157,4 +158,4 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<url>file:///${project.basedir}/maven-repository/</url>
 		</repository>
 	</distributionManagement>
-</project>
+</project>

resources/AllgemeinTest/Uncurrier.jav

@@ -1,7 +0,0 @@
-public class Uncurrier{ 
-    uncurry (f){
-        return x -> f.apply(x);} 
-    uncurry (f){
-            return (x, y) -> f.apply(x).apply(y);
-    }
-}

resources/AllgemeinTest/UncurrierMain.jav

@@ -1,9 +0,0 @@
-import Uncurrier;
-import java.lang.Integer;
-
-class UncurrierMain {
-    meth(y) {
-        var uc = new Uncurrier() ;
-        uc.uncurry(x -> x+1);
-   }
-}

resources/KPSPresentation/AddEle.jav

@@ -1,9 +0,0 @@
-import java.util.Vector;
-import java.util.Collection;
-
-class AddEle {
-	addEle(x, y) {
-		x.add(y);
-		return x;
-	}
-} 

resources/KPSPresentation/Fac.jav

@@ -1,15 +0,0 @@
-import java.lang.Double;
-import java.lang.Integer;
-  
-public class Fac   {
-	  
-	 getFac(n){ 
-		var res = 1; 
-		var i = 1; 
-		while(i<=n) {  
-			res = res * i;
-			i++;
-		}
-		return res; 
-	}
-}     

resources/KPSPresentation/Faculty.jav

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

resources/KPSPresentation/FacultyBug.jav

@@ -1,18 +0,0 @@
-import java.lang.Integer;
-import java.lang.Float;
- 
-public class FacultyBug { 
-    public Fun1$$<Float, Float> fact = (x) -> {
-            if (x == 1) {
-                return 1;
-            }
-            else { 
-              return x * (fact.apply(x-1));
-            }
-        };
-    
-    public getFact(x) {  
-        return fact.apply(x);
-    }     
-    
-}       

resources/KPSPresentation/Id.jav

@@ -1,11 +0,0 @@
-class Id {
-    id2 = x -> x;
-   
-   id(x) { 
-   	 return x;
-   }
-   
-    id3(x) { 
-   		return id(x); 
-   }
-}   

resources/KPSPresentation/Lambda.jav

@@ -1,11 +0,0 @@
-import java.lang.Integer;
-
-public class Lambda {
- 
-  m () {
-   var lam1 = (x) -> {
-        return x * x;
-   };
-   return lam1; 
-  } 
-} 

resources/KPSPresentation/Main.jav

@@ -1,106 +0,0 @@
-import java.lang.String ;
-import java.lang.System; 
-import java.io.PrintStream;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Integer;
-import fst;
-import Id;
-import OLMain;
-import Fac;
-import Faculty;
-import applyLambda;
-import java.util.Vector;
-import Matrix;
-import MatrixOP;
-
-public class Main {
-	public  static main(x) { 
-	/*
-	  new fst().main(5);
-	  System.out.println(new fst().main(5));
-	  
-	  //Id.jav: the identity-function
-	  //applied to an integer
-	  System.out.println(new Id().id(1));
-	  //applied to a string
-	  System.out.println(new Id().id("hallo"));
-	  //lamda-Expr
-	  //System.out.println(new Id().id2.apply(1));
-	  //Bug: https://gitea.hb.dhbw-stuttgart.de/JavaTX/JavaCompilerCore/issues/378
-	  
-	  //OL.jav: Overloading
-	  OLMain ol = new OLMain();
-	  
-	  //the function main is applied to an integer
-	  System.out.println(ol.main(2));
-	  //the main is applied to a double
-	  System.out.println(ol.main(2.0)); 
-	  System.out.println(ol.main("Hallo"));
-	  //Fac.jav
-	  System.out.println(new Fac().getFac(6));
-	    
-
-	  //Faculty.jav
-	  //System.out.println(new Faculty().fact.apply(6));
-	  //Bug: https://gitea.hb.dhbw-stuttgart.de/JavaTX/JavaCompilerCore/issues/378
-	  System.out.println(new Faculty().getFact(3));
-
-	    //Lambda.jav: An lambda expression applied by the method apply
-	    //System.out.println(new Lambda().m().apply(77));
-	    //Bug: https://gitea.hb.dhbw-stuttgart.de/JavaTX/JavaCompilerCore/issues/378
-		
-		//applyLambda.jav: A defined lambda expression is applied 
-		System.out.println(new applyLambda().m());
-*/
-		 Vector<Vector<Integer>> vv = new Vector<Vector<Integer>>();
-		 Vector<Integer> v1 = new Vector<Integer> ();
-		 v1.addElement(2);
-		 v1.addElement(2);
-		 Vector<Integer> v2 = new Vector<Integer> ();
-		 v2.addElement(3);
-		 v2.addElement(3);
-		 Matrix m1 = new Matrix();
-		 m1.addElement(v1);
-		 m1.addElement(v2);
-		 //vv.addElement(v1);
-		 //vv.addElement(v2);
-		 //Matrix m1 = new Matrix(vv);
-
-		 Vector<Vector<Integer>> vv1 = new Vector<Vector<Integer>>();
-		 Vector<Integer> v3 = new Vector<Integer> ();
-		 v3.addElement(2);
-		 v3.addElement(2);
-		 Vector<Integer> v4 = new Vector<Integer> ();
-		 v4.addElement(3);
-		 v4.addElement(3);
-		 Matrix m2 = new Matrix();
-		 m2.addElement(v3);
-		 m2.addElement(v4);
-		 //vv1.addElement(v3);
-		 //vv1.addElement(v4);
-		 //Matrix m2 = new Matrix(vv1);
-		 
-
-		 //Matrix m3 = m1.mul(vv1);
-		 Matrix m3 = m1.mul(m2);
-		 System.out.println(m1.toString() + " * " + m2.toString() + " = " + m3.toString());
-				 						
-		 //MatrixOP 
-		 MatrixOP mOp1 = new MatrixOP();
-		 mOp1.addElement(v1);
-		 mOp1.addElement(v2);
-		 MatrixOP mOp2 = mOp1.mul.apply(mOp1, mOp1);
-		 System.out.println(m1.toString() + " * " + m2.toString() + " = " + mOp2.toString());
-	}       
-}
-/*
-public class MainBug {
-	public  static main(x) { 
-		System.out.println(new fst().main(5));
-		//System.out.println(new FacultyBug().getFact(3));
-
-	}
-	}  
-*/     
-

resources/KPSPresentation/MainFaculty.jav

@@ -1,11 +0,0 @@
-import java.lang.System; 
-import java.io.PrintStream;
-import Faculty;
-
-public class MainFaculty {
-	public static void main(x) {
-		//var f = new Faculty();
-        //var intRes = f.getFact(3);
-		//System.out.println(intRes);
-	}
-}

resources/KPSPresentation/MainOL.jav

@@ -1,20 +0,0 @@
-import java.lang.String ;
-import java.lang.System; 
-import java.io.PrintStream;
-import java.lang.Float;
-import OL2;
-
-class MainOL { 
-	public  static main(x) { 
-		var ol = new OL2();   
-	    
-	    //the function main is applied to an integer
-	    //var res1 = ol.m2(2); 
-	    //the main is applied to a double
-	    //System.out.println(ol.m2(2.0));  
-	    //System.out.println(ol.m2("Hallo").toString());
-		var res2 = ol.m2("Hallo").toString();
-		System.out.println(res2); 
-
-	}        
-}   

resources/KPSPresentation/Matrix.jav

@@ -1,41 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-import java.lang.Boolean;
-
-public class Matrix extends Vector<Vector<Integer>> {
-   
-	   
-	public Matrix () {  
-    }
-
-	public Matrix(vv) { 
-      var i = 0; 
-	  while(i < vv.size()) {
-		  this.add(vv.elementAt(i));
-		  i=i+1;
-	  } 
-    } 
-     
-
-	 mul(m) { 
-        var ret = new Matrix();
-        var i = 0;
-        while(i < size()) {
-            var v1 = this.elementAt(i);
-            var v2 = new Vector<Integer>();
-            var j = 0;
-            while(j < v1.size()) {
-                var erg = 0;
-                var k = 0;
-                while(k < v1.size()) {
-                    erg = erg + v1.elementAt(k)
-                             * m.elementAt(k).elementAt(j);
-                    k++; }
-                v2.addElement(erg);
-                j++; }
-            ret.addElement(v2);
-            i++; 
-         }
-        return ret;
-    }
-}

resources/KPSPresentation/MatrixOP.jav

@@ -1,64 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-//import java.lang.Byte;
-import java.lang.Boolean;
-import java.lang.String;
-import java.lang.System; 
-import java.io.PrintStream;
-
-public class MatrixOP    extends Vector<Vector<Integer>> {
-   
-	public MatrixOP () {
-    }  
-
-	public MatrixOP(vv) {
-    	Integer i;   
-    	i = 0;
-	   while(i < vv.size()) { 
-		  this.add(vv.elementAt(i));  
-		  i=i+1;
-	  }  
-    }     
-      
-     mul = (m1, m2) -> { 
-        var ret = new MatrixOP();
-        var i = 0;
-        while(i < m1.size()) { 
-            var v1 = m1.elementAt(i);
-            var v2 = new Vector<Integer>();
-            var j = 0;
-            while(j < v1.size()) {
-                var erg = 0;
-                var k = 0;
-                while(k < v1.size()) {
-                    erg = erg + v1.elementAt(k)
-                             * m2.elementAt(k).elementAt(j);
-                    k++; }
-//                v2.addElement(new Integer(erg));
-                v2.addElement(erg);
-                j++; }
-            ret.addElement(v2);
-            i++; 
-         }
-        return ret;
-    };
-    
-    public static main(x) {
-		 var vv = new Vector<Vector<Integer>>();
-		 var v1 = new Vector<Integer> ();
-		 v1.addElement(2);
-		 v1.addElement(2);
-		 var v2 = new Vector<Integer> ();
-		 v2.addElement(3);
-		 v2.addElement(3);
-				 						
-		 //MatrixOP 
-		 MatrixOP mOp1 = new MatrixOP();
-		 mOp1.addElement(v1);
-		 mOp1.addElement(v2);
-		 MatrixOP mOp2 = mOp1.mul.apply(mOp1, mOp1);
-		 System.out.print(mOp1); System.out.print(" * "); System.out.print(mOp1); System.out.print(" = "); System.out.println(mOp2);
-		 //System.out.print(mOp1 + " * " + mOp1 + " = " + mOp2);
-	} 
-	}
-}

resources/KPSPresentation/OL.jav

@@ -1,33 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-import java.lang.Double; 
-import java.lang.Boolean; 
-import java.lang.Object;
-import java.lang.System; 
-import java.io.PrintStream;
-
-  
-  
-
-public class OL1  {
-
-      m1( x) { return x + x; }
-  
-	  
-    m1(x) { return x || x; }  
-
-	  
-}     
-  
-    
-          
-public class OL2 { 
-
-	m2(x) {  
-		var ol;
-		ol = new OL1(); 
-		return ol.m1(x); 
-	}  
-
-
-}

resources/KPSPresentation/OLFun.jav

@@ -1,20 +0,0 @@
-import java.lang.String;
-import java.lang.Integer;
-import java.lang.Double;
-import java.util.Vector;
-import java.lang.Boolean; 
-
-
-
-
-
-public class OLFun    {
-	x;
-	
-	 
-	m(f, y) {
-		y = f.apply(x+x);
-		return x;
-	}
-	
-} 

resources/KPSPresentation/Pair.jav

@@ -1,12 +0,0 @@
-class Pair { 
-    fst;
-    snd;     
-
-    Pair(fst, snd) { this.fst=fst; this.snd=snd; } 
-
-    getfst() { return this.fst; }
-    
-    swap() {
-        return new Pair<>(this.snd, this.fst);
-    } 
-} 

resources/KPSPresentation/Plus.jav

@@ -1,9 +0,0 @@
-import java.lang.Integer;
-import java.lang.String;
-
-public class Plus {
-	 
-	m(a, b) {
-		return a+b;
-	}
-} 

resources/KPSPresentation/Sorting.jav

@@ -1,25 +0,0 @@
-import java.util.List;
-import java.util.ArrayList;
-import java.lang.String;
-
-public class Sorting{
-    merge(a, b){
-        a.addAll(b);
-        return a;
-    }
-   
-
-sort(in){
-	var firstHalf = in;
-	var secondHalf = in; 
-	return merge(sort(firstHalf), sort(secondHalf));
-}
-
-
-
-	/*
-	void sort(a){
-		a = merge(a,a);
-	}
-	*/
-}

resources/KPSPresentation/Swap.jav

@@ -1,20 +0,0 @@
-import java.lang.String;
-import java.lang.Object;
-import java.lang.System;
-import java.io.PrintStream;
-import java.lang.Character;
-
-public class Swap{
-       <ZDP, ZEA, ZDO, YZP, ZCY, ZDZ> Fun1$$<ZCY, Fun1$$<ZDZ, ZEA>> swap(f){
-        return x->y->f.apply(y).apply(x);
-    } 
-
-     Fun1$$<String, Fun1$$<String, Fun1$$<String, String>>> swap(f){
-        return x -> y -> z -> f.apply(z).apply(x).apply(y);
-        }
-    
-    public static main (y) {
-        var func = x -> y -> z -> x + y + z; 
-        var res = new Swap().swap(func).apply("A").apply("B").apply("C");
-        System.out.println(res);}
-    } 

resources/KPSPresentation/TPHMethod.jav

@@ -1,6 +0,0 @@
-class TPHMethod  {
-  void m(a, b) {
-  	a = b;
-  	b=a;
-  }
-}

resources/KPSPresentation/Test.jav

@@ -1,16 +0,0 @@
-class Test{
-	void m( op, a, b ){
-		op.myapply(a, b);
-	}
-}
-
-class Atype{}
-class Btype{}
-
-class Operator1{
-	void myapply(Atype p1, Atype p2){...}
-}
-
-class Operator2{
-	void myapply(Btype p1, Btype p2){...}
-} 

resources/KPSPresentation/Uncurrier.jav

@@ -1,7 +0,0 @@
-public class Uncurrier{ 
-    uncurry (f){
-     return x -> f.apply(x);} 
-     uncurry (f){
-            return (x, y) -> f.apply(x).apply(y);
-    }
-}    

resources/KPSPresentation/UncurrierMain.jav

@@ -1,7 +0,0 @@
-import Uncurrier;
-
-class UncurrierMain {
-    public static main(x) { 
-        var uc = new Uncurrier() ;
-    }
-}

resources/KPSPresentation/VectorAdd.jav

@@ -1,16 +0,0 @@
-import java.lang.Integer;
-import java.lang.String;
-import java.util.Vector;
-
-class VectorAdd {
-	vectorAdd(v1, v2) {
-		var i = 0;
-		var erg = new Vector<>();
-		while (i < v1.size()) {
-			erg.addElement(v1.elementAt(i) + v2.elementAt(i));
-			i++;
-		} 
-		return erg; 
-	}	
-}
-

resources/KPSPresentation/applyLambda.jav

@@ -1,16 +0,0 @@
-import java.util.Vector;
-class Apply { } 
-
-public class applyLambda {
-
-  public m () {
-   var lam1 = (x) -> {
-        return x;
-   };
-
-   return lam1.apply(new Apply());
-   //return lam1;
-   //return new Vector();
-  }
-}
-

resources/KPSPresentation/fst.jav

@@ -1,7 +0,0 @@
-//import java.lang.Integer;
-
-class fst {
-	main(x) {  
-		return x;
-	}     
-}  

resources/KPSPresentation/genVector.jav

@@ -1,8 +0,0 @@
-import java.util.Vector;
-
-class genVector {
-
-	 m(v) {
-		return v.elementAt(0);
-	}
-}

resources/KPSPresentation/idTest.jav

@@ -1,8 +0,0 @@
-import java.lang.Integer;
-import Id;
-
-class Test { 
-	m() {
-	  Integer o1 = new Id<Integer,Integer>().id2.apply(1);
-	}
-} 

resources/KPSPresentation/lambdaId.jav

@@ -1,9 +0,0 @@
-public class lambdaId  {
-  lambdaId = x -> x;
-
-  /*
-  id3 (x) {
-   	return lambdaId.apply(x);
-  }
-  */
-}

resources/KPSPresentation/mathStruc.jav

@@ -1,9 +0,0 @@
-class mathStruc    { 
-	model;
-	
-    innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(model,ms.model));
-
-	mathStruc(m) { 
-		model =m;  
-	}  
-}

resources/KPSPresentation/mathStrucInteger.jav

@@ -1,18 +0,0 @@
-import java.lang.Integer;
-
-class mathStruc { 
-	model;
-	
-	innerOp = (o) -> (ms) -> new mathStruc<>(o.apply(model,ms.model));
-
-	mathStruc(m) { 
-		model =m;
-	}
-}  
-
-class mathStrucIntegerUse {
-	main() {
-	    var ms = new mathStruc<>(2);
-		return ms.innerOp.apply((x,y) -> x+y).apply(ms);
-	} 
-} 

resources/KPSPresentation/mathStrucMatrixOP.jav

@@ -1,90 +0,0 @@
-import java.util.Vector;
-import java.lang.Integer;
-import java.lang.Boolean;
-
-public class mathStrucMatrixOP {
-	model; 
-	
-	innerOp = (o) -> (ms) -> new mathStrucMatrixOP<>(o.apply(model,ms.model));
-
-	public mathStrucMatrixOP(m) {
-		model =m;
-	}
-}
-
-public class MatrixOP extends Vector<Vector<Integer>> {
-   
-	MatrixOP () {
-    }
-
-	MatrixOP(vv) {
-    	Integer i;
-    	i = 0;
-	  while(i < vv.size()) {
-//	    	Boolean a = this.add(vv.elementAt(i));
-		  this.add(vv.elementAt(i));
-		  i=i+1;
-	  }
-    }
-
-	public mul = (m1, m2) -> {
-        var ret = new MatrixOP();
-        var i = 0;
-        while(i < m1.size()) {
-            var v1 = m1.elementAt(i);
-            var v2 = new Vector<Integer>();
-            var j = 0;
-            while(j < v1.size()) {
-                var erg = 0;
-                var k = 0;
-                while(k < v1.size()) {
-                    erg = erg + v1.elementAt(k)
-                             * m2.elementAt(k).elementAt(j);
-                    k++; }
-//                v2.addElement(new Integer(erg));
-                v2.addElement(erg);
-                j++; }
-            ret.addElement(v2);
-            i++; 
-         }
-        return ret;
-    };
-}
-
- 
-class mathStrucUseMatrixOP {
-
-    main() {
-		Vector<Vector<Integer>> vv = new Vector<Vector<Integer>>();
-		Vector<Integer> v1 = new Vector<Integer>();
-		v1.addElement(2);
-		v1.addElement(2);
-		Vector<Integer> v2 = new Vector<Integer>();
-		v2.addElement(3);
-		v2.addElement(3);
-		vv.addElement(v1);
-		vv.addElement(v2);
-
-		MatrixOP m1 = new MatrixOP(vv);
-	
-		Vector<Vector<Integer>> vv1 = new Vector<Vector<Integer>>();
-		Vector<Integer> v3 = new Vector<Integer>();
-		v3.addElement(2);
-		v3.addElement(2);
-		Vector<Integer> v4 = new Vector<Integer>();
-		v4.addElement(3);
-		v4.addElement(3);
-		vv1.addElement(v3);
-		vv1.addElement(v4);
-
-		MatrixOP m2 = new MatrixOP(vv1);
-
-		var mms;
-		mms = new mathStrucMatrixOP<>(m1);
-		var mms2;
-		mms2 = new mathStrucMatrixOP<>(m2);
-		var mms3;
-		mms3 = mms.innerOp.apply(m1.mul).apply(mms2);
-		return mms3;
-    }
-}

resources/KPSPresentation/test1.jav

@@ -1,14 +0,0 @@
-import java.lang.String;
-import java.lang.Boolean;
-import java.lang.Integer;
-import java.io.Serializable;
-
-public class testclass{
-
-    public testMethod(ele){
-        if(ele){
-            return 1;
-        }
-        return "";
-    }
-}

resources/bytecode/javFiles/MatrixOP.jav

@@ -2,10 +2,9 @@ import java.util.Vector;
 import java.lang.Integer;
 //import java.lang.Byte;
 import java.lang.Boolean;
-import java.util.function.BiFunction;
 
 public class MatrixOP    extends Vector<Vector<Integer>> {
-
+   
 	MatrixOP () {
     }
 
@@ -37,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

@@ -8,6 +8,7 @@ import de.dhbwstuttgart.target.generate.ASTToTargetAST;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
+import de.dhbwstuttgart.util.Logger;
 import org.objectweb.asm.*;
 
 import java.lang.invoke.*;
@@ -20,6 +21,8 @@ import static de.dhbwstuttgart.target.tree.expression.TargetBinaryOp.*;
 import static de.dhbwstuttgart.target.tree.expression.TargetLiteral.*;
 
 public class Codegen {
+    public static Logger logger = new Logger("codegen");
+
     private final TargetStructure clazz;
     private final ClassWriter cw;
     public final String className;
@@ -132,7 +135,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 +156,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,9 +231,6 @@ 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;
@@ -645,7 +643,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());
         }
     }
 
@@ -808,7 +806,7 @@ public class Codegen {
         var handle = new Handle(state.isStatic ? H_INVOKESTATIC : H_INVOKEVIRTUAL, clazz.getName(), impl.name(), implSignature.getDescriptor(), false);
 
         var params = new ArrayList<TargetType>();
-        if(!state.isStatic) params.add(new TargetRefType(clazz.qualifiedName().toString()));
+        if(!state.isStatic) params.add(new TargetRefType(clazz.qualifiedName().getClassName()));
         params.addAll(lambda.captures().stream().map(mp -> mp.pattern().type()).toList());
 
         if (!state.isStatic)
@@ -947,7 +945,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 +962,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;
         }
@@ -1339,7 +1337,7 @@ public class Codegen {
                 types.add(Type.getObjectType(guard.inner().type().getInternalName()));
                 // TODO Same here we need to evaluate constant;
             } else {
-                System.out.println(label);
+                logger.info(label);
                 throw new NotImplementedException();
             }
         }
@@ -1428,7 +1426,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,7 +1531,7 @@ 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) {
@@ -1609,7 +1607,7 @@ public class Codegen {
         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.visitMethodInsn(INVOKESTATIC, className, "main", "(Ljava/util/List;)V", false);
         mv.visitInsn(RETURN);
         mv.visitMaxs(0, 0);
         mv.visitEnd();
@@ -1666,12 +1664,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();
         }
@@ -1783,7 +1781,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.
@@ -1826,7 +1824,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

@@ -98,7 +98,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;
@@ -124,7 +124,7 @@ public class FunNGenerator {
             superFunNMethodDescriptor.append(")V");
         }
 
-        System.out.println(superFunNMethodSignature);
+        Codegen.logger.info(superFunNMethodSignature);
 
         ClassWriter classWriter = new ClassWriter(0);
         MethodVisitor methodVisitor;

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

@@ -1,46 +1,81 @@
 package de.dhbwstuttgart.core;
 
+import de.dhbwstuttgart.server.SocketClient;
+import de.dhbwstuttgart.util.Logger;
 import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
 import java.util.*;
-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 {
+
+  /**
+   * Leave the argument configurations here for the rest of the code to read
+   */
+  public static Logger.LogLevel logLevel = Logger.LogLevel.ERROR;
+  public static boolean writeLogFiles = false;
+  public static Optional<String> unifyServerUrl = Optional.empty();
+
+  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();
+
+    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" +
+        "\t[--write-logs]\n" +
+        "\t[-v|-vv-|-vvv]");
+      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")) {
+        unifyServerUrl = Optional.of(it.next());
+      } else if (arg.equals("--write-logs")) {
+        ConsoleInterface.writeLogFiles = true;
+      } else if (arg.startsWith("-v")) {
+        logLevel = switch (arg) {
+          case "-v" -> Logger.LogLevel.WARNING;
+          case "-vv" -> Logger.LogLevel.INFO;
+          case "-vvv" -> Logger.LogLevel.DEBUG;
+          default -> throw new IllegalArgumentException("Argument " + arg + " is not a valid verbosity level");
+        };
+      } else {
+        input.add(new File(arg));
+      }
+    }
+
+    if (serverPort.isPresent()) {
+      if (unifyServerUrl.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);
+      //compiler.typeInference();
+      compiler.generateBytecode();
+      SocketClient.closeIfOpen();
+    }
+  }
 
 
 }

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

@@ -2,7 +2,6 @@
 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;
@@ -13,6 +12,11 @@ import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.antlr.Java17Parser.SourceFileContext;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
+import de.dhbwstuttgart.server.SocketClient;
+import de.dhbwstuttgart.server.SocketFuture;
+import de.dhbwstuttgart.server.packet.SetAutoclosePacket;
+import de.dhbwstuttgart.server.packet.UnifyRequestPacket;
+import de.dhbwstuttgart.server.packet.UnifyResultPacket;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.Method;
@@ -36,10 +40,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;
@@ -50,6 +57,7 @@ import de.dhbwstuttgart.typeinference.unify.UnifyResultListenerImpl;
 import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
 import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
 
+import de.dhbwstuttgart.util.Logger;
 import java.io.*;
 import java.lang.reflect.Modifier;
 import java.nio.file.Path;
@@ -62,34 +70,27 @@ import org.apache.commons.io.output.NullOutputStream;
 
 public class JavaTXCompiler {
 
+	// do not use this in any code, that can be executed serverside!
+	public static PlaceholderRegistry defaultClientPlaceholderRegistry = new PlaceholderRegistry();
+	public static Logger defaultLogger = new Logger();
+
 	// public static JavaTXCompiler INSTANCE;
 	final CompilationEnvironment environment;
 	Boolean resultmodel = true;
-    public final Map<File, SourceFile> sourceFiles = new HashMap<>();
+	public final 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;
+	public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
+	public final DirectoryClassLoader classLoader;
 
 	public final List<File> classPath;
 	private final File outputPath;
 
-	public final Map<String, FunNGenerator.GenericParameters> usedFunN = new HashMap<>();
-	public final Set<Integer> usedFunNSuperTypes = new HashSet<>();
-
-	public Map<String, byte[]> auxiliaries = new HashMap<>();
-
 	public DirectoryClassLoader getClassLoader() {
 		return classLoader;
 	}
-   
-	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
-		this(Arrays.asList(sourceFile), List.of(), new File("."));
-	}
 
-	public JavaTXCompiler(File sourceFile, Boolean log) throws IOException, ClassNotFoundException {
-		this(sourceFile);
-		this.log = log;
+	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
+		this(Collections.singletonList(sourceFile), List.of(), new File("."));
 	}
 
 	public JavaTXCompiler(List<File> sourceFiles) throws IOException, ClassNotFoundException {
@@ -97,6 +98,9 @@ public class JavaTXCompiler {
 	}
 
 	public JavaTXCompiler(List<File> sources, List<File> contextPath, File outputPath) throws IOException, ClassNotFoundException {
+		// ensure new default placeholder registry for tests
+		defaultClientPlaceholderRegistry = new PlaceholderRegistry();
+
 		var path = new ArrayList<>(contextPath);
 		if (contextPath.isEmpty()) {
 			// When no contextPaths are given, the working directory is the sources root
@@ -306,52 +310,51 @@ public class JavaTXCompiler {
 		Set<Set<UnifyPair>> results = new HashSet<>();
 		UnifyResultModel urm = null;
 		// urm.addUnifyResultListener(resultListener);
-		try {
-			logFile = logFile == null ? new FileWriter(new File("log_" + sourceFiles.keySet().iterator().next().getName())) : logFile;
-			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, getClassLoader(), this);
-			System.out.println(finiteClosure);
-			urm = new UnifyResultModel(cons, finiteClosure);
-			urm.addUnifyResultListener(resultListener);
-			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons);
+		logFile = logFile == null ? new FileWriter("log_" + sourceFiles.keySet().iterator().next().getName()) : logFile;
+		Logger logger = new Logger(logFile, "TypeInferenceAsync");
+		UnifyContext context = new UnifyContext(logger, true, urm, usedTasks, defaultClientPlaceholderRegistry);
 
-			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;
+		IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logger, getClassLoader(), this, context.placeholderRegistry());
+		logger.info(finiteClosure.toString());
+		urm = new UnifyResultModel(cons, finiteClosure);
+		urm.addUnifyResultListener(resultListener);
+		ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons, context.placeholderRegistry());
 
-			};
-			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));
+		Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
+			UnifyType lhs, rhs;
+			if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
+				((PlaceholderType) lhs).setInnerType(true);
+				((PlaceholderType) rhs).setInnerType(true);
 			}
-			logFile.flush();
-			Set<PlaceholderType> varianceTPHold;
-			Set<PlaceholderType> varianceTPH = new HashSet<>();
-			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
+			return x;
 
-			/*
-			 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH); varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) { if (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
-			 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) { ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType( )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0 && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType( )).getVariance()); } } return y; } ); } while (!varianceTPHold.equals(varianceTPH));
-			 */
-
-			// Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
-			// logFile, log);
-			// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
-			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()/*
-																								 * .stream().map(x -> { Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret; }).collect(Collectors. toCollection(ArrayList::new))
-																								 */;
-			unify.unifyAsync(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm, usedTasks);
-		} catch (IOException e) {
-			System.err.println("kein LogFile");
+		};
+		logger.debug(unifyCons.toString());
+		unifyCons = unifyCons.map(distributeInnerVars);
+		logger.debug(unifyCons.toString());
+		// Set<Set<UnifyPair>> results = new HashSet<>(); Nach vorne gezogen
+		logger.debug("FC:\\" + finiteClosure.toString() + "\n");
+		for (SourceFile f : this.sourceFiles.values()) {
+			logger.debug(ASTTypePrinter.print(f));
 		}
+		// logFile.flush();
+		Set<PlaceholderType> varianceTPHold;
+		Set<PlaceholderType> varianceTPH = new HashSet<>();
+		varianceTPH = varianceInheritanceConstraintSet(unifyCons);
+
+		/*
+		 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH); varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) { if (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
+		 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) { ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType( )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0 && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType( )).getVariance()); } } return y; } ); } while (!varianceTPHold.equals(varianceTPH));
+		 */
+
+		// Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
+		// logFile, log);
+		// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+		List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()/*
+																							 * .stream().map(x -> { Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret; }).collect(Collectors. toCollection(ArrayList::new))
+																							 */;
+		TypeUnify.unifyAsync(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
+
 		return urm;
 	}
 
@@ -371,108 +374,113 @@ public class JavaTXCompiler {
 
 		final ConstraintSet<Pair> cons = getConstraints(file);
 		Set<Set<UnifyPair>> results = new HashSet<>();
-		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);
-			System.out.println(finiteClosure);
-			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons);
-			System.out.println("xxx1");
-			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
-				UnifyType lhs, rhs;
-				if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
-					((PlaceholderType) lhs).setInnerType(true);
-					((PlaceholderType) rhs).setInnerType(true);
-				}
-				return x;
+		PlaceholderRegistry placeholderRegistry = new PlaceholderRegistry();
 
-			};
+		var logFolder = new File(System.getProperty("user.dir") + "/logFiles/");
+		if (ConsoleInterface.writeLogFiles && !logFolder.mkdirs()) throw new RuntimeException("Could not creat directoy for log files: " + logFolder);
+		Writer logFile = ConsoleInterface.writeLogFiles ? new FileWriter(new File(logFolder, "log_" + sourceFiles.keySet().iterator().next().getName())) : new OutputStreamWriter(new NullOutputStream());
+		Logger logger = new Logger(logFile, "TypeInference");
 
-			logFile.write("Unify:" + unifyCons.toString());
-			System.out.println("Unify:" + unifyCons.toString());
-			unifyCons = unifyCons.map(distributeInnerVars);
-			logFile.write("\nUnify_distributeInnerVars: " + unifyCons.toString());
-			TypeUnify unify = new TypeUnify();
-			// Set<Set<UnifyPair>> results = new HashSet<>(); Nach vorne gezogen
-			logFile.write("FC:\\" + finiteClosure.toString() + "\n");
-			logFile.write(ASTTypePrinter.print(sf));
-			System.out.println(ASTTypePrinter.print(sf));
-			logFile.flush();
-			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);
-
-			Set<PlaceholderType> varianceTPHold;
-			Set<PlaceholderType> varianceTPH = new HashSet<>();
-			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
-
-			/*
-			 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH); varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) { if (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
-			 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) { ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType( )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0 && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType( )).getVariance()); } } return y; } ); } while (!varianceTPHold.equals(varianceTPH));
-			 */
-
-			// Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
-			// logFile, log);
-			// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
-			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()// .stream().map(x -> {
-			/*
-			 * Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret; }).collect(Collectors.toCollection(ArrayList::new))
-			 */;
-			if (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());
-				}
-				System.out.println("Constraints for Generated Generics: " + " ???");
-				logFile.write("RES_FINAL: " + li.getResults().toString() + "\n");
-				logFile.flush();
-				return li.getResults();
+		FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses.stream().toList(), logger, classLoader, this, placeholderRegistry);
+		logger.info(finiteClosure.toString());
+		ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(this, cons, placeholderRegistry);
+		logger.info("xxx1");
+		Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
+			UnifyType lhs, rhs;
+			if (((lhs = x.getLhsType()) instanceof PlaceholderType) && ((rhs = x.getRhsType()) instanceof PlaceholderType) && (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
+				((PlaceholderType) lhs).setInnerType(true);
+				((PlaceholderType) rhs).setInnerType(true);
 			}
-			/* UnifyResultModel End */
-			else {
-				// Set<Set<UnifyPair>> result = unify.unify(unifyCons.getUndConstraints(),
-				// oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons,
-				// finiteClosure));
-				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
-				System.out.println("RESULT: " + result);
-				logFile.write("RES: " + result.toString() + "\n");
-				logFile.flush();
-				results.addAll(result);
+			return x;
 
-				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));
-				System.out.println("RESULT Final: " + results);
-				System.out.println("Constraints for Generated Generics: " + " ???");
-				logFile.write("RES_FINAL: " + results.toString() + "\n");
-				logFile.flush();
-				logFile.write("PLACEHOLDERS: " + PlaceholderType.EXISTING_PLACEHOLDERS);
-				logFile.flush();
-			}
-		} catch (IOException e) {
-			System.err.println("kein LogFile");
+		};
+
+    logger.debug("Unify:" + unifyCons.toString());
+    logger.info("Unify:" + unifyCons.toString());
+    unifyCons = unifyCons.map(distributeInnerVars);
+    logger.debug("\nUnify_distributeInnerVars: " + unifyCons.toString());
+    // Set<Set<UnifyPair>> results = new HashSet<>(); Nach vorne gezogen
+    logger.debug("FC:\\" + finiteClosure.toString() + "\n");
+    logger.info(ASTTypePrinter.print(sf));
+    // logFile.flush();
+    List<UnifyPair> andConstraintsSorted = unifyCons.getUndConstraints().stream()
+        .sorted(Comparator.comparing(UnifyPair::getPairOp).thenComparing(UnifyPair::getLhsType, Comparator.comparing(UnifyType::getName)))
+        .collect(Collectors.toList());
+
+    logger.info(andConstraintsSorted);
+
+    Set<PlaceholderType> varianceTPHold;
+    Set<PlaceholderType> varianceTPH = new HashSet<>();
+    varianceTPH = varianceInheritanceConstraintSet(unifyCons);
+
+		/*
+		 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH); varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) { if (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
+		 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) { ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType( )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0 && ((PlaceholderType)y.getRhsType()).getVariance() != 0) { ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType( )).getVariance()); } } return y; } ); } while (!varianceTPHold.equals(varianceTPH));
+		 */
+
+    // Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
+    // logFile, log);
+    // Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+    List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()// .stream().map(x -> {
+    /*
+     * Set<Set<UnifyPair>> ret = new HashSet<>(); for (Constraint<UnifyPair> y : x) { ret.add(new HashSet<>(y)); } return ret; }).collect(Collectors.toCollection(ArrayList::new))
+     */;
+    if (ConsoleInterface.unifyServerUrl.isPresent()) {
+        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        UnifyContext context = new UnifyContext(logger, true, urm, usedTasks, placeholderRegistry);
+        SocketFuture<UnifyResultPacket> future = SocketClient.execute(
+          UnifyRequestPacket.create(finiteClosure, cons, unifyCons, context.placeholderRegistry())
+        );
+        SocketClient.execute(SetAutoclosePacket.create());
+        return future.get().getResultSet(context);
+    }
+    else if (resultmodel) {
+        /* UnifyResultModel Anfang */
+        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        UnifyResultListenerImpl li = new UnifyResultListenerImpl();
+        urm.addUnifyResultListener(li);
+				UnifyContext context = new UnifyContext(logger, true, urm, usedTasks, placeholderRegistry);
+				TypeUnify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
+        var finalResults = li.getResults().stream().sorted().toList();
+        int i = 0;
+        logger.info("RESULT Final: ");
+        for (var result : finalResults){
+          logger.info("Result: " + i++);
+          logger.info(result.getSortedResults());
+        }
+        logger.info("RES_FINAL: " + li.getResults().toString() + "\n");
+        return li.getResults();
+    }
+    /* UnifyResultModel End */
+    else {
+        // Set<Set<UnifyPair>> result = unify.unify(unifyCons.getUndConstraints(),
+        // oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons,
+        // finiteClosure));
+        UnifyContext context = new UnifyContext(logger, false, new UnifyResultModel(cons, finiteClosure), usedTasks, placeholderRegistry);
+        Set<Set<UnifyPair>> result = TypeUnify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, context);
+        logger.info("RESULT: " + result);
+        results.addAll(result);
+
+        results = results.stream().map(x -> {
+          Optional<Set<UnifyPair>> res = new RuleSet(placeholderRegistry).subst(x.stream().map(y -> {
+            if (y.getPairOp() == PairOperator.SMALLERDOTWC)
+              y.setPairOp(PairOperator.EQUALSDOT);
+            return y; // alle Paare a <.? b erden durch a =. b ersetzt
+          }).collect(Collectors.toCollection(HashSet::new)));
+          if (res.isPresent()) {// wenn subst ein Erg liefert wurde was veraendert
+            return new TypeUnifyTask(context).applyTypeUnificationRules(res.get(), finiteClosure);
+          } else
+            return x; // wenn nichts veraendert wurde wird x zurueckgegeben
+        }).collect(Collectors.toCollection(HashSet::new));
+        logger.info("RESULT Final: " + results);
+        logger.info("Constraints for Generated Generics: " + " ???");
+        logger.debug("RES_FINAL: " + results.toString() + "\n");
+        // logFile.flush();
+        logger.debug("PLACEHOLDERS: " + placeholderRegistry);
+        // logFile.flush();
 		}
-		return results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons))))).collect(Collectors.toList());
+
+		return results.stream().map((unifyPairs -> new ResultSet(UnifyTypeFactory.convert(unifyPairs, Pair.generateTPHMap(cons), placeholderRegistry)))).collect(Collectors.toList());
 	}
 
 	/**
@@ -604,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;
@@ -652,7 +656,7 @@ public class JavaTXCompiler {
 		}
 		generatedGenerics.put(sf, converter.javaGenerics());
 		converter.generateFunNTypes();
-		auxiliaries.forEach((name, source) -> {
+		converter.auxiliaries.forEach((name, source) -> {
 			generatedClasses.put(new JavaClassName(name), source);
 		});
 		return generatedClasses;
@@ -662,15 +666,15 @@ public class JavaTXCompiler {
 		FileOutputStream output;
 		for (JavaClassName name : classFiles.keySet()) {
 			byte[] bytecode = classFiles.get(name);
-			System.out.println("generating " + name + ".class file ...");
+			defaultLogger.info("generating " + name + ".class file ...");
 			var subPath = preserveHierarchy ? path : Path.of(path.toString(), name.getPackageName().split("\\.")).toFile();
 			File outputFile = new File(subPath, name.getClassName() + ".class");
 			outputFile.getAbsoluteFile().getParentFile().mkdirs();
-			System.out.println(outputFile);
+			defaultLogger.info(outputFile.toString());
 			output = new FileOutputStream(outputFile);
 			output.write(bytecode);
 			output.close();
-			System.out.println(name + ".class file generated");
+			defaultLogger.success(name + ".class file generated");
 		}
 	}
 

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);
+  }
+
+  public void listen() {
+    isRunning = true;
+    socketServer.start();
+  }
+
+  public void forceStop() {
+    try {
+      socketServer.stop();
+    }
+    catch (InterruptedException exception) {
+      System.err.println("Interrupted socketServer: " + exception);
+    }
+    isRunning = false;
+  }
+
+
+}

src/main/java/de/dhbwstuttgart/environment/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/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/parser/JavaTXParser.java

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

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

@@ -1,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

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
+import de.dhbwstuttgart.parser.JavaTXParser;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -150,7 +151,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); 
@@ -259,7 +260,7 @@ public class StatementGenerator {
             ret.setStatement();
             return ret;
         default:
-            System.out.println(stmt.getClass());
+            JavaTXParser.logger.info(stmt.getClass());
             throw new NotImplementedException();
         }
     }
@@ -1065,7 +1066,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 +1076,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 {

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

@@ -74,7 +74,7 @@ public class TypeGenerator {
                 throw new NotImplementedException();
             }
         } else if (!typeContext.LBRACK().isEmpty()) { // ArrayType über eckige Klammer prüfen
-            // System.out.println(unannTypeContext.getText());
+            // JavaTXParser.logger.info(unannTypeContext.getText());
             throw new NotImplementedException();
         }
         /*

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,7 +5,7 @@ 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{
     final Map<JavaClassName, Integer> existingClasses = new HashMap<>();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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 org.jspecify.annotations.Nullable;
+
+public class SerialMap extends HashMap<String, ISerialNode> implements ISerialNode {
+
+  public SerialMap() {
+    super();
+  }
+
+  public SerialMap(Map<String, ISerialNode> data) {
+    super(data);
+  }
+
+  @JsonIgnore
+  public void put(String key, Boolean value) {
+    this.put(key, new SerialValue<>(value));
+  }
+
+  @JsonIgnore
+  public void put(String key, String value) {
+    this.put(key, new SerialValue<>(value));
+  }
+
+  @JsonIgnore
+  public void put(String key, Number value) {
+    this.put(key, new SerialValue<>(value));
+  }
+
+  @JsonIgnore
+  private <T> T get(String key, Class<T> expectedType) {
+    if (!this.containsKey(key)) {
+      throw new RuntimeException("Missing required value " + key + " in ObjectMap");
+    }
+    var element = this.get(key);
+    if (element != null && element.getClass() != expectedType) {
+      throw new RuntimeException(
+        "Required value " + key + " to be of type " + expectedType.getName() + " but found " + element.getClass().getName()
+      );
+    }
+    return (T)element;
+  }
+
+  @JsonIgnore
+  public SerialList<?> getList(String key) {
+    return this.get(key, SerialList.class);
+  }
+
+  @Nullable
+  @JsonIgnore
+  public SerialList<?> getListOrNull(String key) {
+    return this.containsKey(key) ? this.getList(key) : null;
+  }
+
+  @JsonIgnore
+  public SerialMap getMap(String key) {
+    return this.get(key, SerialMap.class);
+  }
+
+  @Nullable
+  @JsonIgnore
+  public SerialMap getMapOrNull(String key) {
+    return this.containsKey(key) ? this.getMap(key) : null;
+  }
+
+  @JsonIgnore
+  public SerialValue<?> getValue(String key) {
+    return this.get(key, SerialValue.class);
+  }
+
+  @JsonIgnore
+  public SerialUUID getUUID(String key) {
+    return this.get(key, SerialUUID.class);
+  }
+
+  @Nullable
+  @JsonIgnore
+  public SerialUUID getUUIDOrNull(String key) {
+    return this.containsKey(key) ? this.getUUID(key) : null;
+  }
+}

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

@@ -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/SyntaxTree.java

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

src/main/java/de/dhbwstuttgart/syntaxtree/factory/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";
@@ -26,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,8 @@
 package de.dhbwstuttgart.syntaxtree.factory;
 
+import de.dhbwstuttgart.syntaxtree.SyntaxTree;
+import de.dhbwstuttgart.typeinference.unify.PlaceholderRegistry;
+import de.dhbwstuttgart.util.Logger;
 import java.io.Writer;
 import java.lang.reflect.Modifier;
 import java.util.*;
@@ -31,9 +34,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,
+      Logger logger,
+      ClassLoader classLoader,
+      JavaTXCompiler compiler,
+      PlaceholderRegistry placeholderRegistry
+    ) throws ClassNotFoundException {
         /*
         Die transitive Hülle muss funktionieren.
         Man darf schreiben List<A> extends AL<A>
@@ -44,7 +51,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), logger, compiler, placeholderRegistry);
     }
 
     public static UnifyPair generateSmallerPair(UnifyType tl, UnifyType tr, SourceLoc location){
@@ -67,23 +74,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 +98,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);
+          SyntaxTree.logger.info("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 +178,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("");
+        		// SyntaxTree.logger.info("");
         	}
         	((PlaceholderType)rhs).enableWildcardtable();
         }
@@ -203,7 +210,7 @@ public class UnifyTypeFactory {
         		&& ((PlaceholderType)rhs).isWildcardable()
         		&&	(lhs = ret.getLhsType()) instanceof PlaceholderType) {
         	if (rhs.getName().equals("AQ")) {
-        		System.out.println("");
+        		// SyntaxTree.logger.info("");
         	}
         	((PlaceholderType)lhs).enableWildcardtable();
         }
@@ -214,16 +221,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 +239,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 +251,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/Target.java

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

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

@@ -13,6 +13,7 @@ import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
 import de.dhbwstuttgart.syntaxtree.visual.OutputGenerator;
+import de.dhbwstuttgart.target.Target;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.*;
@@ -36,6 +37,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;
 
@@ -60,11 +62,9 @@ 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;
 
@@ -82,9 +82,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) {
@@ -94,13 +94,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());
         }
@@ -108,16 +104,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;
@@ -343,10 +339,10 @@ public class ASTToTargetAST {
 
         var result = r0.stream().map(l -> l.stream().toList()).toList();
 
-        System.out.println("============== OUTPUT ==============");
+        Target.logger.info("============== OUTPUT ==============");
         for (var l : result) {
-            for (var m : l) System.out.println(m.name() + " " + m.getSignature());
-            System.out.println();
+            for (var m : l) Target.logger.info(m.name() + " " + m.getSignature());
+            Target.logger.info("");
         }
         return result;
     }
@@ -355,14 +351,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);
@@ -424,7 +425,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;
@@ -468,6 +469,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) {
@@ -738,6 +746,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);
     }
@@ -806,24 +819,20 @@ 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);
+            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) {
@@ -835,31 +844,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(superClassName, 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);
                 }
@@ -868,7 +877,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
@@ -878,7 +887,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,12 +1,12 @@
 package de.dhbwstuttgart.target.generate;
 
 import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.parser.JavaTXParser;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.syntaxtree.type.Void;
+import de.dhbwstuttgart.target.Target;
 import de.dhbwstuttgart.target.tree.type.TargetGenericType;
 import de.dhbwstuttgart.target.tree.type.TargetType;
 import de.dhbwstuttgart.typeinference.result.PairTPHEqualTPH;
@@ -20,7 +20,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,21 +136,21 @@ public abstract class GenerateGenerics {
     Map<TPH, RefTypeOrTPHOrWildcardOrGeneric> concreteTypes = new HashMap<>();
     Map<TypePlaceholder, TypePlaceholder> equality = new HashMap<>();
 
-    GenerateGenerics(JavaTXCompiler compiler, ResultSet constraints) {
-        this.compiler = compiler;
+    GenerateGenerics(ASTToTargetAST astToTargetAST, ResultSet constraints) {
+        this.astToTargetAST = astToTargetAST;
         for (var constraint : constraints.results) {
             if (constraint instanceof PairTPHsmallerTPH p) {
-                System.out.println(p.left + " " + p.left.getVariance());
+                Target.logger.info(p.left + " " + p.left.getVariance());
                 simplifiedConstraints.add(new PairLT(new TPH(p.left), new TPH(p.right)));
             } else if (constraint instanceof PairTPHEqualTPH p) {
                 equality.put(p.getLeft(), p.getRight());
             } else if (constraint instanceof PairTPHequalRefTypeOrWildcardType p) {
-                System.out.println(p.left + " = " + p.right);
+                Target.logger.info(p.left + " = " + p.right);
                 concreteTypes.put(new TPH(p.left), p.right);
             }
         }
 
-        System.out.println("Simplified constraints: " + simplifiedConstraints);
+        Target.logger.info("Simplified constraints: " + simplifiedConstraints);
     }
 
     /*public record GenericsState(Map<TPH, RefTypeOrTPHOrWildcardOrGeneric> concreteTypes, Map<TypePlaceholder, TypePlaceholder> equality) {}
@@ -250,7 +250,7 @@ public abstract class GenerateGenerics {
                 equality.put(entry.getKey(), to);
             }
         }
-        System.out.println(from + " -> " + to + " " + from.getVariance());
+        Target.logger.info(from + " -> " + to + " " + from.getVariance());
         //from.setVariance(to.getVariance());
         equality.put(from, to);
         referenced.remove(new TPH(from));
@@ -283,7 +283,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)) {
@@ -319,7 +319,7 @@ public abstract class GenerateGenerics {
                     Set<TPH> T2s = new HashSet<>();
                     findTphs(superType, T2s);
 
-                    System.out.println("T1s: " + T1s + " T2s: " + T2s);
+                    Target.logger.info("T1s: " + T1s + " T2s: " + T2s);
                     //Ende
 
                     superType = methodCall.receiverType;
@@ -331,10 +331,10 @@ public abstract class GenerateGenerics {
 
                     if (methodCall.receiver instanceof ExpressionReceiver expressionReceiver) {
                         if (expressionReceiver.expr instanceof This) {
-                            var optMethod = ASTToTargetAST.findMethod(owner, methodCall.name, methodCall.signatureArguments().stream().map(x -> getTargetType(x)).toList(), GenerateGenerics.this, compiler);
+                            var optMethod = astToTargetAST.findMethod(owner, methodCall.name, methodCall.signatureArguments().stream().map(astToTargetAST::convert).toList());
                             if (optMethod.isEmpty()) return;
                             var method2 = optMethod.get();
-                            System.out.println("In: " + method.getName() + " Method: " + method2.getName());
+                            Target.logger.info("In: " + method.getName() + " Method: " + method2.getName());
                             var generics = family(owner, method2);
 
                             // transitive and
@@ -367,7 +367,7 @@ public abstract class GenerateGenerics {
                                                     if (!T1s.contains(R1) || !T2s.contains(R2)) continue;
 
                                                     var newPair = new PairLT(R1, R2);
-                                                    System.out.println("New pair: " + newPair);
+                                                    Target.logger.info("New pair: " + newPair);
                                                     newPairs.add(newPair);
 
                                                     if (!containsRelation(result, newPair))
@@ -569,7 +569,7 @@ public abstract class GenerateGenerics {
     Set<Pair> generics(ClassOrInterface owner, Method method) {
         if (computedGenericsOfMethods.containsKey(method)) {
             var cached = computedGenericsOfMethods.get(method);
-            System.out.println("Cached " + method.getName() + ": " + cached);
+            Target.logger.info("Cached " + method.getName() + ": " + cached);
             return cached;
         }
 
@@ -598,7 +598,7 @@ public abstract class GenerateGenerics {
 
         normalize(result, classGenerics, usedTphs);
 
-        System.out.println(this.getClass().getSimpleName() + " " + method.name + ": " + result);
+        Target.logger.info(this.getClass().getSimpleName() + " " + method.name + ": " + result);
         return result;
     }
 
@@ -677,7 +677,7 @@ public abstract class GenerateGenerics {
 
         normalize(javaResult, null, referencedByClass);
 
-        System.out.println(this.getClass().getSimpleName() + " Class " + classOrInterface.getClassName().getClassName() + ": " + javaResult);
+        Target.logger.info(this.getClass().getSimpleName() + " Class " + classOrInterface.getClassName().getClassName() + ": " + javaResult);
         return javaResult;
     }
 
@@ -728,7 +728,7 @@ public abstract class GenerateGenerics {
                     if (!added) break;
                 }
 
-                System.out.println(chain + " " + chain.stream().map(e -> e.resolve().getVariance()).toList());
+                Target.logger.info(chain + " " + chain.stream().map(e -> e.resolve().getVariance()).toList());
                 var variance = chain.get(0).resolve().getVariance();
                 if (variance != 1) continue;
                 var index = 0;
@@ -766,7 +766,7 @@ public abstract class GenerateGenerics {
         }
 
         for (var pair : elementsToAddToEquality) {
-            System.out.println(pair);
+            Target.logger.info(pair);
             addToEquality(pair.left, pair.right, referenced);
         }
     }
@@ -919,11 +919,11 @@ public abstract class GenerateGenerics {
                     }
                 }
                 if (infima.size() > 1) {
-                    System.out.println(infima);
+                    Target.logger.info(infima);
                     for (var pair : infima) {
                         var returnTypes = findTypeVariables(method.getReturnType());
                         var chain = findConnectionToReturnType(returnTypes, input, new HashSet<>(), pair.left);
-                        System.out.println("Find: " + pair.left + " " + chain);
+                        Target.logger.info("Find: " + pair.left + " " + chain);
                         chain.remove(pair.left);
                         if (chain.size() > 0) {
                             for (var tph : chain)
@@ -961,8 +961,8 @@ public abstract class GenerateGenerics {
                         }
                     }
                     newTph.setVariance(variance);
-                    System.out.println(infima + " " + infima.stream().map(i -> i.right.resolve().getVariance()).toList());
-                    System.out.println("Infima new TPH " + newTph + " variance " + variance);
+                    Target.logger.info(infima + " " + infima.stream().map(i -> i.right.resolve().getVariance()).toList());
+                    Target.logger.info("Infima new TPH " + newTph + " variance " + variance);
 
                     //referenced.add(newTph);
                     addToPairs(input, new PairLT(left, new TPH(newTph)));
@@ -1007,8 +1007,8 @@ public abstract class GenerateGenerics {
             }
             var type = concreteTypes.get(new TPH(tph));
             if (type == null) return new TargetGenericType(tph.getName());
-            return ASTToTargetAST.convert(type, this, compiler);
+            return astToTargetAST.convert(type, this);
         }
-        return ASTToTargetAST.convert(in, this, compiler);
+        return astToTargetAST.convert(in, this);
     }
 }

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

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

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

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

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

@@ -8,6 +8,7 @@ import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.target.Target;
 import de.dhbwstuttgart.target.tree.MethodParameter;
 import de.dhbwstuttgart.target.tree.TargetMethod;
 import de.dhbwstuttgart.target.tree.expression.*;
@@ -255,7 +256,7 @@ public class StatementToTargetExpression implements ASTVisitor {
             isInterface = receiverClass.isInterface();
         }
 
-        System.out.println(argList);
+        Target.logger.info(argList);
         result = new TargetMethodCall(converter.convert(methodCall.getType()), returnType, argList, converter.convert(methodCall.receiver), methodCall.getArgumentList().getArguments().stream().map(converter::convert).toList(), receiverType, methodCall.name, isStatic, isInterface, isPrivate);
     }
 

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

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

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

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

src/main/java/de/dhbwstuttgart/target/tree/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() + ";";
-    }
 }