code cleanup

src/main/java/org/codelibs/fess/app/web/admin/AdminAction.java

@@ -334,59 +334,86 @@ public class AdminAction extends FessAdminAction {
         }
         if (user.hasRoles(getActionRoles(AdminWebconfigAction.ROLE))) {
             return AdminWebconfigAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminFileconfigAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminFileconfigAction.ROLE))) {
             return AdminFileconfigAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminDataconfigAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminDataconfigAction.ROLE))) {
             return AdminDataconfigAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminLabeltypeAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminLabeltypeAction.ROLE))) {
             return AdminLabeltypeAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminKeymatchAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminKeymatchAction.ROLE))) {
             return AdminKeymatchAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminBoostdocAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminBoostdocAction.ROLE))) {
             return AdminBoostdocAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminRelatedcontentAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminRelatedcontentAction.ROLE))) {
             return AdminRelatedcontentAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminRelatedqueryAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminRelatedqueryAction.ROLE))) {
             return AdminRelatedqueryAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminPathmapAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminPathmapAction.ROLE))) {
             return AdminPathmapAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminWebauthAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminWebauthAction.ROLE))) {
             return AdminWebauthAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminFileauthAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminFileauthAction.ROLE))) {
             return AdminFileauthAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminReqheaderAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminReqheaderAction.ROLE))) {
             return AdminReqheaderAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminDuplicatehostAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminDuplicatehostAction.ROLE))) {
             return AdminDuplicatehostAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminUserAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminUserAction.ROLE))) {
             return AdminUserAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminRoleAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminRoleAction.ROLE))) {
             return AdminRoleAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminGroupAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminGroupAction.ROLE))) {
             return AdminGroupAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminSuggestAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminSuggestAction.ROLE))) {
             return AdminSuggestAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminElevatewordAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminElevatewordAction.ROLE))) {
             return AdminElevatewordAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminBadwordAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminBadwordAction.ROLE))) {
             return AdminBadwordAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminSysteminfoAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminSysteminfoAction.ROLE))) {
             return AdminSysteminfoAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminSearchlogAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminSearchlogAction.ROLE))) {
             return AdminSearchlogAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminJoblogAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminJoblogAction.ROLE))) {
             return AdminJoblogAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminCrawlinginfoAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminCrawlinginfoAction.ROLE))) {
             return AdminCrawlinginfoAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminLogAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminLogAction.ROLE))) {
             return AdminLogAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminFailureurlAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminFailureurlAction.ROLE))) {
             return AdminFailureurlAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminBackupAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminBackupAction.ROLE))) {
             return AdminBackupAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminMaintenanceAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminMaintenanceAction.ROLE))) {
             return AdminMaintenanceAction.class;
-        } else if (user.hasRoles(getActionRoles(AdminEsreqAction.ROLE))) {
+        }
+        if (user.hasRoles(getActionRoles(AdminEsreqAction.ROLE))) {
             return AdminEsreqAction.class;
         }
         return null;

src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java

@@ -530,7 +530,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'errors.front_header' with parameters.
      * <pre>
-     * message: 
+     * message:
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)
@@ -544,7 +544,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'errors.front_footer' with parameters.
      * <pre>
-     * message: 
+     * message:
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)

src/main/java/org/codelibs/fess/query/PrefixQueryCommand.java

@@ -85,7 +85,7 @@ public class PrefixQueryCommand extends QueryCommand {
         return value;
     }
 
-    public void setLowercaseWildcard(boolean lowercaseWildcard) {
+    public void setLowercaseWildcard(final boolean lowercaseWildcard) {
         this.lowercaseWildcard = lowercaseWildcard;
     }
 }

src/main/java/org/codelibs/fess/query/WildcardQueryCommand.java

@@ -78,7 +78,7 @@ public class WildcardQueryCommand extends QueryCommand {
         return value;
     }
 
-    public void setLowercaseWildcard(boolean lowercaseWildcard) {
+    public void setLowercaseWildcard(final boolean lowercaseWildcard) {
         this.lowercaseWildcard = lowercaseWildcard;
     }
 }

src/main/java/org/codelibs/fess/sso/spnego/SpnegoAuthenticator.java

