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

Narrow String properties to a more precise type

Browse Source 
We envision that IDE will support auto-completion for known types in the
future, for instance Charset, MimeType, Resource and Locale. Some of our
own configuration keys use a raw String type whereas they actually
represent a higher-level concept.

We now make sure to expose these with a better type, if applicable.

Closes gh-2898
This commit is contained in:
Stephane Nicoll
2015-07-10 13:38:05 +02:00
parent c4c24b1f44
commit e52c190b05
20 changed files with 182 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -89,6 +89,8 @@ import org.springframework.util.StringUtils;
public class TomcatEmbeddedServletContainerFactory extends
AbstractEmbeddedServletContainerFactory implements ResourceLoaderAware {
private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
private static final Set<Class<?>> NO_CLASSES = Collections.emptySet();
public static final String DEFAULT_PROTOCOL = "org.apache.coyote.http11.Http11NioProtocol";
@@ -111,7 +113,7 @@ public class TomcatEmbeddedServletContainerFactory extends
private String tldSkip;
private String uriEncoding = "UTF-8";
private Charset uriEncoding = DEFAULT_CHARSET;
/**
* Create a new {@link TomcatEmbeddedServletContainerFactory} instance.
@@ -237,7 +239,7 @@ public class TomcatEmbeddedServletContainerFactory extends
customizeProtocol((AbstractProtocol<?>) connector.getProtocolHandler());
}
if (getUriEncoding() != null) {
connector.setURIEncoding(getUriEncoding());
connector.setURIEncoding(getUriEncoding().name());
}
// If ApplicationContext is slow to start we want Tomcat not to bind to the socket
@@ -614,7 +616,7 @@ public class TomcatEmbeddedServletContainerFactory extends
* be used.
* @param uriEncoding the uri encoding to set
*/
public void setUriEncoding(String uriEncoding) {
public void setUriEncoding(Charset uriEncoding) {
this.uriEncoding = uriEncoding;
}
@@ -622,7 +624,7 @@ public class TomcatEmbeddedServletContainerFactory extends
* Returns the character encoding to use for URL decoding.
* @return the URI encoding
*/
public String getUriEncoding() {
public Charset getUriEncoding() {
return this.uriEncoding;
}

2
spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -12,7 +12,7 @@
},
{
"name": "banner.location",
"type": "java.lang.String",
"type": "org.springframework.core.io.Resource",
"description": "Banner file location.",
"defaultValue": "classpath:banner.txt"
},

5
spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View File

@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,6 +19,7 @@ package org.springframework.boot.context.embedded.tomcat;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -226,7 +227,7 @@ public class TomcatEmbeddedServletContainerFactoryTests extends
@Test
public void uriEncoding() throws Exception {
TomcatEmbeddedServletContainerFactory factory = getFactory();
factory.setUriEncoding("US-ASCII");
factory.setUriEncoding(Charset.forName("US-ASCII"));
Tomcat tomcat = getTomcat(factory);
assertEquals("US-ASCII", tomcat.getConnector().getURIEncoding());
}