set Target to 24

pom.xml

@@ -73,8 +73,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<version>3.14.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>23</source>
-                    <target>23</target>
+                    <source>24</source>
+                    <target>24</target>
                 </configuration>
 			</plugin>
 			<plugin>

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

@@ -112,138 +112,9 @@ public class LanguageServerInterface {
         return test;
     }
 
-    private static void writeClassFile(String name, byte[] code, Path outputPath) throws IOException {
-        Files.createDirectories(outputPath);
-        Files.write(outputPath.resolve(name + ".class"), code);
-    }
-
-    public static Map<String, ? extends Class<?>> generateClassFiles(IByteArrayClassLoader classLoader, Path path, Path outputPath, String... files) throws IOException, ClassNotFoundException {
-        Files.createDirectories(outputPath);
-        var filenames = Arrays.stream(files).map(filename -> Path.of(path.toString(), filename).toFile()).toList();
-        var compiler = new JavaTXCompiler(filenames, List.of(path.toFile(), outputPath.toFile()), outputPath.toFile());
-
-        var result = new HashMap<String, Class<?>>();
-        for (var file : filenames) {
-            var resultSet = compiler.typeInference(file);
-
-            var sourceFile = compiler.sourceFiles.get(file);
-            var converter = new ASTToTargetAST(compiler, resultSet, sourceFile, classLoader);
-            var classes = compiler.sourceFiles.get(file).getClasses();
-
-            result.putAll(classes.stream().map(cli -> {
-                try {
-                    return generateClass(converter.convert(cli), classLoader, converter, outputPath);
-                } catch (IOException exception) {
-                    throw new RuntimeException(exception);
-                }
-            }).collect(Collectors.toMap(Class::getName, Function.identity())));
-
-            converter.generateFunNTypes();
-
-            for (var entry : converter.auxiliaries.entrySet()) {
-                writeClassFile(entry.getKey(), entry.getValue(), outputPath);
-            }
-        }
-
-        for (var entry : compiler.loadedClasses.entrySet()) {
-            var name = entry.getKey().toString();
-            result.put(name, classLoader.loadClass(Path.of(entry.getValue().classFile().toURI())));
-        }
-
-        return result;
-    }
-
-    public static Class<?> generateClass(TargetStructure clazz, IByteArrayClassLoader classLoader, ASTToTargetAST converter, Path outputPath) throws IOException {
-        Codegen codegen = new Codegen(clazz, converter.compiler, converter);
-        var code = codegen.generate();
-        writeClassFile(clazz.qualifiedName().getClassName(), code, outputPath);
-        return classLoader.loadClass(code);
-    }
-
-    public static Map<String, ? extends Class<?>> generateClassFiles(String filename, IByteArrayClassLoader classLoader, String filePath) throws IOException, ClassNotFoundException {
-        var file = Path.of(filePath, filename).toFile();
-        var compiler = new JavaTXCompiler(List.of(file), List.of(file.getParentFile()), Path.of(filePath + "/out").toFile());
-        var resultSet = compiler.typeInference(file);
-
-        var sourceFile = compiler.sourceFiles.get(file);
-        var converter = new ASTToTargetAST(compiler, resultSet, sourceFile, classLoader);
-        var classes = compiler.sourceFiles.get(file).getClasses();
-
-        var result = classes.stream().map(cli -> {
-            try {
-                return generateClass(converter.convert(cli), classLoader, converter, Path.of(filePath + "/out/"));
-            } catch (IOException exception) {
-                throw new RuntimeException(exception);
-            }
-        }).collect(Collectors.toMap(Class::getName, Function.identity()));
-
-        converter.generateFunNTypes();
-
-        for (var entry : converter.auxiliaries.entrySet()) {
-            writeClassFile(entry.getKey(), entry.getValue(), Path.of(filePath + "/out/"));
-        }
-
-        return result;
-    }
-
     public static SourceFile getAST(String filename, String filePath) throws IOException, ClassNotFoundException {
         var file = Path.of(filePath, filename).toFile();
         var compiler = new JavaTXCompiler(List.of(file), List.of(file.getParentFile()), Path.of(filePath + "/out").toFile());
         return compiler.sourceFiles.get(file);
     }
