Merge pull request git-commit-id#553 from matteobaccan/master

Reduced code smell
TheSnoozer · Apr 23, 2021 · 4a1ac8f · 4a1ac8f
2 parents 5130b38 + 5872540
commit 4a1ac8f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/core/src/main/java/pl/project13/core/jgit/JGitCommon.java b/core/src/main/java/pl/project13/core/jgit/JGitCommon.java
@@ -341,13 +341,11 @@ public static boolean isRepositoryInDirtyState(Repository repo) throws GitAPIExc
     // repo is dirty. JGit does this, so we cannot use the isClean method
     // to get the same behaviour. Instead check dirty state without
     // status.getUntracked().isEmpty()
-    boolean isDirty = !(status.getAdded().isEmpty()
+    return !(status.getAdded().isEmpty()
         && status.getChanged().isEmpty()
         && status.getRemoved().isEmpty()
         && status.getMissing().isEmpty()
         && status.getModified().isEmpty()
         && status.getConflicting().isEmpty());
-
-    return isDirty;
   }
 }
diff --git a/core/src/main/java/pl/project13/core/log/FormattingTuple.java b/core/src/main/java/pl/project13/core/log/FormattingTuple.java
@@ -49,7 +49,7 @@
  */
 public class FormattingTuple {
 
-  public static FormattingTuple NULL = new FormattingTuple(null);
+  public static final FormattingTuple NULL = new FormattingTuple(null);
 
   private String message;
   private Throwable throwable;

diff --git a/core/src/main/java/pl/project13/core/log/MessageFormatter.java b/core/src/main/java/pl/project13/core/log/MessageFormatter.java
@@ -261,19 +261,11 @@ static boolean isEscapedDelimeter(String messagePattern, int delimeterStartIndex
       return false;
     }
     char potentialEscape = messagePattern.charAt(delimeterStartIndex - 1);
-    if (potentialEscape == ESCAPE_CHAR) {
-      return true;
-    } else {
-      return false;
-    }
+    return (potentialEscape == ESCAPE_CHAR);
   }
 
   static boolean isDoubleEscaped(String messagePattern, int delimeterStartIndex) {
-    if (delimeterStartIndex >= 2 && messagePattern.charAt(delimeterStartIndex - 2) == ESCAPE_CHAR) {
-      return true;
-    } else {
-      return false;
-    }
+    return (delimeterStartIndex >= 2 && messagePattern.charAt(delimeterStartIndex - 2) == ESCAPE_CHAR);
   }
 
   // special treatment of array values was suggested by 'lizongbo'