remove h2 test dep

parent 525c5852
...@@ -179,16 +179,6 @@ ...@@ -179,16 +179,6 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId> <groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId> <artifactId>aspectjweaver</artifactId>
<optional>true</optional> <optional>true</optional>
......
...@@ -94,9 +94,9 @@ public class ArchaiusAutoConfigurationTests { ...@@ -94,9 +94,9 @@ public class ArchaiusAutoConfigurationTests {
} }
@Test @Test
public void configurationWithInjectedDbConfiguration() throws Exception { public void configurationWithInjectedConfiguration() throws Exception {
this.context = new AnnotationConfigApplicationContext( this.context = new AnnotationConfigApplicationContext(
ArchaiusAutoConfiguration.class, ArchaiusExternalConfiguration.class); ArchaiusAutoConfiguration.class, TestArchaiusExternalConfiguration.class);
DynamicStringProperty dbProperty = DynamicPropertyFactory.getInstance() DynamicStringProperty dbProperty = DynamicPropertyFactory.getInstance()
.getStringProperty("db.property", null); .getStringProperty("db.property", null);
DynamicStringProperty secondDbProperty = DynamicPropertyFactory.getInstance() DynamicStringProperty secondDbProperty = DynamicPropertyFactory.getInstance()
......
...@@ -16,43 +16,26 @@ ...@@ -16,43 +16,26 @@
package org.springframework.cloud.netflix.archaius; package org.springframework.cloud.netflix.archaius;
import com.netflix.config.DynamicConfiguration;
import com.netflix.config.FixedDelayPollingScheduler;
import com.netflix.config.PolledConfigurationSource;
import com.netflix.config.sources.JDBCConfigurationSource;
import org.apache.commons.configuration.AbstractConfiguration; import org.apache.commons.configuration.AbstractConfiguration;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.SingleConnectionDataSource;
import com.netflix.config.ConcurrentMapConfiguration;
/** /**
* @author Alexandru-George Burghelea * @author Alexandru-George Burghelea
*/ */
@Configuration @Configuration
public class ArchaiusExternalConfiguration { public class TestArchaiusExternalConfiguration {
@Bean @Bean
@Qualifier("dynamicConfiguration") @Qualifier("dynamicConfiguration")
public AbstractConfiguration createDynamicConfiguration() { public AbstractConfiguration createDynamicConfiguration() {
PolledConfigurationSource source = new JDBCConfigurationSource(initDataSource(), ConcurrentMapConfiguration config = new ConcurrentMapConfiguration();
"select distinct property_key, property_value from properties", config.addProperty("db.property","this is a db property");
"property_key", "property_value"); config.addProperty("db.second.property","this is another db property");
return new DynamicConfiguration(source, new FixedDelayPollingScheduler(0, 1000, false)); return config;
}
@Bean
@Qualifier("dataSource")
public SingleConnectionDataSource initDataSource() {
SingleConnectionDataSource dataSource = new SingleConnectionDataSource();
dataSource.setDriverClassName("org.h2.Driver");
dataSource
.setUrl("jdbc:h2:mem:test_archaius;AUTOCOMMIT=ON;DB_CLOSE_DELAY=-1;MODE=PostgreSQL;INIT=RUNSCRIPT FROM 'classpath:archaius_db_store.sql'");
dataSource.setUsername("sa");
dataSource.setPassword("");
dataSource.setSuppressClose(true);
return dataSource;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment