Browse Source

[192-webreport] renamed package reportingV2 to reporting2

Evgeni 4 years ago
parent
commit
df37fd6b8b

+ 4 - 4
jplag/src/main/java/de/jplag/reportingV2/JsonReport.java → jplag/src/main/java/de/jplag/reporting2/JsonReport.java

@@ -1,12 +1,12 @@
-package de.jplag.reportingV2;
+package de.jplag.reporting2;
 
 import java.io.File;
 import java.util.List;
 
 import de.jplag.JPlagResult;
-import de.jplag.reportingV2.jsonfactory.JsonFactory;
-import de.jplag.reportingV2.reportobject.ReportObjectFactory;
-import de.jplag.reportingV2.reportobject.model.JPlagReport;
+import de.jplag.reporting2.jsonfactory.JsonFactory;
+import de.jplag.reporting2.reportobject.ReportObjectFactory;
+import de.jplag.reporting2.reportobject.model.JPlagReport;
 
 // ReportImplementation -> JsonReport
 

+ 1 - 1
jplag/src/main/java/de/jplag/reportingV2/Report.java → jplag/src/main/java/de/jplag/reporting2/Report.java

@@ -1,4 +1,4 @@
-package de.jplag.reportingV2;
+package de.jplag.reporting2;
 
 import java.util.List;
 

+ 3 - 3
jplag/src/main/java/de/jplag/reportingV2/jsonfactory/JsonFactory.java → jplag/src/main/java/de/jplag/reporting2/jsonfactory/JsonFactory.java

@@ -1,4 +1,4 @@
-package de.jplag.reportingV2.jsonfactory;
+package de.jplag.reporting2.jsonfactory;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -8,8 +8,8 @@ import java.util.List;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import de.jplag.reportingV2.reportobject.model.ComparisonReport;
-import de.jplag.reportingV2.reportobject.model.JPlagReport;
+import de.jplag.reporting2.reportobject.model.ComparisonReport;
+import de.jplag.reporting2.reportobject.model.JPlagReport;
 
 /**
  * Factory class, responsible for creating Json strings and writing them to files.

+ 3 - 3
jplag/src/main/java/de/jplag/reportingV2/reportobject/ReportObjectFactory.java → jplag/src/main/java/de/jplag/reporting2/reportobject/ReportObjectFactory.java

@@ -1,4 +1,4 @@
-package de.jplag.reportingV2.reportobject;
+package de.jplag.reporting2.reportobject;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -10,8 +10,8 @@ import java.util.stream.Collectors;
 
 import de.jplag.*;
 import de.jplag.options.JPlagOptions;
-import de.jplag.reportingV2.reportobject.model.*;
-import de.jplag.reportingV2.reportobject.model.Match;
+import de.jplag.reporting2.reportobject.model.*;
+import de.jplag.reporting2.reportobject.model.Match;
 
 /**
  * Factory class, responsible for converting a JPlagResult object to Overview and Comparison DTO classes.

+ 3 - 3
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/Cluster.java → jplag/src/main/java/de/jplag/reporting2/reportobject/model/Cluster.java

@@ -1,9 +1,9 @@
-package de.jplag.reportingV2.reportobject.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
+package de.jplag.reporting2.reportobject.model;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class Cluster {
 
     @JsonProperty("average_similarity")

+ 4 - 4
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/ComparisonReport.java → jplag/src/main/java/de/jplag/reporting2/reportobject/model/ComparisonReport.java

@@ -1,9 +1,9 @@
-package de.jplag.reportingV2.reportobject.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
+package de.jplag.reporting2.reportobject.model;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class ComparisonReport {
 
     @JsonProperty("first_submission_id")
@@ -25,7 +25,7 @@ public class ComparisonReport {
     private final List<Match> matches;
 
     public ComparisonReport(String firstSubmissionId, String secondSubmissionId, float matchPercentage,
-                            List<FilesOfSubmission> filesOfFirstSubmission, List<FilesOfSubmission> filesOfSecondSubmission, List<Match> matches) {
+            List<FilesOfSubmission> filesOfFirstSubmission, List<FilesOfSubmission> filesOfSecondSubmission, List<Match> matches) {
 
         this.firstSubmissionId = firstSubmissionId;
         this.secondSubmissionId = secondSubmissionId;

+ 3 - 3
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/FilesOfSubmission.java → jplag/src/main/java/de/jplag/reporting2/reportobject/model/FilesOfSubmission.java

@@ -1,9 +1,9 @@
-package de.jplag.reportingV2.reportobject.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
+package de.jplag.reporting2.reportobject.model;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class FilesOfSubmission {
 
     @JsonProperty("file_name")

+ 1 - 1
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/JPlagReport.java → jplag/src/main/java/de/jplag/reporting2/reportobject/model/JPlagReport.java

@@ -1,4 +1,4 @@
-package de.jplag.reportingV2.reportobject.model;
+package de.jplag.reporting2.reportobject.model;
 
 import java.util.List;
 

+ 2 - 3
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/Match.java → jplag/src/main/java/de/jplag/reporting2/reportobject/model/Match.java

@@ -1,4 +1,4 @@
-package de.jplag.reportingV2.reportobject.model;
+package de.jplag.reporting2.reportobject.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -25,8 +25,7 @@ public class Match {
     @JsonProperty("tokens")
     private final int tokens;
 
-    public Match(String firstFileName, String secondFileName, int startInFirst, int endInFirst, int startInSecond, int endInSecond,
-                 int tokens) {
+    public Match(String firstFileName, String secondFileName, int startInFirst, int endInFirst, int startInSecond, int endInSecond, int tokens) {
         this.firstFileName = firstFileName;
         this.secondFileName = secondFileName;
         this.startInFirst = startInFirst;

+ 3 - 3
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/Metric.java → jplag/src/main/java/de/jplag/reporting2/reportobject/model/Metric.java

@@ -1,9 +1,9 @@
-package de.jplag.reportingV2.reportobject.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
+package de.jplag.reporting2.reportobject.model;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class Metric {
 
     @JsonProperty("name")

+ 3 - 3
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/OverviewReport.java → jplag/src/main/java/de/jplag/reporting2/reportobject/model/OverviewReport.java

@@ -1,10 +1,10 @@
-package de.jplag.reportingV2.reportobject.model;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
+package de.jplag.reporting2.reportobject.model;
 
 import java.util.List;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class OverviewReport {
 
     @JsonProperty("submission_folder_path")

+ 1 - 1
jplag/src/main/java/de/jplag/reportingV2/reportobject/model/TopComparison.java → jplag/src/main/java/de/jplag/reporting2/reportobject/model/TopComparison.java

@@ -1,4 +1,4 @@
-package de.jplag.reportingV2.reportobject.model;
+package de.jplag.reporting2.reportobject.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;