Explorar el Código

code fixes from sonarcloud

Shinsuke Sugaya hace 5 años
padre
commit
e633a7ec5b

+ 6 - 4
src/main/java/org/codelibs/fess/app/service/SearchLogService.java

@@ -63,6 +63,8 @@ import org.slf4j.LoggerFactory;
 
 public class SearchLogService {
 
+    private static final String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";
+
     private static final String COUNT = "count";
 
     private static final String KEY = "key";
@@ -376,7 +378,7 @@ public class SearchLogService {
         }
         if (StringUtil.isNotBlank(pager.requestedTimeRange)) {
             final String[] values = pager.requestedTimeRange.split(" - ");
-            final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM);
             try {
                 if (values.length > 0) {
                     cb.query().setRequestedAt_GreaterEqual(parseDateTime(values[0], formatter));
@@ -401,7 +403,7 @@ public class SearchLogService {
         }
         if (StringUtil.isNotBlank(pager.requestedTimeRange)) {
             final String[] values = pager.requestedTimeRange.split(" - ");
-            final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM);
             try {
                 if (values.length > 0) {
                     cb.query().setCreatedAt_GreaterEqual(LocalDateTime.parse(values[0], formatter));
@@ -423,7 +425,7 @@ public class SearchLogService {
         }
         if (StringUtil.isNotBlank(pager.requestedTimeRange)) {
             final String[] values = pager.requestedTimeRange.split(" - ");
-            final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM);
             try {
                 if (values.length > 0) {
                     cb.query().setUpdatedAt_GreaterEqual(LocalDateTime.parse(values[0], formatter));
@@ -448,7 +450,7 @@ public class SearchLogService {
         }
         if (StringUtil.isNotBlank(pager.requestedTimeRange)) {
             final String[] values = pager.requestedTimeRange.split(" - ");
-            final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+            final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM);
             try {
                 if (values.length > 0) {
                     cb.query().setRequestedAt_GreaterEqual(LocalDateTime.parse(values[0], formatter));

+ 2 - 0
src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java

@@ -20,6 +20,7 @@ import java.util.Map;
 
 import javax.validation.constraints.Size;
 
+import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
@@ -39,5 +40,6 @@ public class CreateForm {
     public Map<String, String> attributes = new HashMap<>();
 
     public void initialize() {
+        crudMode = CrudMode.CREATE;
     }
 }

+ 2 - 0
src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java

@@ -20,6 +20,7 @@ import java.util.Map;
 
 import javax.validation.constraints.Size;
 
+import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
@@ -39,5 +40,6 @@ public class CreateForm {
     public Map<String, String> attributes = new HashMap<>();
 
     public void initialize() {
+        crudMode = CrudMode.CREATE;
     }
 }

+ 2 - 0
src/main/java/org/codelibs/fess/app/web/admin/searchlist/CreateForm.java

@@ -17,6 +17,7 @@ package org.codelibs.fess.app.web.admin.searchlist;
 
 import java.util.Map;
 
+import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
@@ -32,5 +33,6 @@ public class CreateForm {
     public String q;
 
     public void initialize() {
+        crudMode = CrudMode.CREATE;
     }
 }

+ 2 - 0
src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java

@@ -20,6 +20,7 @@ import java.util.Map;
 
 import javax.validation.constraints.Size;
 
+import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
@@ -49,5 +50,6 @@ public class CreateForm {
     public String[] groups;
 
     public void initialize() {
+        crudMode = CrudMode.CREATE;
     }
 }

+ 1 - 0
src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java

@@ -105,6 +105,7 @@ public class FessLoginAssist extends TypicalLoginAssist<String, FessUserBean, Fe
     }
 
     protected void insertLogin(final Object member) {
+        // nothing
     }
 
     @Override