Browse Source

add COMMON_API_CONVERSION_RULE

Shinsuke Sugaya 8 years ago
parent
commit
81bde41282

+ 2 - 0
src/main/java/org/codelibs/fess/Constants.java

@@ -342,6 +342,8 @@ public class Constants extends CoreLibConstants {
     public static final String[] COMMON_CONVERSION_RULE =
     public static final String[] COMMON_CONVERSION_RULE =
             new String[] { "crudMode", "createdBy", "createdTime", "updatedBy", "updatedTime" };
             new String[] { "crudMode", "createdBy", "createdTime", "updatedBy", "updatedTime" };
 
 
+    public static final String[] COMMON_API_CONVERSION_RULE = new String[] { "crudMode" };
+
     public static final String USER_INFO = "LoginInfo";
     public static final String USER_INFO = "LoginInfo";
 
 
     public static final String ES_API_ACCESS_TOKEN = "esApiAccessToken";
     public static final String ES_API_ACCESS_TOKEN = "esApiAccessToken";

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java

@@ -163,7 +163,7 @@ public class ApiAdminAccesstokenAction extends FessApiAdminAction {
                     copyBeanToBean(
                     copyBeanToBean(
                             body,
                             body,
                             entity,
                             entity,
-                            op -> op.exclude(Constants.COMMON_CONVERSION_RULE)
+                            op -> op.exclude(Constants.COMMON_API_CONVERSION_RULE)
                                     .exclude(AdminAccesstokenAction.TOKEN, Constants.PERMISSIONS, AdminAccesstokenAction.EXPIRED_TIME)
                                     .exclude(AdminAccesstokenAction.TOKEN, Constants.PERMISSIONS, AdminAccesstokenAction.EXPIRED_TIME)
                                     .dateConverter(Constants.DEFAULT_DATETIME_FORMAT, AdminAccesstokenAction.EXPIRES));
                                     .dateConverter(Constants.DEFAULT_DATETIME_FORMAT, AdminAccesstokenAction.EXPIRES));
                     final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
                     final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();