@@ -218,11 +218,14 @@ public class SpnegoAuthenticator implements SsoAuthenticator {
             }
             if (SpnegoHttpFilter.Constants.PROMPT_NTLM.equals(name)) {
                 return getProperty(SPNEGO_PROMPT_NTLM, "true");
-            } else if (SpnegoHttpFilter.Constants.ALLOW_LOCALHOST.equals(name)) {
+            }
+            if (SpnegoHttpFilter.Constants.ALLOW_LOCALHOST.equals(name)) {
                 return getProperty(SPNEGO_ALLOW_LOCALHOST, "true");
-            } else if (SpnegoHttpFilter.Constants.ALLOW_DELEGATION.equals(name)) {
+            }
+            if (SpnegoHttpFilter.Constants.ALLOW_DELEGATION.equals(name)) {
                 return getProperty(SPNEGO_ALLOW_DELEGATION, "false");
-            } else if (SpnegoHttpFilter.Constants.EXCLUDE_DIRS.equals(name)) {
+            }
+            if (SpnegoHttpFilter.Constants.EXCLUDE_DIRS.equals(name)) {
                 return getProperty(SPNEGO_EXCLUDE_DIRS, StringUtil.EMPTY);
             }
             return null;

src/test/java/org/codelibs/fess/dict/kuromoji/KuromojiFileTest.java

