cleanup

Author: Mom0aut

dynamic-relations/src/main/java/at/drm/factory/RelationDaoFactory.java

@@ -13,14 +13,11 @@
 import java.util.Set;
 
 @Component
+@RequiredArgsConstructor
 public class RelationDaoFactory {
 
     private final ApplicationContext applicationContext;
 
-    public RelationDaoFactory(ApplicationContext applicationContext) {
-        this.applicationContext = applicationContext;
-    }
-
     public RelationDao getDaoFromSourceObjectClass(Class dynamicRelactionClass) {
         Map<String, RelationDao> beansOfType = applicationContext.getBeansOfType(RelationDao.class);
         RelationDao relationDao = beansOfType.values().stream()

dynamic-relations/src/main/java/at/drm/processor/ReleationProcessor.java

@@ -7,8 +7,6 @@
 import com.google.auto.service.AutoService;
 import com.squareup.javapoet.*;
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;

dynamic-relations/src/test/java/at/drm/processor/ReleationProcessorTest.java

@@ -1,23 +1,27 @@
 package at.drm.processor;
 
+import static com.google.testing.compile.Compiler.javac;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import at.drm.annotation.Relation;
+import com.google.common.collect.ImmutableList;
 import com.google.testing.compile.Compilation;
 import com.google.testing.compile.CompilationSubject;
 import com.google.testing.compile.JavaFileObjects;
+import java.io.InputStream;
+import java.util.Scanner;
+import java.util.Set;
+import javax.annotation.processing.Messager;
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.SourceVersion;
+import javax.tools.JavaFileObject;
+import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import javax.annotation.processing.Messager;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.lang.model.SourceVersion;
-import java.util.Set;
-
-import static com.google.testing.compile.Compiler.javac;
-import static org.assertj.core.api.Assertions.assertThat;
-
 @ExtendWith(MockitoExtension.class)
 class ReleationProcessorTest {
 
@@ -53,15 +57,14 @@ void getSupportedSourceVersion() {
 
     @Test
     void process() {
-    ReleationProcessor releationProcessor = new ReleationProcessor();
-    Compilation compilation = javac()
-        .withProcessors(releationProcessor)
-        .compile(JavaFileObjects.forResource("TestFile.java"));
+        ReleationProcessor releationProcessor = new ReleationProcessor();
+        Compilation compilation = javac()
+            .withProcessors(releationProcessor)
+            .compile(JavaFileObjects.forResource("TestFile.java"));
         CompilationSubject.assertThat(compilation).succeeded();
-        com.google.common.collect.ImmutableList<javax.tools.JavaFileObject> generatedFiles = compilation.generatedFiles();
+        ImmutableList<JavaFileObject> generatedFiles = compilation.generatedFiles();
         assertThat(generatedFiles).isNotEmpty();
 
-        // Zusätzliche Prüfung: Methoden vorhanden
         RelationClassMethods methods = generatedFiles.stream()
             .filter(file -> file.getName().endsWith("Relation.java"))
             .map(this::extractMethodsFromFile)
@@ -79,27 +82,26 @@ void process() {
         assertThat(methods.hasConstructor).isTrue();
     }
 
+    @SneakyThrows
     private RelationClassMethods extractMethodsFromFile(javax.tools.JavaFileObject file) {
         RelationClassMethods result = new RelationClassMethods();
-        try (java.io.InputStream is = file.openInputStream();
-             java.util.Scanner scanner = new java.util.Scanner(is).useDelimiter("\\A")) {
-            String content = scanner.hasNext() ? scanner.next() : "";
-            result.hasGetterId = content.contains("public Long getId()");
-            result.hasSetterId = content.contains("public void setId(Long id)");
-            result.hasGetterSourceObject = content.contains("public ") && content.contains(" getSourceObject()");
-            result.hasSetterSourceObject = content.contains("public void setSourceObject");
-            result.hasGetterTargetId = content.contains("public Long getTargetId()");
-            result.hasSetterTargetId = content.contains("public void setTargetId(Long targetId)");
-            result.hasGetterTargetType = content.contains("public String getTargetType()");
-            result.hasSetterTargetType = content.contains("public void setTargetType(String targetType)");
-            result.hasConstructor = content.contains("public ") && content.contains("() {");
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        InputStream is = file.openInputStream();
+        Scanner scanner = new java.util.Scanner(is).useDelimiter("\\A");
+        String content = scanner.hasNext() ? scanner.next() : "";
+        result.hasGetterId = content.contains("public Long getId()");
+        result.hasSetterId = content.contains("public void setId(Long id)");
+        result.hasGetterSourceObject = content.contains("public ") && content.contains(" getSourceObject()");
+        result.hasSetterSourceObject = content.contains("public void setSourceObject");
+        result.hasGetterTargetId = content.contains("public Long getTargetId()");
+        result.hasSetterTargetId = content.contains("public void setTargetId(Long targetId)");
+        result.hasGetterTargetType = content.contains("public String getTargetType()");
+        result.hasSetterTargetType = content.contains("public void setTargetType(String targetType)");
+        result.hasConstructor = content.contains("public ") && content.contains("() {");
         return result;
     }
 
     private static class RelationClassMethods {
+
         boolean hasGetterId = false;
         boolean hasSetterId = false;
         boolean hasGetterSourceObject = false;
@@ -110,4 +112,4 @@ private static class RelationClassMethods {
         boolean hasSetterTargetType = false;
         boolean hasConstructor = false;
     }
-    }
+}