-
-    public static LanguageServerTransferObject getLanguageServerTransferObject(String filename, IByteArrayClassLoader classLoader, String filePath) throws IOException, ClassNotFoundException {
-        var file = Path.of(filePath, filename).toFile();
-        var compiler = new JavaTXCompiler(List.of(file), List.of(file.getParentFile()), Path.of(filePath + "/out").toFile());
-        var resultSet = compiler.typeInference(file);
-
-        var sourceFile = compiler.sourceFiles.get(file);
-        var converter = new ASTToTargetAST(compiler, resultSet, sourceFile, classLoader);
-        compiler.generateBytecode();
-        converter.generateFunNTypes();
-
-        var ta = converter.javaGenerics();
-        var tb = converter.txGenerics();
-        Map<SourceFile, List<GenericsResult>> generics = new HashMap<>();
-
-        ArrayList<GenericsResult> genericsResults = new ArrayList<>();
-        genericsResults.addAll(ta);
-        genericsResults.addAll(tb);
-        generics.put(converter.compiler.sourceFiles.values().stream().findFirst().get(), ta);
-        var test = new LanguageServerTransferObject(resultSet, converter.compiler.sourceFiles.values().stream().findFirst().get(), "", compiler.getGeneratedGenerics());
-        return test;
-    }
-
-    /**
-     * generates Bytecode for the given Path of the File.
-     * The Generated Bytecode can be found in the same place as the path, except the File lies in an /out/ Directory
-     * Example: file:///c:/test/main.jav -> file:///c:/test/out/main.class
-     *
-     * @param uri the URI of the File. See Example.
-     * @throws IOException
-     * @throws ClassNotFoundException
-     * @throws URISyntaxException
-     */
-    public void generateBytecode(URI uri) throws IOException, ClassNotFoundException, URISyntaxException {
-
-//        System.setOut(new PrintStream(OutputStream.nullOutputStream()));
-//
-//
-//        File inputDir = new File(uri.getPath());
-//        File outFile = new File(uri.getPath() + "/out");
-//        FileUtils.cleanDirectory(outFile);
-//        String[] allowedEndings = {".jav"};
-//        ArrayList<File> files = new ArrayList<>();
-//
-//        try (Stream<Path> stream = Files.walk(Paths.get(inputDir.toURI()))) {
-//            stream.filter(Files::isRegularFile)
-//                    .forEach(el -> files.add(el.toFile()));
-//        }
-//
-//
-//        List<String> javFiles = files.stream().filter(el -> el.getName().split("\\.").length >= 2 && el.getName().split("\\.")[el.getName().split("\\.").length - 1].contains("jav")).map(el -> el.getPath().replace(inputDir.getPath(), "").substring(1)).toList();
-//        //TODO: Link between Files
-//        generateClassFiles(new ByteArrayClassLoader(), Path.of(inputDir.toURI()), Path.of(outFile.toURI()), javFiles.toArray(new String[0]));
-//        System.setOut(System.out);
-    }
 }

src/test/java/languageServerInterfaceTest/LangaugeServerInterfaceTest.java

@@ -1,51 +0,0 @@
-package languageServerInterfaceTest;
-
-import de.dhbwstuttgart.core.ConsoleInterface;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
-import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
-import org.junit.Ignore;
-import org.junit.Test;
-import de.dhbwstuttgart.languageServerInterface.LanguageServerInterface;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-public class LangaugeServerInterfaceTest {
-    @Test
-    @Ignore
-    public void consoleInterfaceTest() throws IOException, ClassNotFoundException, URISyntaxException {
-
-
-        LanguageServerInterface languageServerInterface = new LanguageServerInterface();
-        var resp = languageServerInterface.getResultSetAndAbstractSyntax("/home/ruben/code/JavaCompilerCore/src/test/java/languageServerInterfaceTest/test.jav");
-
-        System.out.println("\n-----------------------------------------\n");
-        System.out.println(ASTPrinter.print(resp.getAst()));
-        System.out.println("\n-----------------------------------------\n");
-
-        LanguageServerInterface languageServerInterface2 = new LanguageServerInterface();
-        var ast = languageServerInterface2.getAst("/home/ruben/code/JavaCompilerCore/src/test/java/languageServerInterfaceTest/test.jav", "N");
-
-        System.out.println("\n-----------------------------------------\n");
-        System.out.println(ASTPrinter.print(ast));
-        System.out.println("\n-----------------------------------------\n");
-        System.out.println("");
-    }
-
-    @Test
-    @Ignore
-    public void testBytecodeGen() throws IOException, ClassNotFoundException, URISyntaxException {
-
-        //TODO: Ordner und Datei löschen wenn sie bereits existieren
-        LanguageServerInterface languageServerInterface = new LanguageServerInterface();
-        languageServerInterface.generateBytecode(new URI("c%3A/Users/ruben/Neuer%20Ordner%20%282%29/LSP-Vortrag/images/"));
-    }
-}