From 3bd563e4954643c6c3c4849eea6e32be6c7a00b1 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 10 Jun 2016 14:49:44 -0600 Subject: [PATCH] remove h2 test dep --- spring-cloud-netflix-core/pom.xml | 10 ---- .../ArchaiusAutoConfigurationTests.java | 4 +- .../ArchaiusExternalConfiguration.java | 58 ------------------- .../TestArchaiusExternalConfiguration.java | 41 +++++++++++++ 4 files changed, 43 insertions(+), 70 deletions(-) delete mode 100644 spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusExternalConfiguration.java create mode 100644 spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml index c7178481..2cf44bde 100644 --- a/spring-cloud-netflix-core/pom.xml +++ b/spring-cloud-netflix-core/pom.xml @@ -178,16 +178,6 @@ spring-boot-starter-test test - - org.springframework.boot - spring-boot-starter-jdbc - test - - - com.h2database - h2 - test - org.aspectj aspectjweaver diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfigurationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfigurationTests.java index 6f896ee2..babb9e9e 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfigurationTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfigurationTests.java @@ -94,9 +94,9 @@ public class ArchaiusAutoConfigurationTests { } @Test - public void configurationWithInjectedDbConfiguration() throws Exception { + public void configurationWithInjectedConfiguration() throws Exception { this.context = new AnnotationConfigApplicationContext( - ArchaiusAutoConfiguration.class, ArchaiusExternalConfiguration.class); + ArchaiusAutoConfiguration.class, TestArchaiusExternalConfiguration.class); DynamicStringProperty dbProperty = DynamicPropertyFactory.getInstance() .getStringProperty("db.property", null); DynamicStringProperty secondDbProperty = DynamicPropertyFactory.getInstance() diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusExternalConfiguration.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusExternalConfiguration.java deleted file mode 100644 index 6aec364d..00000000 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusExternalConfiguration.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2013-2015 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 - * - * http://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.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.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.jdbc.datasource.SingleConnectionDataSource; - -/** - * @author Alexandru-George Burghelea - */ -@Configuration -public class ArchaiusExternalConfiguration { - - @Bean - @Qualifier("dynamicConfiguration") - public AbstractConfiguration createDynamicConfiguration() { - PolledConfigurationSource source = new JDBCConfigurationSource(initDataSource(), - "select distinct property_key, property_value from properties", - "property_key", "property_value"); - return new DynamicConfiguration(source, new FixedDelayPollingScheduler(0, 1000, false)); - } - - @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; - } - -} diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java new file mode 100644 index 00000000..fa871eca --- /dev/null +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java @@ -0,0 +1,41 @@ +/* + * Copyright 2013-2015 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 + * + * http://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.cloud.netflix.archaius; + +import org.apache.commons.configuration.AbstractConfiguration; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.netflix.config.ConcurrentMapConfiguration; + +/** + * @author Alexandru-George Burghelea + */ +@Configuration +public class TestArchaiusExternalConfiguration { + + @Bean + @Qualifier("dynamicConfiguration") + public AbstractConfiguration createDynamicConfiguration() { + ConcurrentMapConfiguration config = new ConcurrentMapConfiguration(); + config.addProperty("db.property","this is a db property"); + config.addProperty("db.second.property","this is another db property"); + return config; + } + +}