Use default methods for ProjectRequestPostProcessor

stormpath · Jul 3, 2017 · fefde60 · fefde60
1 parent d562968
commit fefde60
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 34 deletions.
diff --git a/...r-generator/src/main/java/io/spring/initializr/generator/ProjectRequestPostProcessor.java b/...r-generator/src/main/java/io/spring/initializr/generator/ProjectRequestPostProcessor.java
@@ -37,7 +37,7 @@ public interface ProjectRequestPostProcessor {
 	 * @param metadata the metadata to use to resolve this request
 	 * @see ProjectRequest#resolve(InitializrMetadata)
 	 */
-	void postProcessBeforeResolution(ProjectRequest request, InitializrMetadata metadata);
+	default void postProcessBeforeResolution(ProjectRequest request, InitializrMetadata metadata) {}
 
 	/**
 	 * Apply this post processor to the given {@code ProjectRequest} <i>after</i> it has
@@ -48,6 +48,6 @@ public interface ProjectRequestPostProcessor {
 	 * @param request an resolved {@code ProjectRequest}
 	 * @param metadata the metadata that were used to resolve this request
 	 */
-	void postProcessAfterResolution(ProjectRequest request, InitializrMetadata metadata);
+	default void postProcessAfterResolution(ProjectRequest request, InitializrMetadata metadata) {}
 
 }
diff --git a/...ator/src/main/java/io/spring/initializr/generator/ProjectRequestPostProcessorAdapter.java b/...ator/src/main/java/io/spring/initializr/generator/ProjectRequestPostProcessorAdapter.java
diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java
@@ -739,7 +739,7 @@ public void versionRangeWithPostProcessor() {
 
 		// First after processor that flips Spring Boot version
 		projectGenerator.setRequestResolver(new ProjectRequestResolver(
-				Collections.singletonList(new ProjectRequestPostProcessorAdapter() {
+				Collections.singletonList(new ProjectRequestPostProcessor() {
 					@Override
 					public void postProcessBeforeResolution(ProjectRequest r,
 							InitializrMetadata m) {

diff --git a/...r-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java b/...r-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java
@@ -63,7 +63,7 @@ public void beforeResolution() {
 
 	@Test
 	public void afterResolution() {
-		postProcessors.add(new ProjectRequestPostProcessorAdapter() {
+		postProcessors.add(new ProjectRequestPostProcessor() {
 			@Override
 			public void postProcessAfterResolution(ProjectRequest request,
 					InitializrMetadata metadata) {

diff --git a/...src/main/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessor.java b/...src/main/java/io/spring/initializr/service/extension/ReactorTestRequestPostProcessor.java
@@ -18,7 +18,6 @@
 
 import io.spring.initializr.generator.ProjectRequest;
 import io.spring.initializr.generator.ProjectRequestPostProcessor;
-import io.spring.initializr.generator.ProjectRequestPostProcessorAdapter;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.util.Version;
@@ -32,7 +31,7 @@
  * @author Stephane Nicoll
  */
 @Component
-public class ReactorTestRequestPostProcessor extends ProjectRequestPostProcessorAdapter {
+public class ReactorTestRequestPostProcessor implements ProjectRequestPostProcessor {
 
 	private static final Version VERSION_2_0_0_M2 = Version.parse("2.0.0.M2");
 

diff --git a/...src/main/java/io/spring/initializr/service/extension/SpringBoot2RequestPostProcessor.java b/...src/main/java/io/spring/initializr/service/extension/SpringBoot2RequestPostProcessor.java
@@ -17,7 +17,7 @@
 package io.spring.initializr.service.extension;
 
 import io.spring.initializr.generator.ProjectRequest;
-import io.spring.initializr.generator.ProjectRequestPostProcessorAdapter;
+import io.spring.initializr.generator.ProjectRequestPostProcessor;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.util.Version;
 
@@ -30,7 +30,7 @@
  * @author Stephane Nicoll
  */
 @Component
-class SpringBoot2RequestPostProcessor extends ProjectRequestPostProcessorAdapter {
+class SpringBoot2RequestPostProcessor implements ProjectRequestPostProcessor {
 
 	private static final Version VERSION_2_0_0_M1 = Version.parse("2.0.0.M1");
 

diff --git a/...b/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java b/...b/src/test/java/io/spring/initializr/web/project/ProjectGenerationPostProcessorTests.java
@@ -18,7 +18,6 @@
 
 import io.spring.initializr.generator.ProjectRequest;
 import io.spring.initializr.generator.ProjectRequestPostProcessor;
-import io.spring.initializr.generator.ProjectRequestPostProcessorAdapter;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.web.AbstractInitializrControllerIntegrationTests;
 import io.spring.initializr.web.project.ProjectGenerationPostProcessorTests.ProjectRequestPostProcessorConfiguration;
@@ -52,7 +51,7 @@ static class ProjectRequestPostProcessorConfiguration {
 		@Bean
 		@Order(2)
 		ProjectRequestPostProcessor secondPostProcessor() {
-			return new ProjectRequestPostProcessorAdapter() {
+			return new ProjectRequestPostProcessor() {
 				@Override
 				public void postProcessBeforeResolution(ProjectRequest request, InitializrMetadata metadata) {
 					request.setJavaVersion("1.7");
@@ -63,7 +62,7 @@ public void postProcessBeforeResolution(ProjectRequest request, InitializrMetada
 		@Bean
 		@Order(1)
 		ProjectRequestPostProcessor firstPostProcessor() {
-			return new ProjectRequestPostProcessorAdapter() {
+			return new ProjectRequestPostProcessor() {
 				@Override
 				public void postProcessBeforeResolution(ProjectRequest request, InitializrMetadata metadata) {
 					request.setJavaVersion("1.2");