Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/master 041c07908 -> 4214dd43b
TAMAYA-321 Adapted to API changes. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/4214dd43 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/4214dd43 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/4214dd43 Branch: refs/heads/master Commit: 4214dd43be07e01bac3ee3484c6047f5f021f714 Parents: 041c079 Author: Anatole Tresch <anat...@apache.org> Authored: Mon Nov 27 00:08:14 2017 +0100 Committer: Anatole Tresch <anat...@apache.org> Committed: Mon Nov 27 00:08:14 2017 +0100 ---------------------------------------------------------------------- .../apache/tamaya/metamodel/MetaConfiguration.java | 9 ++++----- .../metamodel/internal/CombinationPolicyReader.java | 5 +++-- .../DSLLoadingConfigurationProviderSpi.java | 16 ++++++++-------- .../metamodel/internal/MetaContextReader.java | 3 ++- .../metamodel/internal/PropertyConverterReader.java | 7 ++++--- .../internal/PropertyFilterOrderingReader.java | 5 +++-- .../metamodel/internal/PropertyFilterReader.java | 7 ++++--- .../internal/PropertySourceOrderingReader.java | 5 +++-- .../metamodel/internal/PropertySourceReader.java | 13 +++++-------- .../metamodel/spi/MetaConfigurationReader.java | 5 +++-- .../tamaya/metamodel/ext/IntegrationTest.java | 12 ++++++------ .../metamodel/internal/resolver/LoggingReader.java | 3 ++- 12 files changed, 47 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java index 76172a6..d896cb0 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java @@ -22,8 +22,8 @@ import org.apache.tamaya.ConfigException; import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContext; -import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.ServiceContextManager; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -107,14 +107,14 @@ public final class MetaConfiguration { * @return a new configuration context builder, never null. * @throws ConfigException If the URL cannot be read. */ - public static ConfigurationContextBuilder createContextBuilder(URL metaConfig){ + public static ConfigurationBuilder createConfigBuilder(URL metaConfig){ URL configFile = Objects.requireNonNull(metaConfig); LOG.info("TAMAYA: Loading tamaya-config.xml..."); Document document = null; try { document = DocumentBuilderFactory.newInstance() .newDocumentBuilder().parse(configFile.openStream()); - ConfigurationContextBuilder builder = ConfigurationProvider.getConfigurationContextBuilder(); + ConfigurationBuilder builder = ConfigurationProvider.getConfigurationBuilder(); for(MetaConfigurationReader reader: ServiceContextManager.getServiceContext().getServices( MetaConfigurationReader.class )){ @@ -135,8 +135,7 @@ public final class MetaConfiguration { * @return the new configuration instance. */ public static Configuration createConfiguration(URL metaConfig){ - ConfigurationContext context = createContextBuilder(metaConfig).build(); - return ConfigurationProvider.createConfiguration(context); + return createConfigBuilder(metaConfig).build(); } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java index 48af79f..b9d82c5 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/CombinationPolicyReader.java @@ -22,6 +22,7 @@ import org.apache.tamaya.ConfigException; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyValueCombinationPolicy; import org.osgi.service.component.annotations.Component; @@ -41,7 +42,7 @@ public class CombinationPolicyReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(CombinationPolicyReader.class.getName()); @Override - public void read(Document document, ConfigurationContextBuilder contextBuilder) { + public void read(Document document, ConfigurationBuilder configBuilder) { NodeList nodeList = document.getDocumentElement().getElementsByTagName("combination-policy"); if(nodeList.getLength()==0){ LOG.finest("No explicit combination policy configured, using default."); @@ -56,7 +57,7 @@ public class CombinationPolicyReader implements MetaConfigurationReader{ ItemFactory<PropertyValueCombinationPolicy> policyFactory = ItemFactoryManager.getInstance().getFactory(PropertyValueCombinationPolicy.class, type); PropertyValueCombinationPolicy policy = policyFactory.create(ComponentConfigurator.extractParameters(node)); ComponentConfigurator.configure(policy, node); - contextBuilder.setPropertyValueCombinationPolicy(policy); + configBuilder.setPropertyValueCombinationPolicy(policy); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java index 5243796..1e2826c 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java @@ -20,14 +20,9 @@ package org.apache.tamaya.metamodel.internal; import org.apache.tamaya.metamodel.MetaConfiguration; import org.apache.tamaya.Configuration; -import org.apache.tamaya.spi.ConfigurationContext; -import org.apache.tamaya.spi.ConfigurationContextBuilder; -import org.apache.tamaya.spi.ConfigurationProviderSpi; -import org.apache.tamaya.spi.ServiceContextManager; -import org.apache.tamaya.spisupport.DefaultConfiguration; -import org.apache.tamaya.spisupport.DefaultConfigurationContextBuilder; -import org.apache.tamaya.spisupport.PropertyFilterComparator; -import org.apache.tamaya.spisupport.PropertySourceComparator; +import org.apache.tamaya.spi.*; +import org.apache.tamaya.spi.ConfigurationBuilder; +import org.apache.tamaya.spisupport.*; import org.osgi.service.component.annotations.Component; import javax.annotation.Priority; @@ -50,6 +45,11 @@ public class DSLLoadingConfigurationProviderSpi implements ConfigurationProvider } @Override + public ConfigurationBuilder getConfigurationBuilder() { + return new DefaultConfigurationBuilder(); + } + + @Override public void setConfiguration(Configuration config) { this.config = Objects.requireNonNull(config); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java index 59878c5..423ac2f 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/MetaContextReader.java @@ -21,6 +21,7 @@ package org.apache.tamaya.metamodel.internal; import org.apache.tamaya.metamodel.MetaContext; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; import org.apache.tamaya.metamodel.spi.SimpleResolver; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.ServiceContextManager; import org.osgi.service.component.annotations.Component; @@ -73,7 +74,7 @@ public class MetaContextReader implements MetaConfigurationReader { } @Override - public void read(Document document, ConfigurationContextBuilder contextBuilder) { + public void read(Document document, ConfigurationBuilder configBuilder) { NodeList nodeList = document.getDocumentElement().getElementsByTagName("context"); LOG.finer("Reading " + nodeList.getLength() + " meta context entries..."); for(int i=0;i<nodeList.getLength();i++){ http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java index a6223a3..1126517 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyConverterReader.java @@ -23,6 +23,7 @@ import org.apache.tamaya.TypeLiteral; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyConverter; import org.osgi.service.component.annotations.Component; @@ -43,7 +44,7 @@ public class PropertyConverterReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(PropertyConverterReader.class.getName()); @Override - public void read(Document document, ConfigurationContextBuilder contextBuilder) { + public void read(Document document, ConfigurationBuilder configBuilder) { NodeList nodeList = document.getDocumentElement().getElementsByTagName("property-converters"); if(nodeList.getLength()==0){ LOG.finer("No property converters configured"); @@ -61,7 +62,7 @@ public class PropertyConverterReader implements MetaConfigurationReader{ String type = node.getNodeName(); if("defaults".equals(type)){ LOG.finer("Adding default property converters..."); - contextBuilder.addDefaultPropertyConverters(); + configBuilder.addDefaultPropertyConverters(); continue; } try { @@ -76,7 +77,7 @@ public class PropertyConverterReader implements MetaConfigurationReader{ ComponentConfigurator.configure(converter, node); Class targetType = Class.forName(params.get("targetType")); LOG.finer("Adding converter for type " + targetType.getName() + ": " + converter.getClass()); - contextBuilder.addPropertyConverters(TypeLiteral.of(targetType), converter); + configBuilder.addPropertyConverters(TypeLiteral.of(targetType), converter); } } catch (Exception e) { LOG.log(Level.SEVERE, "Failed to configure PropertyConverter: " + type, e); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java index 2b2bcb8..154d181 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterOrderingReader.java @@ -22,6 +22,7 @@ import org.apache.tamaya.ConfigException; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; @@ -43,7 +44,7 @@ public class PropertyFilterOrderingReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(PropertyFilterOrderingReader.class.getName()); @Override - public void read(Document document, ConfigurationContextBuilder contextBuilder) { + public void read(Document document, ConfigurationBuilder configBuilder) { NodeList nodeList = document.getDocumentElement().getElementsByTagName("property-filter-order"); if(nodeList.getLength()==0){ LOG.finer("No property filter ordering configured."); @@ -58,7 +59,7 @@ public class PropertyFilterOrderingReader implements MetaConfigurationReader{ Comparator comparator = comparatorFactory.create(ComponentConfigurator.extractParameters(node)); ComponentConfigurator.configure(comparator, node); LOG.finer("Sorting property filters using comparator: " + comparator.getClass().getName()); - contextBuilder.sortPropertyFilter(comparator); + configBuilder.sortPropertyFilter(comparator); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java index 5b4f80c..7b1c0a3 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertyFilterReader.java @@ -22,6 +22,7 @@ import org.apache.tamaya.ConfigException; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyFilter; import org.osgi.service.component.annotations.Component; @@ -42,7 +43,7 @@ public class PropertyFilterReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(PropertyFilterReader.class.getName()); @Override - public void read(Document document, ConfigurationContextBuilder contextBuilder) { + public void read(Document document, ConfigurationBuilder configBuilder) { NodeList nodeList = document.getDocumentElement().getElementsByTagName("property-filters"); if(nodeList.getLength()==0){ LOG.finer("No property filters configured."); @@ -60,7 +61,7 @@ public class PropertyFilterReader implements MetaConfigurationReader{ String type = node.getNodeName(); if ("defaults".equals(type)) { LOG.finer("Adding default property filters..."); - contextBuilder.addDefaultPropertyFilters(); + configBuilder.addDefaultPropertyFilters(); continue; } ItemFactory<PropertyFilter> filterFactory = ItemFactoryManager.getInstance().getFactory(PropertyFilter.class, type); @@ -73,7 +74,7 @@ public class PropertyFilterReader implements MetaConfigurationReader{ if(filter!=null) { ComponentConfigurator.configure(filter, params); LOG.finer("Adding configured property filter: " + filter.getClass().getName()); - contextBuilder.addPropertyFilters(filter); + configBuilder.addPropertyFilters(filter); } } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java index e7cd29c..e7d27c0 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceOrderingReader.java @@ -22,6 +22,7 @@ import org.apache.tamaya.ConfigException; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.apache.tamaya.spi.PropertyValueCombinationPolicy; import org.osgi.service.component.annotations.Component; @@ -44,7 +45,7 @@ public class PropertySourceOrderingReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(PropertySourceOrderingReader.class.getName()); @Override - public void read(Document document, ConfigurationContextBuilder contextBuilder) { + public void read(Document document, ConfigurationBuilder configBuilder) { NodeList nodeList = document.getDocumentElement().getElementsByTagName("property-source-order"); if(nodeList.getLength()==0){ LOG.finer("No property source ordering defined."); @@ -59,7 +60,7 @@ public class PropertySourceOrderingReader implements MetaConfigurationReader{ Comparator comparator = comparatorFactory.create(ComponentConfigurator.extractParameters(node)); ComponentConfigurator.configure(comparator, node); LOG.finer("Sorting property sources using comparator: " + comparator.getClass().getName()); - contextBuilder.sortPropertySources(comparator); + configBuilder.sortPropertySources(comparator); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java index 1957bf6..3585d48 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/PropertySourceReader.java @@ -28,10 +28,7 @@ import org.apache.tamaya.metamodel.ext.RefreshablePropertySourceProvider; import org.apache.tamaya.metamodel.spi.ItemFactory; import org.apache.tamaya.metamodel.spi.ItemFactoryManager; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; -import org.apache.tamaya.spi.ConfigurationContextBuilder; -import org.apache.tamaya.spi.PropertyFilter; -import org.apache.tamaya.spi.PropertySource; -import org.apache.tamaya.spi.PropertySourceProvider; +import org.apache.tamaya.spi.*; import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -50,7 +47,7 @@ public class PropertySourceReader implements MetaConfigurationReader{ private static final Logger LOG = Logger.getLogger(PropertySourceReader.class.getName()); @Override - public void read(Document document, ConfigurationContextBuilder contextBuilder) { + public void read(Document document, ConfigurationBuilder configBuilder) { NodeList nodeList = document.getDocumentElement().getElementsByTagName("property-sources"); if(nodeList.getLength()==0){ LOG.finer("No property sources configured."); @@ -68,7 +65,7 @@ public class PropertySourceReader implements MetaConfigurationReader{ String type = node.getNodeName(); if("defaults".equals(type)){ LOG.fine("Adding default property sources."); - contextBuilder.addDefaultPropertySources(); + configBuilder.addDefaultPropertySources(); continue; } try { @@ -81,7 +78,7 @@ public class PropertySourceReader implements MetaConfigurationReader{ ComponentConfigurator.configure(ps, params); ps = decoratePropertySource(ps, node, params); LOG.finer("Adding configured property source: " + ps.getName()); - contextBuilder.addPropertySources(ps); + configBuilder.addPropertySources(ps); continue; } } @@ -101,7 +98,7 @@ public class PropertySourceReader implements MetaConfigurationReader{ ComponentConfigurator.configure(prov, node); prov = decoratePropertySourceProvider(prov, node, params); LOG.finer("Adding configured property source provider: " + prov.getClass().getName()); - contextBuilder.addPropertySources(prov.getPropertySources()); + configBuilder.addPropertySources(prov.getPropertySources()); } } catch (Exception e) { LOG.log(Level.SEVERE, "Failed to configure PropertySourceProvider: " + type, e); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java index 005aa24..cfcc5f9 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java @@ -18,6 +18,7 @@ */ package org.apache.tamaya.metamodel.spi; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.w3c.dom.Document; @@ -32,8 +33,8 @@ public interface MetaConfigurationReader { * context builder. The priority of readers is determined by the priorization policy * implemented by the {@link org.apache.tamaya.spi.ServiceContext}, * @param document the meta-configuration document - * @param contextBuilder the context builder to use. + * @param configBuilder the context builder to use. */ - void read(Document document, ConfigurationContextBuilder contextBuilder); + void read(Document document, ConfigurationBuilder configBuilder); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java ---------------------------------------------------------------------- diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java index 5f875f2..be744f7 100644 --- a/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java +++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/ext/IntegrationTest.java @@ -79,8 +79,8 @@ public class IntegrationTest { assertTrue(config.getProperties().isEmpty()); assertFalse(config.getContext().getPropertyConverters().isEmpty()); assertTrue(config.getContext().getPropertyFilters().isEmpty()); - assertEquals(config.getContext(), - ConfigurationProvider.getConfigurationContextBuilder() + assertEquals(config, + ConfigurationProvider.getConfigurationBuilder() .addDefaultPropertyConverters() .build()); @@ -94,8 +94,8 @@ public class IntegrationTest { assertFalse(config.getContext().getPropertySources().isEmpty()); assertTrue(config.getContext().getPropertyConverters().isEmpty()); assertTrue(config.getContext().getPropertyFilters().isEmpty()); - assertEquals(config.getContext(), - ConfigurationProvider.getConfigurationContextBuilder() + assertEquals(config, + ConfigurationProvider.getConfigurationBuilder() .addDefaultPropertySources() .build()); @@ -109,8 +109,8 @@ public class IntegrationTest { assertTrue(config.getContext().getPropertySources().isEmpty()); assertTrue(config.getContext().getPropertyConverters().isEmpty()); assertFalse(config.getContext().getPropertyFilters().isEmpty()); - assertEquals(config.getContext(), - ConfigurationProvider.getConfigurationContextBuilder() + assertEquals(config, + ConfigurationProvider.getConfigurationBuilder() .addDefaultPropertyFilters() .build()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/4214dd43/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java index c0d67bc..c3d646b 100644 --- a/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java +++ b/metamodel/src/test/java/org/apache/tamaya/metamodel/internal/resolver/LoggingReader.java @@ -22,6 +22,7 @@ import org.apache.tamaya.Configuration; import org.apache.tamaya.ConfigurationProvider; import org.apache.tamaya.metamodel.MetaContext; import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.spi.ConfigurationBuilder; import org.apache.tamaya.spi.ConfigurationContext; import org.apache.tamaya.spi.ConfigurationContextBuilder; import org.w3c.dom.Document; @@ -44,7 +45,7 @@ public class LoggingReader implements MetaConfigurationReader{ private static final JavaResolver resolver = new JavaResolver(); @Override - public void read(final Document document, ConfigurationContextBuilder contextBuilder) { + public void read(final Document document, ConfigurationBuilder configBuilder) { new Timer(true).schedule(new TimerTask() { @Override public void run() {
