0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1547 remove CR from virutal_hosts

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-03-07 22:53:16 +09:00
parent 5385f85a2b
commit 5e00081128
6 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
View file

@ -156,7 +156,8 @@ public class AdminDataconfigAction extends FessAdminAction {
.collect(Collectors.joining("\n")));
form.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
.collect(Collectors.joining("\n")));
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
});
@ -198,8 +199,8 @@ public class AdminDataconfigAction extends FessAdminAction {
.collect(Collectors.joining("\n")));
form.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).collect(
Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
.collect(Collectors.joining("\n")));
form.crudMode = crudMode;
})
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
@ -315,7 +316,7 @@ public class AdminDataconfigAction extends FessAdminAction {
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
.toArray(n -> new String[n])));
entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
return entity;
});
}

8
src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
View file

@ -151,7 +151,8 @@ public class AdminFileconfigAction extends FessAdminAction {
.collect(Collectors.joining("\n")));
form.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
.collect(Collectors.joining("\n")));
})
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml()));
saveToken();
@ -191,7 +192,8 @@ public class AdminFileconfigAction extends FessAdminAction {
.collect(Collectors.joining("\n")));
form.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
.collect(Collectors.joining("\n")));
form.crudMode = crudMode;
})
.orElse(() -> throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id),
@ -306,7 +308,7 @@ public class AdminFileconfigAction extends FessAdminAction {
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
.toArray(n -> new String[n])));
entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
return entity;
});
}

9
src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
View file

@ -153,7 +153,8 @@ public class AdminWebconfigAction extends FessAdminAction {
.collect(Collectors.joining("\n")));
form.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).collect(Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
.collect(Collectors.joining("\n")));
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
});
@ -195,8 +196,8 @@ public class AdminWebconfigAction extends FessAdminAction {
.collect(Collectors.joining("\n")));
form.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).collect(
Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).map(String::trim)
.collect(Collectors.joining("\n")));
form.crudMode = crudMode;
})
.orElse(() -> {
@ -314,7 +315,7 @@ public class AdminWebconfigAction extends FessAdminAction {
stream -> stream.map(s -> permissionHelper.encode(s)).filter(StringUtil::isNotBlank).distinct()
.toArray(n -> new String[n])));
entity.setVirtualHosts(split(form.virtualHosts, "\n").get(
stream -> stream.filter(StringUtil::isNotBlank).distinct().toArray(n -> new String[n])));
stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).toArray(n -> new String[n])));
return entity;
});
}

2
src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java
View file

@ -145,7 +145,7 @@ public class ApiAdminDataconfigAction extends FessApiAdminAction {
.collect(Collectors.joining("\n")));
body.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
return body;
}
}

2
src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java
View file

@ -145,7 +145,7 @@ public class ApiAdminFileconfigAction extends FessApiAdminAction {
.collect(Collectors.joining("\n")));
body.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
return body;
}
}

2
src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java
View file

@ -145,7 +145,7 @@ public class ApiAdminWebconfigAction extends FessApiAdminAction {
.collect(Collectors.joining("\n")));
body.virtualHosts =
stream(entity.getVirtualHosts()).get(
stream -> stream.filter(StringUtil::isNotBlank).distinct().collect(Collectors.joining("\n")));
stream -> stream.filter(StringUtil::isNotBlank).distinct().map(String::trim).collect(Collectors.joining("\n")));
return body;
}
}