From 2f16a01dd5b679d57b3979a65006d7a09c140115 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 18 Jun 2015 14:11:40 -0700 Subject: [PATCH] Polish --- .../endpoint/EnvironmentEndpointTests.java | 12 ++++++--- .../mongo/MongoDataAutoConfiguration.java | 27 +++++++------------ .../autoconfigure/mongo/MongoProperties.java | 3 ++- .../web/JspTemplateAvailabilityProvider.java | 16 +++++------ .../autoconfigure/web/WebMvcProperties.java | 6 +++-- .../MongoDataAutoConfigurationTests.java | 14 +++++----- .../boot/maven/AbstractRunMojo.java | 4 +-- .../src/site/apt/usage.apt.vm | 2 +- 8 files changed, 41 insertions(+), 43 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java index 79cf13d14d..033645641d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java @@ -97,13 +97,17 @@ public class EnvironmentEndpointTests extends AbstractEndpointTests env = report.invoke(); assertEquals("******", - ((Map) env.get("systemProperties")).get("my.services.amqp-free.credentials.uri")); + ((Map) env.get("systemProperties")) + .get("my.services.amqp-free.credentials.uri")); assertEquals("******", - ((Map) env.get("systemProperties")).get("credentials.http_api_uri")); + ((Map) env.get("systemProperties")) + .get("credentials.http_api_uri")); assertEquals("******", - ((Map) env.get("systemProperties")).get("my.services.cleardb-free.credentials")); + ((Map) env.get("systemProperties")) + .get("my.services.cleardb-free.credentials")); assertEquals("******", - ((Map) env.get("systemProperties")).get("foo.mycredentials.uri")); + ((Map) env.get("systemProperties")) + .get("foo.mycredentials.uri")); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfiguration.java index 1ee5a50df7..6c63efaf80 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfiguration.java @@ -22,10 +22,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import com.mongodb.DB; -import com.mongodb.Mongo; -import com.mongodb.MongoClient; - +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -62,6 +59,10 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; +import com.mongodb.DB; +import com.mongodb.Mongo; +import com.mongodb.MongoClient; + /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's mongo support. *

