Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18838 from izeye

Browse Source 
* pr/18838:
  Polish

Closes gh-18838
This commit is contained in:
Stephane Nicoll
2019-11-01 09:02:09 +02:00
parent 7d5c468ebb 45d85778b8
commit 0d1cfb520c
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/JettyWebServerFactoryCustomizer.java
View File

@@ -124,19 +124,19 @@ public class JettyWebServerFactoryCustomizer
@Override @Override
public void customize(Server server) { public void customize(Server server) {
setHandlerMaxHttpFormPostSize(maxHttpFormPostSize, server.getHandlers()); setHandlerMaxHttpFormPostSize(server.getHandlers());
} }
private void setHandlerMaxHttpFormPostSize(int maxHttpPostSize, Handler... handlers) { private void setHandlerMaxHttpFormPostSize(Handler... handlers) {
for (Handler handler : handlers) { for (Handler handler : handlers) {
if (handler instanceof ContextHandler) { if (handler instanceof ContextHandler) {
((ContextHandler) handler).setMaxFormContentSize(maxHttpFormPostSize); ((ContextHandler) handler).setMaxFormContentSize(maxHttpFormPostSize);
} }
else if (handler instanceof HandlerWrapper) { else if (handler instanceof HandlerWrapper) {
setHandlerMaxHttpFormPostSize(maxHttpFormPostSize, ((HandlerWrapper) handler).getHandler()); setHandlerMaxHttpFormPostSize(((HandlerWrapper) handler).getHandler());
} }
else if (handler instanceof HandlerCollection) { else if (handler instanceof HandlerCollection) {
setHandlerMaxHttpFormPostSize(maxHttpFormPostSize, ((HandlerCollection) handler).getHandlers()); setHandlerMaxHttpFormPostSize(((HandlerCollection) handler).getHandlers());
} }
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/SingleConfigurationTableEntry.java
View File

@@ -62,11 +62,11 @@ class SingleConfigurationTableEntry extends ConfigurationTableEntry {
private void writeDefaultValue(AsciidocBuilder builder) { private void writeDefaultValue(AsciidocBuilder builder) {
String defaultValue = (this.defaultValue != null) ? this.defaultValue : ""; String defaultValue = (this.defaultValue != null) ? this.defaultValue : "";
defaultValue = defaultValue.replace("\\", "\\\\").replace("|", "\\|");
if (defaultValue.isEmpty()) { if (defaultValue.isEmpty()) {
builder.appendln("|"); builder.appendln("|");
} }
else { else {
defaultValue = defaultValue.replace("\\", "\\\\").replace("|", "\\|");
builder.appendln("|`+", defaultValue, "+`"); builder.appendln("|`+", defaultValue, "+`");
} }
} }

1
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptorResolver.java
View File

@@ -185,7 +185,6 @@ class PropertyDescriptorResolver {
return isConstructorBoundType((TypeElement) type.getEnclosingElement(), env); return isConstructorBoundType((TypeElement) type.getEnclosingElement(), env);
} }
return false; return false;
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/DeducedImmutableClassProperties.java
View File

@@ -40,7 +40,7 @@ public class DeducedImmutableClassProperties {
public static class Nested { public static class Nested {
private String name; private final String name;
public Nested(String name) { public Nested(String name) {
this.name = name; this.name = name;