From 0782bc220563d6b58578325349f4fbb407ea8770 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 29 Aug 2018 08:53:22 -0700 Subject: [PATCH] Add processBeforeBuild(:SpringApplicationBuilder) and processBeforeRun(:SpringApplication) methods. --- ...pplicationContextIntegrationTestsSupport.java | 4 +--- ...ngBootApplicationIntegrationTestsSupport.java | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringApplicationContextIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringApplicationContextIntegrationTestsSupport.java index 701dcb5..38fad10 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringApplicationContextIntegrationTestsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringApplicationContextIntegrationTestsSupport.java @@ -57,9 +57,7 @@ public abstract class SpringApplicationContextIntegrationTestsSupport extends In processBeforeRefresh(applicationContext); applicationContext.refresh(); - this.applicationContext = applicationContext; - - return applicationContext; + return setApplicationContext(applicationContext); } protected ConfigurableApplicationContext processBeforeRefresh(ConfigurableApplicationContext applicationContext) { diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringBootApplicationIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringBootApplicationIntegrationTestsSupport.java index cbe7334..3402d5d 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringBootApplicationIntegrationTestsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringBootApplicationIntegrationTestsSupport.java @@ -16,6 +16,7 @@ package org.springframework.data.gemfire.tests.integration; +import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; @@ -27,6 +28,7 @@ import org.springframework.context.ConfigurableApplicationContext; * {@link SpringApplicationBuilder} class. * * @author John Blum + * @see org.springframework.boot.SpringApplication * @see org.springframework.boot.builder.SpringApplicationBuilder * @see org.springframework.context.ConfigurableApplicationContext * @see org.springframework.data.gemfire.tests.integration.SpringApplicationContextIntegrationTestsSupport @@ -49,10 +51,18 @@ public abstract class SpringBootApplicationIntegrationTestsSupport @Override protected ConfigurableApplicationContext newApplicationContext(Class... annotatedClasses) { - return setApplicationContext(new SpringApplicationBuilder(annotatedClasses) + return setApplicationContext(processBeforeRun(processBeforeBuild(new SpringApplicationBuilder(annotatedClasses) .initializers(this::processBeforeRefresh) - .web(getWebApplicationType()) - .build() + .web(getWebApplicationType())) + .build()) .run(getArguments())); } + + protected SpringApplicationBuilder processBeforeBuild(SpringApplicationBuilder springApplicationBuilder) { + return springApplicationBuilder; + } + + protected SpringApplication processBeforeRun(SpringApplication springApplication) { + return springApplication; + } }