@@ -137,20 +138,10 @@ public class MongoDataAutoConfiguration implements BeanClassLoaderAware { throws ClassNotFoundException { MongoMappingContext context = new MongoMappingContext(); context.setInitialEntitySet(getInitialEntitySet(beanFactory)); - Class fieldNamingStrategyClass = this.properties. - getFieldNamingStrategy(); - if (fieldNamingStrategyClass != null) { - try { - context.setFieldNamingStrategy(fieldNamingStrategyClass.newInstance()); - } - catch (InstantiationException e) { - throw new IllegalArgumentException("Invalid custom FieldNamingStrategy " + - "(is it abstract?) '" + fieldNamingStrategyClass.getName() + "'", e); - } - catch (IllegalAccessException e) { - throw new IllegalArgumentException("Invalid custom FieldNamingStrategy " + - "(is the constructor accessible?)'" + fieldNamingStrategyClass.getName() + "'", e); - } + Class strategyClass = this.properties + .getFieldNamingStrategy(); + if (strategyClass != null) { + context.setFieldNamingStrategy(BeanUtils.instantiate(strategyClass)); } return context; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java index 1c48e23899..d8011886a9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java @@ -133,7 +133,8 @@ public class MongoProperties { return this.fieldNamingStrategy; } - public void setFieldNamingStrategy(Class fieldNamingStrategy) { + public void setFieldNamingStrategy( + Class fieldNamingStrategy) { this.fieldNamingStrategy = fieldNamingStrategy; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java index da111144f6..8305918c8a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/JspTemplateAvailabilityProvider.java @@ -35,23 +35,21 @@ public class JspTemplateAvailabilityProvider implements TemplateAvailabilityProv public boolean isTemplateAvailable(String view, Environment environment, ClassLoader classLoader, ResourceLoader resourceLoader) { if (ClassUtils.isPresent("org.apache.jasper.compiler.JspConfig", classLoader)) { - String prefix = getProperty(environment, "spring.mvc.view.prefix", "spring.view.prefix", - WebMvcAutoConfiguration.DEFAULT_PREFIX); - String suffix = getProperty(environment, "spring.mvc.view.suffix", "spring.view.suffix", - WebMvcAutoConfiguration.DEFAULT_SUFFIX); + String prefix = getProperty(environment, "spring.mvc.view.prefix", + "spring.view.prefix", WebMvcAutoConfiguration.DEFAULT_PREFIX); + String suffix = getProperty(environment, "spring.mvc.view.suffix", + "spring.view.suffix", WebMvcAutoConfiguration.DEFAULT_SUFFIX); return resourceLoader.getResource(prefix + view + suffix).exists(); } return false; } - private String getProperty(Environment environment, String key, String deprecatedKey, String defaultValue) { + private String getProperty(Environment environment, String key, String deprecatedKey, + String defaultValue) { if (environment.containsProperty(key)) { return environment.getProperty(key); } - if (environment.containsProperty(deprecatedKey)) { - return environment.getProperty(deprecatedKey); - } - return defaultValue; + return environment.getProperty(deprecatedKey, defaultValue); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java index 34180b1681..224b55c64d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java @@ -131,7 +131,7 @@ public class WebMvcProperties { private String suffix; public String getPrefix() { - return prefix; + return this.prefix; } public void setPrefix(String prefix) { @@ -139,11 +139,13 @@ public class WebMvcProperties { } public String getSuffix() { - return suffix; + return this.suffix; } public void setSuffix(String suffix) { this.suffix = suffix; } + } + } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java index 49804780cf..1ce3bc514b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoDataAutoConfigurationTests.java @@ -23,6 +23,7 @@ import org.hamcrest.Matchers; import org.junit.After; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.data.mongo.city.City; @@ -41,7 +42,6 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate; import org.springframework.test.util.ReflectionTestUtils; import com.mongodb.Mongo; -import org.junit.rules.ExpectedException; import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.assertEquals; @@ -124,11 +124,12 @@ public class MongoDataAutoConfigurationTests { @Test public void interfaceFieldNamingStrategy() { - thrown.expectMessage("Invalid custom FieldNamingStrategy"); + this.thrown.expectMessage("Invalid custom FieldNamingStrategy"); testFieldNamingStrategy(FieldNamingStrategy.class.getName(), null); } - public void testFieldNamingStrategy(String strategy, Class expectedType) { + public void testFieldNamingStrategy(String strategy, + Class expectedType) { this.context = new AnnotationConfigApplicationContext(); if (strategy != null) { EnvironmentTestUtils.addEnvironment(this.context, @@ -137,9 +138,10 @@ public class MongoDataAutoConfigurationTests { this.context.register(PropertyPlaceholderAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class); this.context.refresh(); - MongoMappingContext mappingContext = this.context.getBean(MongoMappingContext.class); - FieldNamingStrategy fieldNamingStrategy = - (FieldNamingStrategy) ReflectionTestUtils.getField(mappingContext, "fieldNamingStrategy"); + MongoMappingContext mappingContext = this.context + .getBean(MongoMappingContext.class); + FieldNamingStrategy fieldNamingStrategy = (FieldNamingStrategy) ReflectionTestUtils + .getField(mappingContext, "fieldNamingStrategy"); assertEquals(expectedType, fieldNamingStrategy.getClass()); } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java index e03f1d9628..62d140acfd 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java @@ -36,7 +36,6 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.shared.artifact.filter.collection.AbstractArtifactFeatureFilter; import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts; - import org.springframework.boot.loader.tools.FileUtils; import org.springframework.boot.loader.tools.MainClassFinder; @@ -349,7 +348,8 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo { private void addDependencies(List urls) throws MalformedURLException, MojoExecutionException { - FilterArtifacts filters = this.useTestClasspath ? getFilters() : getFilters(new TestArtifactFilter()); + FilterArtifacts filters = this.useTestClasspath ? getFilters() + : getFilters(new TestArtifactFilter()); Set artifacts = filterDependencies(this.project.getArtifacts(), filters); for (Artifact artifact : artifacts) { if (artifact.getFile() != null) { diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm index e16b7bc8ec..e6aa2da0b4 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm +++ b/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/usage.apt.vm @@ -151,7 +151,7 @@ mvn spring-boot:run in such a way that any dependency that is excluded in the plugin's configuration gets excluded from the classpath as well. See {{{./examples/exclude-dependency.html}Exclude a dependency}} for more details. - + Sometimes it is useful to include test dependencies when running the application. For example, if you want to run your application in a test mode that uses stub classes. If you wish to do this, you can set the <<>> parameter to true. Note that this is only applied when you