@@ -28,7 +28,7 @@ public class KuromojiFileTest extends UnitFessTestCase {
     /*
     // TODO
     private File file1;
-    
+
     @Override
     protected void setUp() throws Exception {
         file1 = File.createTempFile("kuromoji_", ".txt");
@@ -37,7 +37,7 @@ public class KuromojiFileTest extends UnitFessTestCase {
                 "token1,seg1,reading1,pos1\ntoken2,seg2,reading2,pos2\ntoken3,seg3,reading3,pos3"
                         .getBytes(Constants.UTF_8));
     }
-    
+
     @Override
     protected void tearDown() throws Exception {
         file1.delete();
@@ -92,7 +92,7 @@ public class KuromojiFileTest extends UnitFessTestCase {
         final PagingList<KuromojiItem> itemList1 = kuromojiFile.selectList(0,
                 20);
         assertEquals(3, itemList1.size());
-    
+
         final KuromojiItem kuromojiItem1 = new KuromojiItem(0, "token4",
                 "seg4", "reading4", "pos4");
         kuromojiFile.insert(kuromojiItem1);
@@ -103,7 +103,7 @@ public class KuromojiFileTest extends UnitFessTestCase {
         assertEquals("seg4", itemList2.get(3).getSegmentation());
         assertEquals("reading4", itemList2.get(3).getReading());
         assertEquals("pos4", itemList2.get(3).getPos());
-    
+
         final KuromojiItem kuromojiItem2 = new KuromojiItem(0, "token5",
                 "seg5", "reading5", "pos5");
         kuromojiFile.insert(kuromojiItem2);
@@ -115,13 +115,13 @@ public class KuromojiFileTest extends UnitFessTestCase {
         assertEquals("reading5", itemList3.get(4).getReading());
         assertEquals("pos5", itemList3.get(4).getPos());
     }
-    
+
     public void test_update() {
         final KuromojiFile kuromojiFile = new KuromojiFile(file1);
         final PagingList<KuromojiItem> itemList1 = kuromojiFile.selectList(0,
                 20);
         assertEquals(3, itemList1.size());
-    
+
         final KuromojiItem kuromojiItem1 = itemList1.get(0);
         kuromojiItem1.setNewToken("TOKEN1");
         kuromojiItem1.setNewSegmentation("SEG1");
@@ -137,7 +137,7 @@ public class KuromojiFileTest extends UnitFessTestCase {
         assertEquals("READING1", kuromojiItem2.getReading());
         assertEquals("POS1", kuromojiItem2.getPos());
         assertFalse(kuromojiItem2.isUpdated());
-    
+
         final KuromojiItem kuromojiItem3 = itemList2.get(2);
         kuromojiItem3.setNewToken("TOKEN3");
         kuromojiItem3.setNewSegmentation("SEG3");
@@ -154,28 +154,28 @@ public class KuromojiFileTest extends UnitFessTestCase {
         assertEquals("POS3", kuromojiItem4.getPos());
         assertFalse(kuromojiItem4.isUpdated());
     }
-    
+
     public void test_delete() throws Exception {
         final KuromojiFile kuromojiFile = new KuromojiFile(file1);
         final PagingList<KuromojiItem> itemList1 = kuromojiFile.selectList(0,
                 20);
         assertEquals(3, itemList1.size());
-    
+
         final KuromojiItem kuromojiItem1 = itemList1.get(0);
         kuromojiFile.delete(kuromojiItem1);
         final PagingList<KuromojiItem> itemList2 = kuromojiFile.selectList(0,
                 20);
         assertEquals(2, itemList2.size());
-    
+
         final KuromojiItem kuromojiItem2 = itemList2.get(1);
         kuromojiFile.delete(kuromojiItem2);
         final PagingList<KuromojiItem> itemList3 = kuromojiFile.selectList(0,
                 20);
         assertEquals(1, itemList3.size());
-    
+
         assertEquals("token2,seg2,reading2,pos2" + Constants.LINE_SEPARATOR,
                 new String(FileUtil.getBytes(file1), Constants.UTF_8));
-    
+
     }
     */
 

src/test/java/org/codelibs/fess/dict/synonym/SynonymFileTest.java

@@ -38,7 +38,7 @@ public class SynonymFileTest extends UnitFessTestCase {
         // TODO set up elasticsearch and dictionaryManager
         synonymFile = new SynonymFile("1", file1.getAbsolutePath(), new Date());
     }
-    
+
     @Override
     public void tearDown() throws Exception {
         file1.delete();
@@ -120,7 +120,7 @@ public class SynonymFileTest extends UnitFessTestCase {
     public void test_insert() {
          final PagingList<SynonymItem> itemList1 = synonymFile.selectList(0, 20);
          assertEquals(5, itemList1.size());
-    
+
          final SynonymItem synonymItem1 = new SynonymItem(0, new String[] { "z1", "z2" }, new String[] { "Z1", "Z2" });
          synonymFile.insert(synonymItem1);
          final PagingList<SynonymItem> itemList2 = synonymFile.selectList(0, 20);
@@ -129,7 +129,7 @@ public class SynonymFileTest extends UnitFessTestCase {
          assertEquals("z2", itemList2.get(5).getInputs()[1]);
          assertEquals("Z1", itemList2.get(5).getOutputs()[0]);
          assertEquals("Z2", itemList2.get(5).getOutputs()[1]);
-    
+
          final SynonymItem synonymItem2 = new SynonymItem(0, new String[] {"z1", "z2" }, new String[] { "z1", "z2" });
          synonymFile.insert(synonymItem2);
          final PagingList<SynonymItem> itemList3 = synonymFile.selectList(0, 20);
@@ -139,12 +139,12 @@ public class SynonymFileTest extends UnitFessTestCase {
          assertEquals("z1", itemList3.get(6).getOutputs()[0]);
          assertEquals("z2", itemList3.get(6).getOutputs()[1]);
      }
-    
+
      public void test_update() {
          final SynonymFile synonymFile = new SynonymFile(file1);
          final PagingList<SynonymItem> itemList1 = synonymFile.selectList(0, 20);
          assertEquals(5, itemList1.size());
-    
+
          final SynonymItem synonymItem1 = itemList1.get(0);
          synonymItem1.setNewInputs(new String[] { "a1", "a2" });
          synonymItem1.setNewOutputs(new String[] { "A1", "A2" });
@@ -159,7 +159,7 @@ public class SynonymFileTest extends UnitFessTestCase {
          assertEquals("A1", synonymItem2.getOutputs()[0]);
          assertEquals("A2", synonymItem2.getOutputs()[1]);
          assertFalse(synonymItem2.isUpdated());
-    
+
          final SynonymItem synonymItem3 = itemList2.get(2);
          synonymItem3.setNewInputs(new String[] { "c1", "c2" });
          synonymItem3.setNewOutputs(new String[] { "c1", "c2" });
@@ -175,22 +175,22 @@ public class SynonymFileTest extends UnitFessTestCase {
          assertEquals("c2", synonymItem4.getOutputs()[1]);
          assertFalse(synonymItem2.isUpdated());
      }
-    
+
      public void test_delete() throws Exception {
          final SynonymFile synonymFile = new SynonymFile(file1);
          final PagingList<SynonymItem> itemList1 = synonymFile.selectList(0, 20);
          assertEquals(5, itemList1.size());
-    
+
          final SynonymItem synonymItem1 = itemList1.get(0);
          synonymFile.delete(synonymItem1);
          final PagingList<SynonymItem> itemList2 = synonymFile.selectList(0, 20);
          assertEquals(4, itemList2.size());
-    
+
          final SynonymItem synonymItem2 = itemList2.get(3);
          synonymFile.delete(synonymItem2);
          final PagingList<SynonymItem> itemList3 = synonymFile.selectList(0, 20);
          assertEquals(3, itemList3.size());
-    
+
          assertEquals(
                  "b1,b2=>B1" + Constants.LINE_SEPARATOR + "c1=>C1,C2"
                          + Constants.LINE_SEPARATOR + "X1,x1"

src/test/java/org/codelibs/fess/mylasta/FessLastaDocTest.java

@@ -28,7 +28,7 @@ public class FessLastaDocTest extends UnitFessTestCase {
         // ## Arrange ##
         String appWebPkg = ".app.web.";
         String actionSuffix = "Action";
-    
+
         // ## Act ##
         policeStoryOfJavaClassChase((srcFile, clazz) -> {
             if (clazz.isInterface() || Modifier.isAbstract(clazz.getModifiers())) { // e.g. BaseAction