Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/configjsr 87cf9c2c4 -> 71f8928e0
Fixed some license refs. Renamed some artifacts for better compliance with JSR. Signed-off-by: Anatole Tresch <[email protected]> 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/856e060b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/856e060b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/856e060b Branch: refs/heads/configjsr Commit: 856e060b624a7706f3e1d7857545f493f75f54d0 Parents: 87cf9c2 Author: Anatole Tresch <[email protected]> Authored: Sun Apr 22 18:24:06 2018 +0200 Committer: Anatole Tresch <[email protected]> Committed: Sun Apr 22 18:24:06 2018 +0200 ---------------------------------------------------------------------- .../org/apache/tamaya/metamodel/MetaConfig.java | 140 +++++++++++++++++++ .../tamaya/metamodel/MetaConfiguration.java | 140 ------------------- .../internal/CombinationPolicyReader.java | 4 +- .../internal/ConfigSourceOrderingReader.java | 4 +- .../metamodel/internal/ConfigSourceReader.java | 4 +- .../metamodel/internal/ConverterReader.java | 4 +- .../internal/DSLBasedConfigFactory.java | 8 +- .../internal/FilterOrderingReader.java | 4 +- .../tamaya/metamodel/internal/FilterReader.java | 4 +- .../metamodel/internal/MetaContextReader.java | 4 +- .../tamaya/metamodel/spi/MetaConfigReader.java | 41 ++++++ .../metamodel/spi/MetaConfigurationReader.java | 41 ------ ...apache.tamaya.metamodel.spi.MetaConfigReader | 25 ++++ ...tamaya.metamodel.spi.MetaConfigurationReader | 25 ---- .../tamaya/metamodel/ext/IntegrationTest.java | 24 ++-- .../internal/resolver/LoggingReader.java | 4 +- ...apache.tamaya.metamodel.spi.MetaConfigReader | 19 +++ ...tamaya.metamodel.spi.MetaConfigurationReader | 19 --- 18 files changed, 257 insertions(+), 257 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfig.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfig.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfig.java new file mode 100644 index 0000000..ea0844d --- /dev/null +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfig.java @@ -0,0 +1,140 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.tamaya.metamodel; + +import org.apache.tamaya.base.ServiceContext; +import org.apache.tamaya.metamodel.spi.MetaConfigReader; +import org.apache.tamaya.base.ServiceContextManager; +import org.w3c.dom.Document; +import org.xml.sax.SAXException; + +import javax.config.Config; +import javax.config.spi.ConfigBuilder; +import javax.config.spi.ConfigProviderResolver; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Objects; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Accessor singleton for accessing/loading meta-configuration. + */ +public final class MetaConfig { + + private static final String CONFIG_RESOURCE = "tamaya-config.xml"; + + private static final Logger LOG = Logger.getLogger(MetaConfig.class.getName()); + + /** + * Singleton constructor. + */ + private MetaConfig(){} + + /** + * Creates a new {@link Config} using {@link #createConfig(URL)} + * and applies it as default configuration using {@link ConfigProviderResolver#registerConfig(Config, ClassLoader)} . + */ + public static void configure(ClassLoader classLoader){ + LOG.info("TAMAYA: Checking for meta-configuration..."); + URL configFile = getDefaultMetaConfig(); + if(configFile==null){ + LOG.warning("TAMAYA: No " + CONFIG_RESOURCE + " found, using defaults."); + } + configure(configFile, classLoader); + } + + /** + * Creates a new {@link Config} using {@link #createConfig(URL)} + * and applies it as default configuration using {@link ConfigProviderResolver#registerConfig(Config, ClassLoader)} . + * @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration. + */ + public static void configure(URL metaConfig, ClassLoader classloader){ + try { + // Let readers do their work + Config config = createConfig(metaConfig); + ConfigProviderResolver.instance().registerConfig(config, classloader); + }catch(Exception e){ + LOG.log(Level.SEVERE, "TAMAYA: Error loading configuration.", e); + } + } + + private static URL getDefaultMetaConfig() { + // 1: check tamaya-config system property + String tamayaConfig = System.getProperty("tamaya-config"); + if(tamayaConfig!=null){ + File file = new File(tamayaConfig); + if(!file.exists() || !file.canRead() || !file.isFile()){ + LOG.severe("TAMAYA: Not a valid config file: " + tamayaConfig); + }else{ + try { + return file.toURI().toURL(); + } catch (MalformedURLException e) { + LOG.severe("TAMAYA: Invalid file name: " + tamayaConfig); + } + } + } + return MetaConfig.class.getClassLoader().getResource(CONFIG_RESOURCE); + } + + /** + * Performs initialization of a new configuration + * context to the {@link MetaConfigReader} instances found in the current + * {@link ServiceContext} and returns the corresponding builder + * instance. + * @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration. + * @return a new configuration context builder, never null. + * @throws IllegalStateException If the URL cannot be read. + */ + public static ConfigBuilder 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()); + ConfigBuilder builder = ConfigProviderResolver.instance().getBuilder(); + for(MetaConfigReader reader: ServiceContextManager.getServiceContext().getServices( + MetaConfigReader.class + )){ + LOG.fine("TAMAYA: Executing MetaConfig-Reader: " + reader.getClass().getName() + "..."); + reader.read(document, builder); + } + return builder; + } catch (SAXException | IOException | ParserConfigurationException e) { + throw new IllegalStateException("Cannot read meta-config from " + metaConfig, e); + } + } + + /** + * Reads the meta-configuration and delegates initialization of the current configuration + * context to the {@link MetaConfigReader} instances found in the current + * {@link ServiceContext}. + * @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration. + * @return the new configuration instance. + */ + public static Config createConfig(URL metaConfig){ + return createConfigBuilder(metaConfig).build(); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/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 deleted file mode 100644 index 5729e6b..0000000 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/MetaConfiguration.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.tamaya.metamodel; - -import org.apache.tamaya.base.ServiceContext; -import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; -import org.apache.tamaya.base.ServiceContextManager; -import org.w3c.dom.Document; -import org.xml.sax.SAXException; - -import javax.config.Config; -import javax.config.spi.ConfigBuilder; -import javax.config.spi.ConfigProviderResolver; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Objects; -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * Accessor singleton for accessing/loading meta-configuration. - */ -public final class MetaConfiguration { - - private static final String CONFIG_RESOURCE = "tamaya-config.xml"; - - private static final Logger LOG = Logger.getLogger(MetaConfiguration.class.getName()); - - /** - * Singleton constructor. - */ - private MetaConfiguration(){} - - /** - * Creates a new {@link Config} using {@link #createConfiguration(URL)} - * and applies it as default configuration using {@link ConfigProviderResolver#registerConfig(Config, ClassLoader)} . - */ - public static void configure(ClassLoader classLoader){ - LOG.info("TAMAYA: Checking for meta-configuration..."); - URL configFile = getDefaultMetaConfig(); - if(configFile==null){ - LOG.warning("TAMAYA: No " + CONFIG_RESOURCE + " found, using defaults."); - } - configure(configFile, classLoader); - } - - /** - * Creates a new {@link Config} using {@link #createConfiguration(URL)} - * and applies it as default configuration using {@link ConfigProviderResolver#registerConfig(Config, ClassLoader)} . - * @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration. - */ - public static void configure(URL metaConfig, ClassLoader classloader){ - try { - // Let readers do their work - Config config = createConfiguration(metaConfig); - ConfigProviderResolver.instance().registerConfig(config, classloader); - }catch(Exception e){ - LOG.log(Level.SEVERE, "TAMAYA: Error loading configuration.", e); - } - } - - private static URL getDefaultMetaConfig() { - // 1: check tamaya-config system property - String tamayaConfig = System.getProperty("tamaya-config"); - if(tamayaConfig!=null){ - File file = new File(tamayaConfig); - if(!file.exists() || !file.canRead() || !file.isFile()){ - LOG.severe("TAMAYA: Not a valid config file: " + tamayaConfig); - }else{ - try { - return file.toURI().toURL(); - } catch (MalformedURLException e) { - LOG.severe("TAMAYA: Invalid file name: " + tamayaConfig); - } - } - } - return MetaConfiguration.class.getClassLoader().getResource(CONFIG_RESOURCE); - } - - /** - * Performs initialization of a new configuration - * context to the {@link MetaConfigurationReader} instances found in the current - * {@link ServiceContext} and returns the corresponding builder - * instance. - * @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration. - * @return a new configuration context builder, never null. - * @throws IllegalStateException If the URL cannot be read. - */ - public static ConfigBuilder 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()); - ConfigBuilder builder = ConfigProviderResolver.instance().getBuilder(); - for(MetaConfigurationReader reader: ServiceContextManager.getServiceContext().getServices( - MetaConfigurationReader.class - )){ - LOG.fine("TAMAYA: Executing MetaConfig-Reader: " + reader.getClass().getName() + "..."); - reader.read(document, builder); - } - return builder; - } catch (SAXException | IOException | ParserConfigurationException e) { - throw new IllegalStateException("Cannot read meta-config from " + metaConfig, e); - } - } - - /** - * Reads the meta-configuration and delegates initialization of the current configuration - * context to the {@link MetaConfigurationReader} instances found in the current - * {@link ServiceContext}. - * @param metaConfig URL for loading the {@code tamaya-config.xml} meta-configuration. - * @return the new configuration instance. - */ - public static Config createConfiguration(URL metaConfig){ - return createConfigBuilder(metaConfig).build(); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/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 0291721..4b506af 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 @@ -21,7 +21,7 @@ package org.apache.tamaya.metamodel.internal; 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.metamodel.spi.MetaConfigReader; import org.apache.tamaya.base.ConfigValueCombinationPolicy; import org.apache.tamaya.base.TamayaConfigBuilder; import org.osgi.service.component.annotations.Component; @@ -37,7 +37,7 @@ import java.util.logging.Logger; * Metaconfiguration reader that reads the configuration combination policy to be used. */ @Component -public class CombinationPolicyReader implements MetaConfigurationReader{ +public class CombinationPolicyReader implements MetaConfigReader { private static final Logger LOG = Logger.getLogger(CombinationPolicyReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java index 5eb3ad9..235b892 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceOrderingReader.java @@ -20,7 +20,7 @@ package org.apache.tamaya.metamodel.internal; 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.metamodel.spi.MetaConfigReader; import org.apache.tamaya.base.TamayaConfigBuilder; import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; @@ -38,7 +38,7 @@ import java.util.logging.Logger; */ @Component @Priority(Integer.MAX_VALUE) -public class ConfigSourceOrderingReader implements MetaConfigurationReader{ +public class ConfigSourceOrderingReader implements MetaConfigReader { private static final Logger LOG = Logger.getLogger(ConfigSourceOrderingReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java index fc10ce0..0ee7b7f 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConfigSourceReader.java @@ -26,7 +26,7 @@ import org.apache.tamaya.metamodel.ext.RefreshableConfigSource; import org.apache.tamaya.metamodel.ext.RefreshableConfigSourceProvider; 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.metamodel.spi.MetaConfigReader; import org.apache.tamaya.base.filter.Filter; import org.apache.tamaya.base.ServiceContext; import org.osgi.service.component.annotations.Component; @@ -45,7 +45,7 @@ import java.util.logging.Logger; * Metaconfiguration reader to read property sources and property source providers. */ @Component -public class ConfigSourceReader implements MetaConfigurationReader{ +public class ConfigSourceReader implements MetaConfigReader { private static final Logger LOG = Logger.getLogger(ConfigSourceReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConverterReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConverterReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConverterReader.java index 77b85af..d2814fc 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConverterReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/ConverterReader.java @@ -20,7 +20,7 @@ package org.apache.tamaya.metamodel.internal; 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.metamodel.spi.MetaConfigReader; import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -36,7 +36,7 @@ import java.util.logging.Logger; * Metaconfiguration reader to read property sources and property source providers. */ @Component -public class ConverterReader implements MetaConfigurationReader{ +public class ConverterReader implements MetaConfigReader { private static final Logger LOG = Logger.getLogger(ConverterReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLBasedConfigFactory.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLBasedConfigFactory.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLBasedConfigFactory.java index 52ed876..81af555 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLBasedConfigFactory.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLBasedConfigFactory.java @@ -22,7 +22,7 @@ import org.apache.tamaya.base.DefaultConfigBuilder; import org.apache.tamaya.base.configsource.ConfigSourceComparator; import org.apache.tamaya.base.filter.FilterComparator; import org.apache.tamaya.core.TamayaConfigProviderResolver; -import org.apache.tamaya.metamodel.MetaConfiguration; +import org.apache.tamaya.metamodel.MetaConfig; import org.osgi.service.component.annotations.Component; import javax.annotation.Priority; @@ -30,9 +30,9 @@ import javax.config.Config; /** - * ConfigFactory that uses {@link MetaConfiguration} to create new Config instances for + * ConfigFactory that uses {@link MetaConfig} to create new Config instances for * the Tamaya Configuration System. This class is not usable when an alternate - * Configuration implementation is active. Instead use the methods in {@link MetaConfiguration} + * Configuration implementation is active. Instead use the methods in {@link MetaConfig} * to configure/setup your configuration system. */ @Priority(1) @@ -41,7 +41,7 @@ public class DSLBasedConfigFactory implements TamayaConfigProviderResolver.Confi @Override public Config createConfig(ClassLoader classLoader) { - MetaConfiguration.configure(classLoader); + MetaConfig.configure(classLoader); return new DefaultConfigBuilder() .addDiscoveredConverters() .addDiscoveredFilters() http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java index a9ed765..c59cbb9 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterOrderingReader.java @@ -20,7 +20,7 @@ package org.apache.tamaya.metamodel.internal; 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.metamodel.spi.MetaConfigReader; import org.apache.tamaya.base.TamayaConfigBuilder; import org.osgi.service.component.annotations.Component; import org.w3c.dom.Document; @@ -38,7 +38,7 @@ import java.util.logging.Logger; */ @Component @Priority(Integer.MAX_VALUE) -public class FilterOrderingReader implements MetaConfigurationReader{ +public class FilterOrderingReader implements MetaConfigReader { private static final Logger LOG = Logger.getLogger(FilterOrderingReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java index 041a22a..a997882 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/FilterReader.java @@ -21,7 +21,7 @@ package org.apache.tamaya.metamodel.internal; 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.metamodel.spi.MetaConfigReader; import org.apache.tamaya.base.filter.Filter; import org.apache.tamaya.base.TamayaConfigBuilder; import org.osgi.service.component.annotations.Component; @@ -38,7 +38,7 @@ import java.util.logging.Logger; * Metaconfiguration reader that reads the configuration filters to be used. */ @Component -public class FilterReader implements MetaConfigurationReader{ +public class FilterReader implements MetaConfigReader { private static final Logger LOG = Logger.getLogger(FilterReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/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 dc484e5..d5f1e71 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 @@ -19,7 +19,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.MetaConfigReader; import org.apache.tamaya.metamodel.spi.SimpleResolver; import org.apache.tamaya.base.ServiceContextManager; import org.osgi.service.component.annotations.Component; @@ -41,7 +41,7 @@ import java.util.logging.Logger; */ @Priority(-1) @Component -public class MetaContextReader implements MetaConfigurationReader { +public class MetaContextReader implements MetaConfigReader { private static final Logger LOG = Logger.getLogger(MetaContextReader.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigReader.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigReader.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigReader.java new file mode 100644 index 0000000..3f31d08 --- /dev/null +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigReader.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.tamaya.metamodel.spi; + +import org.apache.tamaya.base.ServiceContext; +import org.w3c.dom.Document; + +import javax.config.spi.ConfigBuilder; + +/** + * Reader that reads meta configuration from the meta configuration XML source. + * This SPI allows to allow different aspects to be configured by different modules. + */ +public interface MetaConfigReader { + + /** + * Reads meta-configuration from the given document and configures the current + * context builder. The priority of readers is determined by the priorization policy + * implemented by the {@link ServiceContext}, + * @param document the meta-configuration document + * @param configBuilder the config builder to use. + */ + void read(Document document, ConfigBuilder configBuilder); + +} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/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 deleted file mode 100644 index 4cbb4fd..0000000 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/spi/MetaConfigurationReader.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.tamaya.metamodel.spi; - -import org.apache.tamaya.base.ServiceContext; -import org.w3c.dom.Document; - -import javax.config.spi.ConfigBuilder; - -/** - * Reader that reads meta configuration from the meta configuration XML source. - * This SPI allows to allow different aspects to be configured by different modules. - */ -public interface MetaConfigurationReader { - - /** - * Reads meta-configuration from the given document and configures the current - * context builder. The priority of readers is determined by the priorization policy - * implemented by the {@link ServiceContext}, - * @param document the meta-configuration document - * @param configBuilder the config builder to use. - */ - void read(Document document, ConfigBuilder configBuilder); - -} http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigReader ---------------------------------------------------------------------- diff --git a/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigReader b/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigReader new file mode 100644 index 0000000..e3bb4f8 --- /dev/null +++ b/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigReader @@ -0,0 +1,25 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +org.apache.tamaya.metamodel.internal.FilterReader +org.apache.tamaya.metamodel.internal.ConverterReader +org.apache.tamaya.metamodel.internal.ConfigSourceReader +org.apache.tamaya.metamodel.internal.MetaContextReader +org.apache.tamaya.metamodel.internal.CombinationPolicyReader +org.apache.tamaya.metamodel.internal.FilterOrderingReader +org.apache.tamaya.metamodel.internal.ConfigSourceOrderingReader \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader ---------------------------------------------------------------------- diff --git a/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader b/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader deleted file mode 100644 index e3bb4f8..0000000 --- a/metamodel/src/main/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader +++ /dev/null @@ -1,25 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -# -org.apache.tamaya.metamodel.internal.FilterReader -org.apache.tamaya.metamodel.internal.ConverterReader -org.apache.tamaya.metamodel.internal.ConfigSourceReader -org.apache.tamaya.metamodel.internal.MetaContextReader -org.apache.tamaya.metamodel.internal.CombinationPolicyReader -org.apache.tamaya.metamodel.internal.FilterOrderingReader -org.apache.tamaya.metamodel.internal.ConfigSourceOrderingReader \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/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 ad974df..cda823d 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 @@ -22,7 +22,7 @@ import org.apache.tamaya.base.ConfigContext; import org.apache.tamaya.base.ConfigContextSupplier; import org.apache.tamaya.base.filter.Filter; import org.apache.tamaya.metamodel.CachedFilter; -import org.apache.tamaya.metamodel.MetaConfiguration; +import org.apache.tamaya.metamodel.MetaConfig; import org.apache.tamaya.metamodel.MetaContext; import org.junit.Test; @@ -49,7 +49,7 @@ public class IntegrationTest { @Test public void testEmptyConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/empty-config.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/empty-config.xml")); assertNotNull(config); assertTrue(!config.getPropertyNames().iterator().hasNext()); assertTrue(!config.getConfigSources().iterator().hasNext()); @@ -62,7 +62,7 @@ public class IntegrationTest { @Test public void testMetaContextConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/context-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/context-test.xml")); assertNotNull(config); assertFalse(config.getPropertyNames().iterator().hasNext()); if(config instanceof ConfigContextSupplier) { @@ -80,7 +80,7 @@ public class IntegrationTest { @Test public void testDefaultConvertersConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/default-propertyconverters-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/default-propertyconverters-test.xml")); assertNotNull(config); assertFalse(config.getConfigSources().iterator().hasNext()); assertFalse(config.getPropertyNames().iterator().hasNext()); @@ -93,7 +93,7 @@ public class IntegrationTest { @Test public void testDefaultPropertySourcesConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/default-propertysources-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/default-propertysources-test.xml")); assertNotNull(config); assertTrue(config.getPropertyNames().iterator().hasNext()); assertTrue(config.getConfigSources().iterator().hasNext()); @@ -106,7 +106,7 @@ public class IntegrationTest { @Test public void testDefaultPropertyFiltersConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/default-propertyfilters-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/default-propertyfilters-test.xml")); assertNotNull(config); assertFalse(config.getPropertyNames().iterator().hasNext()); assertFalse(config.getConfigSources().iterator().hasNext()); @@ -119,7 +119,7 @@ public class IntegrationTest { @Test public void testPropertyFiltersConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/propertyfilters-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/propertyfilters-test.xml")); assertNotNull(config); assertFalse(config.getPropertyNames().iterator().hasNext()); assertFalse(config.getConfigSources().iterator().hasNext()); @@ -134,7 +134,7 @@ public class IntegrationTest { @Test public void testPropertyConvertersConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/propertyconverters-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/propertyconverters-test.xml")); assertNotNull(config); assertFalse(config.getPropertyNames().iterator().hasNext()); assertFalse(config.getConfigSources().iterator().hasNext()); @@ -150,7 +150,7 @@ public class IntegrationTest { @Test public void testPropertySourcesConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/propertysources-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/propertysources-test.xml")); assertNotNull(config); assertTrue(config.getPropertyNames().iterator().hasNext()); assertTrue(config.getConfigSources().iterator().hasNext()); @@ -164,7 +164,7 @@ public class IntegrationTest { @Test public void testPropertyFilterConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/propertyfilter-config-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/propertyfilter-config-test.xml")); assertNotNull(config); assertFalse(config.getPropertyNames().iterator().hasNext()); assertFalse(config.getConfigSources().iterator().hasNext()); @@ -186,7 +186,7 @@ public class IntegrationTest { @Test public void testPropertySourceConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/propertysource-config-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/propertysource-config-test.xml")); assertNotNull(config); assertFalse(config.getPropertyNames().iterator().hasNext()); assertTrue(config.getConfigSources().iterator().hasNext()); @@ -211,7 +211,7 @@ public class IntegrationTest { @Test public void testPropertyConverterConfig(){ - Config config = MetaConfiguration.createConfiguration(getConfig("IntegrationTests/propertyconverter-config-test.xml")); + Config config = MetaConfig.createConfig(getConfig("IntegrationTests/propertyconverter-config-test.xml")); assertNotNull(config); assertFalse(config.getPropertyNames().iterator().hasNext()); assertFalse(config.getConfigSources().iterator().hasNext()); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/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 1018a10..3756c8e 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 @@ -18,7 +18,7 @@ */ package org.apache.tamaya.metamodel.internal.resolver; -import org.apache.tamaya.metamodel.spi.MetaConfigurationReader; +import org.apache.tamaya.metamodel.spi.MetaConfigReader; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -36,7 +36,7 @@ import java.util.TimerTask; /** * Created by atsticks on 01.05.17. */ -public class LoggingReader implements MetaConfigurationReader{ +public class LoggingReader implements MetaConfigReader { private static final JavaResolver resolver = new JavaResolver(); http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigReader ---------------------------------------------------------------------- diff --git a/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigReader b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigReader new file mode 100644 index 0000000..ace072c --- /dev/null +++ b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigReader @@ -0,0 +1,19 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# +org.apache.tamaya.metamodel.internal.resolver.LoggingReader \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/856e060b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader ---------------------------------------------------------------------- diff --git a/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader b/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader deleted file mode 100644 index ace072c..0000000 --- a/metamodel/src/test/resources/META-INF/services/org.apache.tamaya.metamodel.spi.MetaConfigurationReader +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -# -org.apache.tamaya.metamodel.internal.resolver.LoggingReader \ No newline at end of file
