#2848 Refactor code: reverted to an if statement.

codelibs · Oct 12, 2024 · 265bbda · 265bbda
1 parent 62d89fb
commit 265bbda
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 154 deletions.
diff --git a/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java b/src/main/java/org/codelibs/fess/api/json/SearchApiManager.java
@@ -120,8 +120,7 @@ protected FormatType detectFormatType(final HttpServletRequest request) {
             return FormatType.SEARCH;
         }
         final String type = value.toLowerCase(Locale.ROOT);
-        switch (type) {
-        case "documents":
+        if ("documents".equals(type)) {
             if (values.length > 5 && "favorite".equals(values[5])) {
                 request.setAttribute(DOC_ID_FIELD, values[4]);
                 return FormatType.FAVORITE;
@@ -130,18 +129,21 @@ protected FormatType detectFormatType(final HttpServletRequest request) {
                 return FormatType.SCROLL;
             }
             return FormatType.SEARCH;
-        case "labels":
+        }
+        if ("labels".equals(type)) {
             return FormatType.LABEL;
-        case "popular-words":
+        }
+        if ("popular-words".equals(type)) {
             return FormatType.POPULARWORD;
-        case "favorites":
+        }
+        if ("favorites".equals(type)) {
             return FormatType.FAVORITES;
-        case "health":
+        }
+        if ("health".equals(type)) {
             return FormatType.PING;
-        case "suggest-words":
+        }
+        if ("suggest-words".equals(type)) {
             return FormatType.SUGGEST;
-        default:
-            break;
         }
         // default
         return FormatType.OTHER;

diff --git a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
@@ -319,17 +319,17 @@ public ActionResponse download(final String id) {
             }
             if (id.endsWith(NDJSON_EXTENTION)) {
                 final String name = id.substring(0, id.length() - NDJSON_EXTENTION.length());
-                switch (name) {
-                case "search_log":
+                if ("search_log".equals(name)) {
                     return writeNdjsonResponse(id, getSearchLogNdjsonWriteCall());
-                case "user_info":
+                }
+                if ("user_info".equals(name)) {
                     return writeNdjsonResponse(id, getUserInfoNdjsonWriteCall());
-                case "click_log":
+                }
+                if ("click_log".equals(name)) {
                     return writeNdjsonResponse(id, getClickLogNdjsonWriteCall());
-                case "favorite_log":
+                }
+                if ("favorite_log".equals(name)) {
                     return writeNdjsonResponse(id, getFavoriteLogNdjsonWriteCall());
-                default:
-                    break;
                 }
             } else if ("fess.json".equals(id)) {
                 return asStream(id).contentTypeOctetStream().stream(out -> {

diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
@@ -144,18 +144,12 @@ public HtmlResponse createnewjob(final String type, final String id, final Strin
                 final String decodedName = new String(Base64.getUrlDecoder().decode(name), Constants.CHARSET_UTF_8);
                 scheduledJobForm.name = MessageFormat.format(fessConfig.getJobTemplateTitle(type), decodedName);
                 final String[] ids = { "", "", "" };
-                switch (type) {
-                case Constants.WEB_CRAWLER_TYPE:
+                if (Constants.WEB_CRAWLER_TYPE.equals(type)) {
                     ids[0] = "\"" + id + "\"";
-                    break;
-                case Constants.FILE_CRAWLER_TYPE:
+                } else if (Constants.FILE_CRAWLER_TYPE.equals(type)) {
                     ids[1] = "\"" + id + "\"";
-                    break;
-                case Constants.DATA_CRAWLER_TYPE:
+                } else if (Constants.DATA_CRAWLER_TYPE.equals(type)) {
                     ids[2] = "\"" + id + "\"";
-                    break;
-                default:
-                    break;
                 }
                 scheduledJobForm.scriptData =
                         MessageFormat.format(fessConfig.getJobTemplateScript(), ids[0], ids[1], ids[2], id.replace('-', '_'));