Use default methods for ProjectRequestPostProcessor

This commit is contained in:
Stephane Nicoll 2017-07-03 08:14:38 +02:00
parent d562968093
commit fefde60a2e
7 changed files with 9 additions and 34 deletions

View File

@ -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) {}
}

View File

@ -1,23 +0,0 @@
package io.spring.initializr.generator;
import io.spring.initializr.metadata.InitializrMetadata;
/**
* An implementation of {@link ProjectRequestPostProcessor} with empty methods allowing
* sub-classes to override only the methods they're interested in.
*
* @author Stephane Nicoll
*/
public class ProjectRequestPostProcessorAdapter implements ProjectRequestPostProcessor {
@Override
public void postProcessBeforeResolution(ProjectRequest request,
InitializrMetadata metadata) {
}
@Override
public void postProcessAfterResolution(ProjectRequest request,
InitializrMetadata metadata) {
}
}

View File

@ -739,7 +739,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
// 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) {

View File

@ -63,7 +63,7 @@ public class ProjectRequestResolverTests {
@Test
public void afterResolution() {
postProcessors.add(new ProjectRequestPostProcessorAdapter() {
postProcessors.add(new ProjectRequestPostProcessor() {
@Override
public void postProcessAfterResolution(ProjectRequest request,
InitializrMetadata metadata) {

View File

@ -18,7 +18,6 @@ package io.spring.initializr.service.extension;
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 @@ import org.springframework.stereotype.Component;
* @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");

View File

@ -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 @@ import org.springframework.stereotype.Component;
* @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");

View File

@ -18,7 +18,6 @@ package io.spring.initializr.web.project;
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 @@ public class ProjectGenerationPostProcessorTests
@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 class ProjectGenerationPostProcessorTests
@Bean
@Order(1)
ProjectRequestPostProcessor firstPostProcessor() {
return new ProjectRequestPostProcessorAdapter() {
return new ProjectRequestPostProcessor() {
@Override
public void postProcessBeforeResolution(ProjectRequest request, InitializrMetadata metadata) {
request.setJavaVersion("1.2");