|
|
@@ -27,10 +27,10 @@ import de.jplag.Language;
|
|
|
import de.jplag.Submission;
|
|
|
import de.jplag.reporting.jsonfactory.ComparisonReportWriter;
|
|
|
import de.jplag.reporting.jsonfactory.ToDiskWriter;
|
|
|
-import de.jplag.reporting.reportobject.mapper.ClusteringResultMapper;
|
|
|
import de.jplag.reporting.reportobject.mapper.MetricMapper;
|
|
|
import de.jplag.reporting.reportobject.model.Metric;
|
|
|
import de.jplag.reporting.reportobject.model.OverviewReport;
|
|
|
+import de.jplag.reporting.reportobject.model.Version;
|
|
|
|
|
|
/**
|
|
|
* Factory class, responsible for converting a JPlagResult object to Overview and Comparison DTO classes and writing it
|
|
|
@@ -42,6 +42,9 @@ public class ReportObjectFactory {
|
|
|
private static final ToDiskWriter fileWriter = new ToDiskWriter();
|
|
|
public static final String OVERVIEW_FILE_NAME = "overview.json";
|
|
|
public static final String SUBMISSIONS_FOLDER = "submissions";
|
|
|
+
|
|
|
+ // TODO: This shall be moved to a better visible and upgradable position. Shall be fixed in a future version.
|
|
|
+ public static final Version REPORT_VIEWER_VERSION = new Version(4, 0, 0);
|
|
|
private Map<String, String> submissionNameToIdMap;
|
|
|
private Function<Submission, String> submissionToIdFunction;
|
|
|
private Map<String, Map<String, String>> submissionNameToNameToComparisonFileName;
|
|
|
@@ -139,9 +142,8 @@ public class ReportObjectFactory {
|
|
|
folders.addAll(result.getOptions().oldSubmissionDirectories());
|
|
|
|
|
|
String baseCodePath = result.getOptions().hasBaseCode() ? result.getOptions().baseCodeSubmissionDirectory().getName() : "";
|
|
|
- ClusteringResultMapper clusteringResultMapper = new ClusteringResultMapper(submissionToIdFunction);
|
|
|
|
|
|
- OverviewReport overviewReport = new OverviewReport(folders.stream().map(File::getPath).toList(), // submissionFolderPath
|
|
|
+ OverviewReport overviewReport = new OverviewReport(REPORT_VIEWER_VERSION, folders.stream().map(File::getPath).toList(), // submissionFolderPath
|
|
|
baseCodePath, // baseCodeFolderPath
|
|
|
result.getOptions().language().getName(), // language
|
|
|
result.getOptions().fileSuffixes(), // fileExtensions
|
|
|
@@ -153,7 +155,7 @@ public class ReportObjectFactory {
|
|
|
getDate(),// dateOfExecution
|
|
|
result.getDuration(), // executionTime
|
|
|
getMetrics(result),// metrics
|
|
|
- clusteringResultMapper.map(result)); // clusters
|
|
|
+ List.of()); // clusters (deactivated for now)
|
|
|
|
|
|
fileWriter.saveAsJSON(overviewReport, path, OVERVIEW_FILE_NAME);
|
|
|
|