implemented minor code suggestions

jplag · Aug 3, 2022 · 6d705b9 · 6d705b9
1 parent 8b2b9cc
commit 6d705b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/jplag/src/main/java/de/jplag/JPlagComparison.java b/jplag/src/main/java/de/jplag/JPlagComparison.java
@@ -40,10 +40,9 @@ public boolean equals(Object other) {
         if (other == this) {
             return true;
         }
-        if (!(other instanceof JPlagComparison)) {
+        if (!(other instanceof JPlagComparison otherComparison)) {
             return false;
         }
-        JPlagComparison otherComparison = (JPlagComparison) other;
         return firstSubmission.equals(otherComparison.getFirstSubmission()) && secondSubmission.equals(otherComparison.getSecondSubmission())
                 && matches.equals(otherComparison.matches);
     }

diff --git a/jplag/src/main/java/de/jplag/Submission.java b/jplag/src/main/java/de/jplag/Submission.java
@@ -83,10 +83,11 @@ public int compareTo(Submission other) {
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
-        } else if (!(obj instanceof Submission)) {
+        }
+        if (!(obj instanceof Submission otherSubmission)) {
             return false;
         }
-        return ((Submission) obj).getName().equals(name);
+        return otherSubmission.getName().equals(name);
     }
 
     @Override

diff --git a/jplag/src/main/java/de/jplag/SubmissionSetBuilder.java b/jplag/src/main/java/de/jplag/SubmissionSetBuilder.java
@@ -158,7 +158,7 @@ private Optional<Submission> loadBaseCode(Set<File> submissionDirectories, Set<F
                 logger.info("Submission \"{}\" is the specified basecode, it will be skipped during comparison.", removed.getName());
             }
         }
-        return Optional.of(baseCode);
+        return Optional.ofNullable(baseCode);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
                     logger.info("Submission \"{}\" is the specified basecode, it will be skipped during comparison.", removed.getName());
                 }
             }
-            return Optional.of(baseCode);
+            return Optional.ofNullable(baseCode);
         }
         /**
@@ Expand Down @@