Merge pull request #162 from nulab/fix-sonarcloud-maintainability-3

fix: fix sonarcloud maintainability phase 3

src/main/java/com/nulabinc/zxcvbn/Pattern.java

@@ -1,19 +1,13 @@
 package com.nulabinc.zxcvbn;
 
+@SuppressWarnings("java:S115")
 public enum Pattern {
-  @SuppressWarnings("java:S115")
   Bruteforce("bruteforce"),
-  @SuppressWarnings("java:S115")
   Dictionary("dictionary"),
-  @SuppressWarnings("java:S115")
   Spatial("spatial"),
-  @SuppressWarnings("java:S115")
   Repeat("repeat"),
-  @SuppressWarnings("java:S115")
   Sequence("sequence"),
-  @SuppressWarnings("java:S115")
   Regex("regex"),
-  @SuppressWarnings("java:S115")
   Date("date");
 
   private final String value;

src/main/java/com/nulabinc/zxcvbn/io/ClasspathResource.java

@@ -73,6 +73,7 @@ private InputStream getResourceAsStreamWithFallback(String path) {
     return null;
   }
 
+  @SuppressWarnings("java:S1181")
   private InputStream getResourceAsStream(ClassLoader cl, String path) {
     try {
       if (cl != null) {

src/main/java/com/nulabinc/zxcvbn/matchers/Keyboard.java

@@ -85,7 +85,7 @@ public boolean match(final char c) {
 
     private final String layout;
 
-    public AdjacentGraphBuilder(final String layout) {
+    protected AdjacentGraphBuilder(final String layout) {
       this.layout = layout;
     }
 

src/main/java/com/nulabinc/zxcvbn/matchers/KeyboardLoader.java

@@ -12,7 +12,7 @@ public abstract class KeyboardLoader {
 
   private final Resource resource;
 
-  public KeyboardLoader(final String name, final Resource resource) {
+  protected KeyboardLoader(final String name, final Resource resource) {
     this.name = name;
     this.resource = resource;
   }

src/main/java/com/nulabinc/zxcvbn/matchers/L33tSubDict.java

@@ -10,30 +10,31 @@
 
 public class L33tSubDict implements Iterable<Map<Character, Character>> {
 
-  private final List<Map<Character, Character>> subDicts;
+  private final List<Map<Character, Character>> l33tSubDictionaries;
 
   L33tSubDict(Map<Character, List<Character>> table) {
-    this.subDicts = buildSubDicts(table);
+    this.l33tSubDictionaries = buildSubDictionaries(table);
   }
 
-  private List<Map<Character, Character>> buildSubDicts(
+  private List<Map<Character, Character>> buildSubDictionaries(
       final Map<Character, List<Character>> table) {
     final Set<List<String>> initialSubs = new LinkedHashSet<>();
     initialSubs.add(new ArrayList<String>());
-    final Set<List<String>> subs = helper(table, table.keySet().iterator(), initialSubs);
+    final Set<List<String>> allCombinations =
+        generateCombinationsRecursively(table, table.keySet().iterator(), initialSubs);
 
-    List<Map<Character, Character>> subDicts = new ArrayList<>();
-    for (List<String> sub : subs) {
-      Map<Character, Character> subDict = new HashMap<>();
-      for (CharSequence ref : sub) {
-        subDict.put(ref.charAt(0), ref.charAt(1));
+    List<Map<Character, Character>> subDictionaries = new ArrayList<>();
+    for (List<String> combination : allCombinations) {
+      Map<Character, Character> subDictionary = new HashMap<>();
+      for (CharSequence pair : combination) {
+        subDictionary.put(pair.charAt(0), pair.charAt(1));
       }
-      subDicts.add(subDict);
+      subDictionaries.add(subDictionary);
     }
-    return subDicts;
+    return subDictionaries;
   }
 
-  private Set<List<String>> helper(
+  private Set<List<String>> generateCombinationsRecursively(
       final Map<Character, List<Character>> table,
       final Iterator<Character> keysIterator,
       final Set<List<String>> subs) {
@@ -65,11 +66,11 @@ private Set<List<String>> helper(
       }
     }
 
-    return helper(table, keysIterator, nextSubs);
+    return generateCombinationsRecursively(table, keysIterator, nextSubs);
   }
 
   @Override
   public Iterator<Map<Character, Character>> iterator() {
-    return subDicts.iterator();
+    return l33tSubDictionaries.iterator();
   }
 }

src/main/java/com/nulabinc/zxcvbn/matchers/Match.java

@@ -35,8 +35,13 @@ public class Match {
   public final int month;
   public final int day;
 
+  @SuppressWarnings("java:S1104")
   public Double baseGuesses;
+
+  @SuppressWarnings("java:S1104")
   public Double guesses;
+
+  @SuppressWarnings("java:S1104")
   public Double guessesLog10;
 
   private Match(Builder builder) {

src/main/java/com/nulabinc/zxcvbn/matchers/MatchFactory.java

@@ -34,6 +34,7 @@ public static Match createReversedDictionaryMatch(
         .build();
   }
 
+  @SuppressWarnings("java:S107")
   public static Match createDictionaryL33tMatch(
       int i,
       int j,

src/test/java/com/nulabinc/zxcvbn/EdgeCaseTest.java

@@ -1,5 +1,7 @@
 package com.nulabinc.zxcvbn;
 
+import static org.junit.Assert.assertNotNull;
+
 import org.junit.Test;
 
 public class EdgeCaseTest {
@@ -16,25 +18,25 @@ public void testWindowsNewlineInDate() {
     buf.append((char) 10);
     buf.append((char) 13);
     buf.append("0101");
-    new Zxcvbn().measure(buf.toString());
+    assertNotNull(new Zxcvbn().measure(buf.toString()));
   }
 
   @Test
   public void testUnixNewlineInDate() {
     StringBuilder buf = new StringBuilder("PW2001");
     buf.append((char) 13);
     buf.append("0101");
-    new Zxcvbn().measure(buf.toString());
+    assertNotNull(new Zxcvbn().measure(buf.toString()));
   }
 
   @Test
   public void testSpaceAfterDate() {
-    new Zxcvbn().measure("PW2009 ");
+    assertNotNull(new Zxcvbn().measure("PW2009 "));
   }
 
   /** Try to reproduce GitHub issue #34 */
   @Test
   public void testJustFourDigitNumber() {
-    new Zxcvbn().measure("8604 ");
+    assertNotNull(new Zxcvbn().measure("8604 "));
   }
 }

src/test/java/com/nulabinc/zxcvbn/MatchingTest.java

@@ -308,7 +308,7 @@ public SequenceMatchingSimpleTest(String password) {
     public void testSequenceMatching() throws Exception {
       Context context = StandardContext.build();
       String msg = String.format("doesn't match length-%s sequences", password.length());
-      assertEquals(msg, new SequenceMatcher(context).execute(password).size(), 0);
+      assertEquals(msg, 0, new SequenceMatcher(context).execute(password).size());
     }
 
     @Parameterized.Parameters(name = "{0}")

src/test/java/com/nulabinc/zxcvbn/WipeableStringTest.java

@@ -1,6 +1,7 @@
 package com.nulabinc.zxcvbn;
 
 import static junit.framework.TestCase.*;
+import static org.junit.Assert.assertNotEquals;
 
 import java.nio.CharBuffer;
 import org.junit.Test;
@@ -14,8 +15,8 @@ public void testHashCode() {
 
   @Test
   public void testEquals() {
-    assertTrue(new WipeableString("hello").equals("hello"));
-    assertFalse(new WipeableString("goodbye").equals("hello"));
+    assertEquals("hello", new WipeableString("hello").toString());
+    assertNotEquals("hello", new WipeableString("goodbye").toString());
   }
 
   @Test