polishing

initializr/src/main/groovy/io/spring/initializr/InitializrAutoConfiguration.groovy

@@ -54,7 +54,7 @@ class InitializrAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(InitializrMetadataProvider)
 	InitializrMetadataProvider initializrMetadataProvider(InitializrMetadata metadata) {
-		return new DefaultInitializrMetadataProvider(metadata)
+		new DefaultInitializrMetadataProvider(metadata)
 	}
 
 	@Bean
@@ -66,18 +66,17 @@ class InitializrAutoConfiguration {
 	@ConditionalOnMissingBean(CacheManager)
 	CacheManager cacheManager() {
 		SimpleCacheManager cacheManager = new SimpleCacheManager()
-		cacheManager.setCaches(Arrays.asList(
+		cacheManager.caches = Arrays.asList(
-				createConcurrentMapCache(600, 'initializr')
+				createConcurrentMapCache(600, 'initializr'))
-		))
 		cacheManager
 	}
 
 	private static ConcurrentMapCache createConcurrentMapCache(Long timeToLive, String name) {
 		CacheBuilder<Object, Object> cacheBuilder =
-				CacheBuilder.newBuilder().expireAfterWrite(timeToLive, TimeUnit.SECONDS);
+				CacheBuilder.newBuilder().expireAfterWrite(timeToLive, TimeUnit.SECONDS)
 
-		ConcurrentMap<Object, Object> map = cacheBuilder.build().asMap();
+		ConcurrentMap<Object, Object> map = cacheBuilder.build().asMap()
-		new ConcurrentMapCache(name, map, false);
+		new ConcurrentMapCache(name, map, false)
 	}
 
 }

initializr/src/main/groovy/io/spring/initializr/InitializrMetadata.groovy

