Browse Source

remove VIRTUAL_HOSTS

Shinsuke Sugaya 8 years ago
parent
commit
a7a1d988a8

+ 1 - 5
src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java

@@ -136,17 +136,13 @@ public class ApiAdminDataconfigAction extends FessApiAdminAction {
         final EditBody body = new EditBody();
         copyBeanToBean(entity, body, copyOp -> {
             copyOp.excludeNull();
-            copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
+            copyOp.exclude(Constants.PERMISSIONS);
         });
         final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
         body.permissions =
                 stream(entity.getPermissions()).get(
                         stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
                                 .collect(Collectors.joining("\n")));
-        body.virtualHosts =
-                stream(entity.getVirtualHosts()).get(
-                        stream -> stream.filter(StringUtil::isNotBlank).distinct()
-                                .collect(Collectors.joining("\n")));
         return body;
     }
 }

+ 1 - 5
src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java

@@ -136,17 +136,13 @@ public class ApiAdminFileconfigAction extends FessApiAdminAction {
         final EditBody body = new EditBody();
         copyBeanToBean(entity, body, copyOp -> {
             copyOp.excludeNull();
-            copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
+            copyOp.exclude(Constants.PERMISSIONS);
         });
         final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
         body.permissions =
                 stream(entity.getPermissions()).get(
                         stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
                                 .collect(Collectors.joining("\n")));
-        body.virtualHosts =
-                stream(entity.getVirtualHosts()).get(
-                        stream -> stream.filter(StringUtil::isNotBlank).distinct()
-                                .collect(Collectors.joining("\n")));
         return body;
     }
 }

+ 1 - 5
src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java

@@ -136,17 +136,13 @@ public class ApiAdminWebconfigAction extends FessApiAdminAction {
         final EditBody body = new EditBody();
         copyBeanToBean(entity, body, copyOp -> {
             copyOp.excludeNull();
-            copyOp.exclude(Constants.PERMISSIONS, Constants.VIRTUAL_HOSTS);
+            copyOp.exclude(Constants.PERMISSIONS);
         });
         final PermissionHelper permissionHelper = ComponentUtil.getPermissionHelper();
         body.permissions =
                 stream(entity.getPermissions()).get(
                         stream -> stream.map(s -> permissionHelper.decode(s)).filter(StringUtil::isNotBlank).distinct()
                                 .collect(Collectors.joining("\n")));
-        body.virtualHosts =
-                stream(entity.getVirtualHosts()).get(
-                        stream -> stream.filter(StringUtil::isNotBlank).distinct()
-                                .collect(Collectors.joining("\n")));
         return body;
     }
 }