Browse Source

Merge pull request #18838 from izeye

* pr/18838:
  Polish

Closes gh-18838
pull/18845/head
Stephane Nicoll 6 years ago
parent
commit
0d1cfb520c
  1. 8
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/JettyWebServerFactoryCustomizer.java
  2. 2
      spring-boot-project/spring-boot-tools/spring-boot-configuration-docs/src/main/java/org/springframework/boot/configurationdocs/SingleConfigurationTableEntry.java
  3. 1
      spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/PropertyDescriptorResolver.java
  4. 2
      spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/immutable/DeducedImmutableClassProperties.java

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

@ -124,19 +124,19 @@ public class JettyWebServerFactoryCustomizer @@ -124,19 +124,19 @@ public class JettyWebServerFactoryCustomizer
@Override
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) {
if (handler instanceof ContextHandler) {
((ContextHandler) handler).setMaxFormContentSize(maxHttpFormPostSize);
}
else if (handler instanceof HandlerWrapper) {
setHandlerMaxHttpFormPostSize(maxHttpFormPostSize, ((HandlerWrapper) handler).getHandler());
setHandlerMaxHttpFormPostSize(((HandlerWrapper) handler).getHandler());
}
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

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

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

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

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

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

Loading…
Cancel
Save