@@ -73,7 +73,7 @@ class InitializrMetadata {
 	 * no such dependency exists.
 	 */
 	Dependency getDependency(String id) {
-		return indexedDependencies.get(id)
+		indexedDependencies.get(id)
 	}
 
 	/**
@@ -214,7 +214,7 @@ class InitializrMetadata {
 		 * and {@code artifactId}.
 		 */
 		boolean hasCoordinates() {
-			return groupId != null && artifactId != null
+			groupId != null && artifactId != null
 		}
 
 		/**
@@ -313,7 +313,7 @@ class InitializrMetadata {
 		}
 
 		boolean isDefault() {
-			return this.defaultValue
+			this.defaultValue
 		}
 	}
 

initializr/src/main/groovy/io/spring/initializr/ProjectGenerationMetricsListener.groovy

@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils
  */
 class ProjectGenerationMetricsListener implements ProjectGenerationListener {
 
-	private final CounterService counterService;
+	private final CounterService counterService
 
 	@Autowired
 	ProjectGenerationMetricsListener(CounterService counterService) {

initializr/src/main/groovy/io/spring/initializr/ProjectGenerator.groovy

@@ -16,6 +16,9 @@
 
 package io.spring.initializr
 
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.util.Assert
@@ -31,6 +34,8 @@ import static io.spring.initializr.support.GroovyTemplate.template
  */
 class ProjectGenerator {
 
+	private static final Logger logger = LoggerFactory.getLogger(ProjectGenerator)
+
 	@Autowired
 	InitializrMetadata metadata
 
@@ -153,6 +158,11 @@ class ProjectGenerator {
 		Assert.notNull request.bootVersion, 'boot version must not be null'
 		def model = [:]
 		request.resolve(metadata)
+
+		// request resolved so we can log what has been requested
+		logger.info('Processing request{type=' + request.type + ', ' +
+				'dependencies=' + request.dependencies.collect {it.id}+ '}')
+
 		request.properties.each { model[it.key] = it.value }
 		model
 	}

initializr/src/main/groovy/io/spring/initializr/support/GroovyTemplate.groovy

@@ -32,7 +32,7 @@ class GroovyTemplate {
 
 	static String template(String name, Map<String, ?> model) throws IOException,
 			CompilationFailedException, ClassNotFoundException {
-		return template(new GStringTemplateEngine(), name, model)
+		template(new GStringTemplateEngine(), name, model)
 	}
 
 	static String template(TemplateEngine engine, String name, Map<String, ?> model)
@@ -40,7 +40,7 @@ class GroovyTemplate {
 		Writable writable = getTemplate(engine, name).make(model)
 		StringWriter result = new StringWriter()
 		writable.writeTo(result)
-		return result.toString()
+		result.toString()
 	}
 
 	static Template getTemplate(TemplateEngine engine, String name)

initializr/src/test/groovy/io/spring/initializr/ProjectGenerationMetricsListenerTests.groovy

@@ -35,14 +35,14 @@ class ProjectGenerationMetricsListenerTests {
 
 
 	@Before
-	public void setup() {
+	void setup() {
 		TestCounterService counterService = new TestCounterService()
 		listener = new ProjectGenerationMetricsListener(counterService)
 		metricsAssert = new MetricsAssert(counterService)
 	}
 
 	@Test
-	public void projectGenerationCount() {
+	void projectGenerationCount() {
 		ProjectRequest request = initialize()
 		request.resolve(metadata)
 		listener.onGeneratedProject(request)
@@ -50,7 +50,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void dependencies() {
+	void dependencies() {
 		ProjectRequest request = initialize()
 		request.style << 'security' << 'spring-data'
 		request.resolve(metadata)
@@ -60,7 +60,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void resolvedWebDependency() {
+	void resolvedWebDependency() {
 		ProjectRequest request = initialize()
 		request.style << 'spring-data'
 		request.packaging = 'war'
@@ -71,7 +71,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void aliasedDependencyUseStandardId() {
+	void aliasedDependencyUseStandardId() {
 		InitializrMetadata.Dependency dependency = new InitializrMetadata.Dependency()
 		dependency.id ='foo'
 		dependency.aliases << 'foo-old'
@@ -86,7 +86,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void defaultType() {
+	void defaultType() {
 		ProjectRequest request = initialize()
 		request.resolve(metadata)
 		listener.onGeneratedProject(request)
@@ -94,7 +94,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void explicitType() {
+	void explicitType() {
 		ProjectRequest request = initialize()
 		request.type = 'build.gradle'
 		request.resolve(metadata)
@@ -103,7 +103,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void defaultPackaging() {
+	void defaultPackaging() {
 		ProjectRequest request = initialize()
 		request.resolve(metadata)
 		listener.onGeneratedProject(request)
@@ -111,7 +111,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void explicitPackaging() {
+	void explicitPackaging() {
 		ProjectRequest request = initialize()
 		request.packaging = 'war'
 		request.resolve(metadata)
@@ -120,7 +120,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void defaultJavaVersion() {
+	void defaultJavaVersion() {
 		ProjectRequest request = initialize()
 		request.resolve(metadata)
 		listener.onGeneratedProject(request)
@@ -128,7 +128,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void explicitJavaVersion() {
+	void explicitJavaVersion() {
 		ProjectRequest request = initialize()
 		request.javaVersion = '1.8'
 		request.resolve(metadata)
@@ -137,7 +137,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void defaultLanguage() {
+	void defaultLanguage() {
 		ProjectRequest request = initialize()
 		request.resolve(metadata)
 		listener.onGeneratedProject(request)
@@ -145,7 +145,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void explicitLanguage() {
+	void explicitLanguage() {
 		ProjectRequest request = initialize()
 		request.language = 'groovy'
 		request.resolve(metadata)
@@ -154,7 +154,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void defaultBootVersion() {
+	void defaultBootVersion() {
 		ProjectRequest request = initialize()
 		request.resolve(metadata)
 		listener.onGeneratedProject(request)
@@ -162,7 +162,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void explicitBootVersion() {
+	void explicitBootVersion() {
 		ProjectRequest request = initialize()
 		request.bootVersion = '1.0.2.RELEASE'
 		request.resolve(metadata)
@@ -171,7 +171,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void collectAllMetrics() {
+	void collectAllMetrics() {
 		ProjectRequest request = initialize()
 		request.style << 'web' << 'security'
 		request.type = 'gradle.zip'
@@ -190,7 +190,7 @@ class ProjectGenerationMetricsListenerTests {
 	}
 
 	@Test
-	public void incrementMetrics() {
+	void incrementMetrics() {
 		ProjectRequest request = initialize()
 		request.style << 'security' << 'spring-data'
 		request.resolve(metadata)

initializr/src/test/groovy/io/spring/initializr/web/AbstractInitializerControllerFormIntegrationTests.groovy

@@ -118,7 +118,7 @@ abstract class AbstractInitializerControllerFormIntegrationTests extends Abstrac
 	/**
 	 * Provide the context of the home page
 	 */
-	protected abstract String homeContext();
+	protected abstract String homeContext()
 
 	/**
 	 * Create a {@link HomePage} instance based on the specified {@link HtmlPage}

initializr/src/test/groovy/io/spring/initializr/web/AbstractInitializrControllerIntegrationTests.groovy

@@ -55,7 +55,7 @@ abstract class AbstractInitializrControllerIntegrationTests {
 	final RestTemplate restTemplate = new RestTemplate()
 
 	String createUrl(String context) {
-		return 'http://localhost:' + port + context
+		'http://localhost:' + port + context
 	}
 
 	String htmlHome() {
@@ -119,7 +119,7 @@ abstract class AbstractInitializrControllerIntegrationTests {
 			new DefaultInitializrMetadataProvider(metadata) {
 				@Override
 				protected List<InitializrMetadata.BootVersion> fetchBootVersions() {
-					return null; // Disable metadata fetching from spring.io
+					null // Disable metadata fetching from spring.io
 				}
 			}
 		}

initializr/src/test/groovy/io/spring/initializr/web/LegacyStsControllerFormIntegrationTests.groovy

@@ -43,7 +43,7 @@ class LegacyStsControllerFormIntegrationTests extends AbstractInitializerControl
 	}
 
 	@Configuration
-	public static class LegacyStsConfig {
+	static class LegacyStsConfig {
 
 		@Bean
 		@SuppressWarnings("deprecation")

initializr/src/test/groovy/io/spring/initializr/web/support/HomePage.groovy

@@ -86,7 +86,7 @@ abstract class HomePage {
 				checkBox.checked = true
 			} else {
 				throw new IllegalArgumentException('No dependency with name '
-						+ dependency + ' was found amongst ' + allStyles.keySet());
+						+ dependency + ' was found amongst ' + allStyles.keySet())
 			}
 		}
 	}