Polish

philwebb · philwebb · commit f8a4df08388c · 2014-08-28T12:07:44.000-07:00
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java
@@ -23,7 +23,6 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration;
 
@@ -33,12 +32,9 @@
  * <p>
  * Activates when the application is a web application and no
  * {@link RepositoryRestMvcConfiguration} is found.
- * </p>
  * <p>
- * Once in effect, the auto-configuration allows to configure any property
- * of {@link RepositoryRestConfiguration} using the {@code spring.data.rest}
- * prefix.
- * </p>
+ * Once in effect, the auto-configuration allows to configure any property of
+ * {@link RepositoryRestConfiguration} using the {@code spring.data.rest} prefix.
  *
  * @author Rob Winch
  * @author Stephane Nicoll
@@ -48,18 +44,17 @@
 @ConditionalOnWebApplication
 @ConditionalOnMissingBean(RepositoryRestMvcConfiguration.class)
 @ConditionalOnClass(RepositoryRestMvcConfiguration.class)
-@Import(RepositoryRestMvcAutoConfiguration.RepositoryRestMvcBootConfiguration.class)
 public class RepositoryRestMvcAutoConfiguration {
 
+	static class RepositoryRestMvcBootConfiguration extends
+			RepositoryRestMvcConfiguration {
 
-	@Configuration
-	static class RepositoryRestMvcBootConfiguration extends RepositoryRestMvcConfiguration {
-
-		@Override
 		@Bean
 		@ConfigurationProperties(prefix = "spring.data.rest")
+		@Override
 		public RepositoryRestConfiguration config() {
 			return super.config();
 		}
+
 	}
 }
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java
@@ -20,7 +20,6 @@
 
 import org.junit.After;
 import org.junit.Test;
-
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
 import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
@@ -36,7 +35,8 @@
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * Tests for {@link RepositoryRestMvcAutoConfiguration}.
@@ -64,25 +64,26 @@ public void testDefaultRepositoryConfiguration() throws Exception {
 	public void testWithCustomBaseUri() throws Exception {
 		load(TestConfiguration.class, "spring.data.rest.baseUri:foo");
 		assertNotNull(this.context.getBean(RepositoryRestMvcConfiguration.class));
-		RepositoryRestConfiguration bean = this.context.getBean(RepositoryRestConfiguration.class);
+		RepositoryRestConfiguration bean = this.context
+				.getBean(RepositoryRestConfiguration.class);
 		assertEquals("Custom baseURI not set", URI.create("foo"), bean.getBaseUri());
 	}
 
 	@Test
 	public void backOffWithCustomConfiguration() {
 		load(TestConfigurationWithRestMvcConfig.class, "spring.data.rest.baseUri:foo");
 		assertNotNull(this.context.getBean(RepositoryRestMvcConfiguration.class));
-		RepositoryRestConfiguration bean = this.context.getBean(RepositoryRestConfiguration.class);
-		assertEquals("Custom base URI should not have been set", URI.create(""), bean.getBaseUri());
+		RepositoryRestConfiguration bean = this.context
+				.getBean(RepositoryRestConfiguration.class);
+		assertEquals("Custom base URI should not have been set", URI.create(""),
+				bean.getBaseUri());
 
 	}
 
-	private void load(Class<?> config,
-			String... environment) {
+	private void load(Class<?> config, String... environment) {
 		AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
 		applicationContext.setServletContext(new MockServletContext());
-		applicationContext.register(config,
-				EmbeddedDataSourceConfiguration.class,
+		applicationContext.register(config, EmbeddedDataSourceConfiguration.class,
 				HibernateJpaAutoConfiguration.class,
 				JpaRepositoriesAutoConfiguration.class,
 				PropertyPlaceholderAutoConfiguration.class,
@@ -99,7 +100,7 @@ protected static class TestConfiguration {
 
 	}
 
-	@Import({TestConfiguration.class, RepositoryRestMvcConfiguration.class})
+	@Import({ TestConfiguration.class, RepositoryRestMvcConfiguration.class })
 	protected static class TestConfigurationWithRestMvcConfig {
 
 	}
diff --git a/spring-boot-cli/samples/caching.groovy b/spring-boot-cli/samples/caching.groovy
diff --git a/spring-boot-cli/samples/jms.groovy b/spring-boot-cli/samples/jms.groovy
@@ -28,4 +28,5 @@ class JmsExample implements CommandLineRunner {
 		log.info "Received ${message}"
 		latch.countDown()
 	}
-}
+
+}
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/CachingCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/CachingCompilerAutoConfiguration.java
@@ -19,7 +19,6 @@
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
-
 import org.springframework.boot.cli.compiler.AstUtils;
 import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
 import org.springframework.boot.cli.compiler.DependencyCustomizer;
@@ -30,7 +29,7 @@
  * @author Stephane Nicoll
  * @since 1.2.0
  */
-public class CachingAutoConfiguration extends CompilerAutoConfiguration {
+public class CachingCompilerAutoConfiguration extends CompilerAutoConfiguration {
 
 	@Override
 	public boolean matches(ClassNode classNode) {
@@ -41,13 +40,13 @@ public boolean matches(ClassNode classNode) {
 	public void applyDependencies(DependencyCustomizer dependencies)
 			throws CompilationFailedException {
 		dependencies.add("spring-context-support");
-
 	}
 
 	@Override
 	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
 		imports.addStarImports("org.springframework.cache",
-				"org.springframework.cache.annotation", "org.springframework.cache.concurrent");
+				"org.springframework.cache.annotation",
+				"org.springframework.cache.concurrent");
 	}
 
 }
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/JmsCompilerAutoConfiguration.java
@@ -22,7 +22,6 @@
 import org.springframework.boot.cli.compiler.AstUtils;
 import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
 import org.springframework.boot.cli.compiler.DependencyCustomizer;
-import org.springframework.boot.groovy.EnableJmsMessaging;
 
 /**
  * {@link CompilerAutoConfiguration} for Spring JMS.
@@ -34,26 +33,25 @@ public class JmsCompilerAutoConfiguration extends CompilerAutoConfiguration {
 
 	@Override
 	public boolean matches(ClassNode classNode) {
-		return  AstUtils.hasAtLeastOneAnnotation(classNode, "EnableJms") ||
-				AstUtils.hasAtLeastOneAnnotation(classNode, "EnableJmsMessaging");
+		return AstUtils.hasAtLeastOneAnnotation(classNode, "EnableJms")
+				|| AstUtils.hasAtLeastOneAnnotation(classNode, "EnableJmsMessaging");
 	}
 
 	@Override
 	public void applyDependencies(DependencyCustomizer dependencies)
 			throws CompilationFailedException {
 		dependencies.add("spring-jms", "jms-api");
-
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public void applyImports(ImportCustomizer imports) throws CompilationFailedException {
-		imports.addStarImports("javax.jms",
-				"org.springframework.jms.annotation",
-				"org.springframework.jms.config",
-				"org.springframework.jms.core",
+		imports.addStarImports("javax.jms", "org.springframework.jms.annotation",
+				"org.springframework.jms.config", "org.springframework.jms.core",
 				"org.springframework.jms.listener",
-				"org.springframework.jms.listener.adapter")
-				.addImports(EnableJmsMessaging.class.getCanonicalName());
+				"org.springframework.jms.listener.adapter").addImports(
+				org.springframework.boot.groovy.EnableJmsMessaging.class
+						.getCanonicalName());
 	}
 
 }
diff --git a/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration
@@ -4,7 +4,7 @@ org.springframework.boot.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfigu
 org.springframework.boot.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration
 org.springframework.boot.cli.compiler.autoconfigure.RabbitCompilerAutoConfiguration
 org.springframework.boot.cli.compiler.autoconfigure.ReactorCompilerAutoConfiguration
-org.springframework.boot.cli.compiler.autoconfigure.CachingAutoConfiguration
+org.springframework.boot.cli.compiler.autoconfigure.CachingCompilerAutoConfiguration
 org.springframework.boot.cli.compiler.autoconfigure.JdbcCompilerAutoConfiguration
 org.springframework.boot.cli.compiler.autoconfigure.JmsCompilerAutoConfiguration
 org.springframework.boot.cli.compiler.autoconfigure.JUnitCompilerAutoConfiguration
@@ -17,4 +17,4 @@ org.springframework.boot.cli.compiler.autoconfigure.SpringSocialFacebookCompiler
 org.springframework.boot.cli.compiler.autoconfigure.SpringSocialLinkedInCompilerAutoConfiguration
 org.springframework.boot.cli.compiler.autoconfigure.SpringSocialTwitterCompilerAutoConfiguration
 org.springframework.boot.cli.compiler.autoconfigure.SpringTestCompilerAutoConfiguration
-org.springframework.boot.cli.compiler.autoconfigure.SpringWebsocketCompilerAutoConfiguration
+org.springframework.boot.cli.compiler.autoconfigure.SpringWebsocketCompilerAutoConfiguration
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrabCommandIntegrationTests.java
@@ -27,6 +27,8 @@
 import org.springframework.boot.cli.command.grab.GrabCommand;
 import org.springframework.util.FileSystemUtils;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -68,8 +70,9 @@ public void duplicateGrabMetadataAnnotationsProducesAnError() throws Exception {
 			this.cli.grab("duplicateGrabMetadata.groovy");
 			fail();
 		}
-		catch (Exception e) {
-			assertTrue(e.getMessage().contains("Duplicate @GrabMetadata annotation"));
+		catch (Exception ex) {
+			assertThat(ex.getMessage(),
+					containsString("Duplicate @GrabMetadata annotation"));
 		}
 	}
 
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/ReproIntegrationTests.java
@@ -79,9 +79,4 @@ public void jmsListener() throws Exception {
 		assertThat(this.cli.getOutput(), containsString("Hello World"));
 	}
 
-	@Test
-	public void caching() throws Exception {
-		this.cli.run("caching.groovy");
-		assertThat(this.cli.getOutput(), containsString("Hello World"));
-	}
 }
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
@@ -24,7 +24,9 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -156,4 +158,10 @@ public void deviceSample() throws Exception {
 		assertEquals("Hello Normal Device!", this.cli.getHttpOutput());
 	}
 
+	@Test
+	public void caching() throws Exception {
+		this.cli.run("caching.groovy");
+		assertThat(this.cli.getOutput(), containsString("Hello World"));
+	}
+
 }
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -1847,6 +1847,7 @@ resolved against their provided names.
 
 
 
+[[boot-features-using-jms-template]]
 [[boot-features-using-jms-sending]]
 ==== Sending a message
 Spring's `JmsTemplate` is auto-configured and you can autowire it directly into your
@@ -1876,6 +1877,8 @@ own beans:
 NOTE: {spring-javadoc}/jms/core/JmsMessagingTemplate.{dc-ext}[`JmsMessagingTemplate`]
 (new in Spring 4.1) can be injected in a similar manner.
 
+
+
 [[boot-features-using-jms-receiving]]
 ==== Receiving a message
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetaData.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetaData.java
@@ -80,16 +80,16 @@ private Method findFactoryMethod(String beanName) {
 		if (!this.beans.containsKey(beanName)) {
 			return null;
 		}
-		final AtomicReference<Method> found = new AtomicReference<Method>();
+		final AtomicReference<Method> found = new AtomicReference<Method>(null);
 		MetaData meta = this.beans.get(beanName);
 		final String factory = meta.getMethod();
 		Class<?> type = this.beanFactory.getType(meta.getBean());
 		ReflectionUtils.doWithMethods(type, new MethodCallback() {
 			@Override
 			public void doWith(Method method) throws IllegalArgumentException,
 					IllegalAccessException {
-				if (found.get() == null && method.getName().equals(factory)) {
-					found.set(method);
+				if (method.getName().equals(factory)) {
+					found.compareAndSet(null, method);
 				}
 			}
 		});

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,5 @@ class JmsExample implements CommandLineRunner {`
`28`	`28`	`log.info "Received ${message}"`
`29`	`29`	`latch.countDown()`
`30`	`30`	`}`
`31`		`-}`
	`31`	`+`
	`32`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@`
`27`	`27`	`import org.springframework.boot.cli.command.grab.GrabCommand;`
`28`	`28`	`import org.springframework.util.FileSystemUtils;`
`29`	`29`
	`30`	`+import static org.hamcrest.Matchers.containsString;`
	`31`	`+import static org.junit.Assert.assertThat;`
`30`	`32`	`import static org.junit.Assert.assertTrue;`
`31`	`33`	`import static org.junit.Assert.fail;`
`32`	`34`
`@@ -68,8 +70,9 @@ public void duplicateGrabMetadataAnnotationsProducesAnError() throws Exception {`
`68`	`70`	`this.cli.grab("duplicateGrabMetadata.groovy");`
`69`	`71`	`fail();`
`70`	`72`	`}`
`71`		`- catch (Exception e) {`
`72`		`- assertTrue(e.getMessage().contains("Duplicate @GrabMetadata annotation"));`
	`73`	`+ catch (Exception ex) {`
	`74`	`+ assertThat(ex.getMessage(),`
	`75`	`+ containsString("Duplicate @GrabMetadata annotation"));`
`73`	`76`	`}`
`74`	`77`	`}`
`75`	`78`
Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,4 @@ public void jmsListener() throws Exception {`
`79`	`79`	`assertThat(this.cli.getOutput(), containsString("Hello World"));`
`80`	`80`	`}`
`81`	`81`
`82`		`- @Test`
`83`		`- public void caching() throws Exception {`
`84`		`- this.cli.run("caching.groovy");`
`85`		`- assertThat(this.cli.getOutput(), containsString("Hello World"));`
`86`		`- }`
`87`	`82`	`}`