型パラメータを削除し型キャストで対応

convertMethodResultToAdapterModelの存在意義がキャストだけになっていたのでやめてみる

Author: irof

jig-core/src/main/java/org/dddjava/jig/adapter/Adapter.java

@@ -8,19 +8,8 @@
 /**
  * Adapterのインタフェース。
  * このインタフェースを実装したクラスの {@link HandleDocument} メソッドを呼び出してwriterに引き渡す。
- *
- * @param <T> writerが処理する型。通常はメソッドの戻り値もこの型になります。
  */
-public interface Adapter<T> {
+public interface Adapter {
 
-    /**
-     * Adapterの処理結果を書き出せる形に変換します。
-     * Adapterで実装されているハンドラメソッドの結果がすべてwriterが扱えるなら実装不要。
-     */
-    @SuppressWarnings("unchecked")
-    default T convertMethodResultToAdapterModel(Object resultModel) {
-        return (T) resultModel;
-    }
-
-    List<Path> write(T result, JigDocument jigDocument);
+    List<Path> write(Object result, JigDocument jigDocument);
 }

jig-core/src/main/java/org/dddjava/jig/adapter/CompositeAdapter.java

@@ -11,10 +11,10 @@
 
 public class CompositeAdapter {
 
-    EnumMap<JigDocument, Adapter<?>> adapterInstanceMap = new EnumMap<>(JigDocument.class);
+    EnumMap<JigDocument, Adapter> adapterInstanceMap = new EnumMap<>(JigDocument.class);
     EnumMap<JigDocument, MethodHandle> adapterMethodMap = new EnumMap<>(JigDocument.class);
 
-    public void register(Adapter<?> adapter) {
+    public void register(Adapter adapter) {
         try {
             var lookup = MethodHandles.lookup();
             for (var method : adapter.getClass().getMethods()) {
@@ -32,15 +32,13 @@ public void register(Adapter<?> adapter) {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    public <T> List<Path> invoke(JigDocument jigDocument, JigRepository jigRepository) {
-        Adapter<T> adapter = (Adapter<T>) adapterInstanceMap.get(jigDocument);
+    public List<Path> invoke(JigDocument jigDocument, JigRepository jigRepository) {
+        Adapter adapter = adapterInstanceMap.get(jigDocument);
         MethodHandle adapterMethod = adapterMethodMap.get(jigDocument);
 
         try {
             Object result = adapterMethod.invoke(adapter, jigRepository);
-            T model = adapter.convertMethodResultToAdapterModel(result);
-            return adapter.write(model, jigDocument);
+            return adapter.write(result, jigDocument);
         } catch (Throwable e) {
             throw new RuntimeException(e);
         }

jig-core/src/main/java/org/dddjava/jig/adapter/graphviz/DiagramAdapter.java

@@ -19,7 +19,7 @@
  * {@link HandleDocument} で指定されたドキュメントを出力する際に各メソッドが実行される。
  */
 @HandleDocument
-public class DiagramAdapter implements Adapter<DiagramSourceWriter> {
+public class DiagramAdapter implements Adapter {
 
     private final JigService jigService;
     private final GraphvizDiagramWriter graphvizDiagramWriter;
@@ -57,7 +57,7 @@ public DiagramSourceWriter serviceMethodCallHierarchy(JigRepository jigRepositor
     }
 
     @Override
-    public List<Path> write(DiagramSourceWriter result, JigDocument jigDocument) {
-        return graphvizDiagramWriter.write(result, jigDocument);
+    public List<Path> write(Object result, JigDocument jigDocument) {
+        return graphvizDiagramWriter.write((DiagramSourceWriter) result, jigDocument);
     }
 }

jig-core/src/main/java/org/dddjava/jig/adapter/poi/ListAdapter.java

@@ -35,7 +35,7 @@
 import static java.util.stream.Collectors.joining;
 
 @HandleDocument
-public class ListAdapter implements Adapter<ReportBook> {
+public class ListAdapter implements Adapter {
 
     /**
      * 一覧出力で複数要素を文字列連結する際のコレクター
@@ -228,7 +228,7 @@ private static String markIfTrue(boolean b) {
     }
 
     @Override
-    public List<Path> write(ReportBook result, JigDocument jigDocument) {
-        return result.writeXlsx(jigDocument, jigDocumentContext.outputDirectory());
+    public List<Path> write(Object result, JigDocument jigDocument) {
+        return ((ReportBook) result).writeXlsx(jigDocument, jigDocumentContext.outputDirectory());
     }
 }

jig-core/src/main/java/org/dddjava/jig/adapter/thymeleaf/InsightAdapter.java

@@ -18,7 +18,7 @@
 
 
 @HandleDocument
-public class InsightAdapter implements Adapter<Insights> {
+public class InsightAdapter implements Adapter {
 
     private final JigService jigService;
     private final TemplateEngine templateEngine;
@@ -36,7 +36,8 @@ public Insights invoke(JigRepository repository) {
     }
 
     @Override
-    public List<Path> write(Insights result, JigDocument jigDocument) {
+    public List<Path> write(Object object, JigDocument jigDocument) {
+        Insights result = (Insights) object;
         var jigDocumentWriter = new JigDocumentWriter(jigDocument, jigDocumentContext.outputDirectory());
 
         Map<String, Object> contextMap = Map.of(
@@ -50,7 +51,7 @@ public List<Path> write(Insights result, JigDocument jigDocument) {
         String template = jigDocumentWriter.jigDocument().fileName();
 
         jigDocumentWriter.writeTextAs(".html",
-            writer -> templateEngine.process(template, context, writer));
+                writer -> templateEngine.process(template, context, writer));
         return jigDocumentWriter.outputFilePaths();
     }
 }

jig-core/src/main/java/org/dddjava/jig/adapter/thymeleaf/RepositoryListAdapter.java

@@ -16,7 +16,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-public class RepositoryListAdapter implements Adapter<List<RepositoryListAdapter.OutputSummaryItem>> {
+public class RepositoryListAdapter implements Adapter {
     private final JigService jigService;
     private final TemplateEngine templateEngine;
     private final JigDocumentContext jigDocumentContext;
@@ -49,7 +49,7 @@ public List<OutputSummaryItem> invoke(JigRepository repository) {
     }
 
     @Override
-    public List<Path> write(List<RepositoryListAdapter.OutputSummaryItem> result, JigDocument jigDocument) {
+    public List<Path> write(Object result, JigDocument jigDocument) {
         var jigDocumentWriter = new JigDocumentWriter(jigDocument, jigDocumentContext.outputDirectory());
 
         Map<String, Object> contextMap = Map.of(

jig-core/src/main/java/org/dddjava/jig/adapter/thymeleaf/SummaryAdapter.java

@@ -17,7 +17,7 @@
 import java.util.Map;
 
 @HandleDocument
-public class SummaryAdapter implements Adapter<SummaryModel> {
+public class SummaryAdapter implements Adapter {
 
     private final JigService jigService;
     private final ThymeleafSummaryWriter thymeleafSummaryWriter;
@@ -62,7 +62,7 @@ public SummaryModel inputSummary(JigRepository jigRepository) {
     }
 
     @Override
-    public List<Path> write(SummaryModel result, JigDocument jigDocument) {
-        return thymeleafSummaryWriter.write(jigDocument, result);
+    public List<Path> write(Object result, JigDocument jigDocument) {
+        return thymeleafSummaryWriter.write(jigDocument, (SummaryModel) result);
     }
 }