Merge pull request #1034 from dddjava/agent/log-index-html

実行ログにindex.htmlを出力する

Author: irof

jig-cli/src/main/java/org/dddjava/jig/cli/CliRunner.java

@@ -2,6 +2,7 @@
 
 import org.dddjava.jig.HandleResult;
 import org.dddjava.jig.JigExecutor;
+import org.dddjava.jig.JigResult;
 import org.dddjava.jig.domain.model.sources.filesystem.SourceBasePaths;
 import org.dddjava.jig.infrastructure.configuration.Configuration;
 import org.slf4j.Logger;
@@ -33,12 +34,17 @@ void run() {
         long startTime = System.currentTimeMillis();
         SourceBasePaths sourceBasePaths = cliConfig.rawSourceLocations();
 
-        List<HandleResult> handleResultList = JigExecutor.standard(configuration, sourceBasePaths).listResult();
+        JigResult jigResult = JigExecutor.standard(configuration, sourceBasePaths);
+        List<HandleResult> handleResultList = jigResult.listResult();
 
         String resultLog = handleResultList.stream()
                 .filter(HandleResult::success)
                 .map(handleResult -> handleResult.jigDocument() + " : " + handleResult.outputFilePathsText())
                 .collect(joining("\n"));
+        if (!resultLog.isBlank()) {
+            resultLog += "\n";
+        }
+        resultLog += "index : [ " + jigResult.indexFilePath() + " ]";
         logger.info("-- Output Complete {} ms -------------------------------------------\n{}\n------------------------------------------------------------",
                 System.currentTimeMillis() - startTime,
                 resultLog);

jig-core/src/main/java/org/dddjava/jig/JigResult.java

@@ -10,6 +10,8 @@ public interface JigResult {
 
     JigSummary summary();
 
+    java.nio.file.Path indexFilePath();
+
     /**
      * 集計
      */
@@ -25,4 +27,3 @@ public static JigSummary empty() {
         }
     }
 }
-

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

@@ -77,7 +77,7 @@ public JigResult generate(JigRepository jigRepository) {
 
         generateIndex(handleResults);
         generateAssets();
-        return new JigResultData(handleResults);
+        return new JigResultData(handleResults, IndexView.indexFilePath(outputDirectory));
     }
 
     private void prepareOutputDirectory() {

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

@@ -3,11 +3,12 @@
 import org.dddjava.jig.HandleResult;
 import org.dddjava.jig.JigResult;
 
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 
-record JigResultData(Collection<HandleResult> handleResults) implements JigResult {
+record JigResultData(Collection<HandleResult> handleResults, Path indexFilePath) implements JigResult {
 
     @Override
     public List<HandleResult> listResult() {
@@ -20,4 +21,9 @@ public List<HandleResult> listResult() {
     public JigSummary summary() {
         throw new UnsupportedOperationException();
     }
+
+    @Override
+    public Path indexFilePath() {
+        return indexFilePath;
+    }
 }

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

@@ -15,6 +15,7 @@
 import java.util.*;
 
 public class IndexView {
+    static final String INDEX_FILE_NAME = "index.html";
 
     private final Map<String, Object> contextMap;
     private final TemplateEngine templateEngine;
@@ -53,7 +54,7 @@ private void write(Path outputDirectory) {
         contextMap.put("jigVersion", resolveJigVersion());
         contextMap.put("timestamp", ZonedDateTime.now().truncatedTo(ChronoUnit.SECONDS));
 
-        Path outputFilePath = outputDirectory.resolve("index.html");
+        Path outputFilePath = indexFilePath(outputDirectory);
         try (OutputStream out = Files.newOutputStream(outputFilePath);
              OutputStream outputStream = new BufferedOutputStream(out);
              Writer writer = new java.io.OutputStreamWriter(outputStream, StandardCharsets.UTF_8)
@@ -64,6 +65,10 @@ private void write(Path outputDirectory) {
         }
     }
 
+    public static Path indexFilePath(Path outputDirectory) {
+        return outputDirectory.resolve(INDEX_FILE_NAME);
+    }
+
     class DiagramComponent {
         JigDocument jigDocument;
         List<String> srcList;

jig-gradle-plugin/src/main/java/org/dddjava/jig/gradle/JigReportsTask.java

@@ -2,6 +2,7 @@
 
 import org.dddjava.jig.HandleResult;
 import org.dddjava.jig.JigExecutor;
+import org.dddjava.jig.JigResult;
 import org.dddjava.jig.domain.model.sources.filesystem.SourceBasePaths;
 import org.dddjava.jig.infrastructure.configuration.Configuration;
 import org.gradle.api.DefaultTask;
@@ -30,12 +31,17 @@ void outputReports() {
         long startTime = System.currentTimeMillis();
         SourceBasePaths sourceBasePaths = new GradleProject(project).rawSourceLocations();
 
-        List<HandleResult> handleResultList = JigExecutor.standard(configuration, sourceBasePaths).listResult();
+        JigResult jigResult = JigExecutor.standard(configuration, sourceBasePaths);
+        List<HandleResult> handleResultList = jigResult.listResult();
 
         String resultLog = handleResultList.stream()
                 .filter(HandleResult::success)
                 .map(handleResult -> handleResult.jigDocument() + " : " + handleResult.outputFilePathsText())
                 .collect(joining("\n"));
+        if (!resultLog.isBlank()) {
+            resultLog += "\n";
+        }
+        resultLog += "index : [ " + jigResult.indexFilePath() + " ]";
         getLogger().info("-- Output Complete {} ms -------------------------------------------\n{}\n------------------------------------------------------------",
                 System.currentTimeMillis() - startTime, resultLog);
     }