Add test asserting SDG Propertieds take precedence over (i.e. override) both Spring and Apache Geode or Pivotal GemFire Properties.
Resolves gh-79.
This commit is contained in:
@@ -28,6 +28,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.core.Ordered;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.core.env.ConfigurableEnvironment;
|
||||
import org.springframework.core.env.EnumerablePropertySource;
|
||||
import org.springframework.core.env.MutablePropertySources;
|
||||
@@ -74,11 +76,15 @@ public class EnvironmentSourcedGemFirePropertiesAutoConfiguration {
|
||||
private final Logger logger = LoggerFactory.getLogger(EnvironmentSourcedGemFirePropertiesAutoConfiguration.class);
|
||||
|
||||
@Bean
|
||||
@Order(Ordered.LOWEST_PRECEDENCE)
|
||||
@SuppressWarnings("all")
|
||||
public ClientCacheConfigurer clientCacheGemFirePropertiesConfigurer(ConfigurableEnvironment environment) {
|
||||
return (beanName, bean) -> configureGemFireProperties(environment, bean);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@Order(Ordered.LOWEST_PRECEDENCE)
|
||||
@SuppressWarnings("all")
|
||||
public PeerCacheConfigurer peerCacheGemFirePropertiesConfigurer(ConfigurableEnvironment environment) {
|
||||
return (beanName, bean) -> configureGemFireProperties(environment, bean);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
/*
|
||||
* Copyright 2020 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
|
||||
* or implied. See the License for the specific language governing
|
||||
* permissions and limitations under the License.
|
||||
*/
|
||||
package org.springframework.geode.boot.autoconfigure.configuration;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
import java.util.Properties;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
import org.apache.geode.cache.client.ClientCache;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
|
||||
import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
/**
|
||||
* Integration Tests asserting and testing the precedence of GemFire, Spring and Spring Data for Apache Geode
|
||||
* & Pivotal GemFire (SDG) {@link Properties} precedence.
|
||||
*
|
||||
* Essentially, SDG {@link Properties} should take precedence over (i.e. override) both Spring And Apache Geode
|
||||
* or Pivotal GemFire {@link Properties}.
|
||||
*
|
||||
* @author John Blum
|
||||
* @see org.junit.Test
|
||||
* @see org.springframework.boot.autoconfigure.SpringBootApplication
|
||||
* @see org.springframework.boot.test.context.SpringBootTest
|
||||
* @see org.springframework.context.annotation.Profile
|
||||
* @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects
|
||||
* @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport
|
||||
* @see org.springframework.test.context.ActiveProfiles
|
||||
* @see org.springframework.test.context.junit4.SpringRunner
|
||||
* @since 1.3.0
|
||||
*/
|
||||
@ActiveProfiles("spring-gemfire-property-precedence")
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest(properties = {
|
||||
"spring.data.gemfire.cache.client.durable-client-id=987",
|
||||
"spring.data.gemfire.name=MockName",
|
||||
"spring.application.name=TestName",
|
||||
"gemfire.durable-client-id=123",
|
||||
"gemfire.name=NoName"
|
||||
})
|
||||
@SuppressWarnings("unused")
|
||||
public class GemFirePropertiesVsSpringDataGemFirePropertiesPrecedenceIntegrationTests extends IntegrationTestsSupport {
|
||||
|
||||
@Autowired
|
||||
private ClientCache clientCache;
|
||||
|
||||
@Test
|
||||
public void springDataGemFirePropertiesTakePrecedenceOverSpringAndGemFireProperties() {
|
||||
|
||||
assertThat(this.clientCache).isNotNull();
|
||||
assertThat(this.clientCache.getName()).isEqualTo("MockName");
|
||||
assertThat(this.clientCache.getDistributedSystem()).isNotNull();
|
||||
|
||||
Properties gemfireProperties = this.clientCache.getDistributedSystem().getProperties();
|
||||
|
||||
assertThat(gemfireProperties).isNotNull();
|
||||
assertThat(gemfireProperties).containsKeys("durable-client-id", "name");
|
||||
assertThat(gemfireProperties.getProperty("durable-client-id")).isEqualTo("987");
|
||||
assertThat(gemfireProperties.getProperty("name")).isEqualTo("MockName");
|
||||
}
|
||||
|
||||
@SpringBootApplication
|
||||
@EnableGemFireMockObjects
|
||||
@Profile("spring-gemfire-property-precedence")
|
||||
static class TestGeodeConfiguration { }
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user