Repository: incubator-tamaya Updated Branches: refs/heads/master a55d1c973 -> d18afb105
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java b/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java index 63a9aaa..cd99d9c 100644 --- a/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java +++ b/core/src/test/java/org/apache/tamaya/simple/SimplePropertiesAndCLISample.java @@ -51,7 +51,7 @@ public class SimplePropertiesAndCLISample{ cfgMap.put("param1", "value1"); cfgMap.put("a", "Adrian"); // overrides Anatole Configuration config = ConfigurationBuilder.of("myTestConfig").addResources( - "classpath:test.properties").addConfigMaps(AggregationPolicy.OVERRIDE, + "classpath:test.properties").addConfigMaps(AggregationPolicy.OVERRIDE(), PropertyProviders .fromPaths("classpath:cfg/test.xml"), PropertyProviders.fromArgs(new String[]{"-arg1", "--fullarg", "fullValue", "-myflag"}), http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties/UC1ReadPropertiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties/UC1ReadPropertiesTest.java b/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties/UC1ReadPropertiesTest.java index 2105c94..0bb8b8a 100644 --- a/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties/UC1ReadPropertiesTest.java +++ b/core/src/test/java/org/apache/tamaya/ucs/UC1ReadProperties/UC1ReadPropertiesTest.java @@ -5,7 +5,7 @@ * 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 + * with the License. You may obtain a copy current the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -38,11 +38,11 @@ import static org.junit.Assert.assertNotNull; * <ul> * <li>access a value by key (+get+)</li> * <li>check if a value is present (+containsKey+)</li> - * <li>get a set of all defined keys (+keySet+)</li> + * <li>get a set current all defined keys (+keySet+)</li> * <li>a property provider must be convertible to a +Map+, by calling +toMap()+</li> * <li>a property provider must get access to its meta information.</li> * </ul> - * Additionally there are other requirement important for ease of use: + * Additionally there are other requirement important for ease current use: * <ul> * <li>The API must never return null.</li> * <li>The API should support undefined values.</li> @@ -142,7 +142,7 @@ public class UC1ReadPropertiesTest { @Test public void readAllPropertiesTest() { - PropertyProvider provider = PropertyProviders.fromPaths(AggregationPolicy.IGNORE, "classpath:ucs/UC1ReadProperties/UC1ReadPropertiesTest.*"); + PropertyProvider provider = PropertyProviders.fromPaths(AggregationPolicy.IGNORE_DUPLICATES(), "classpath:ucs/UC1ReadProperties/UC1ReadPropertiesTest.*"); assertNotNull(provider); // fromMap ini file assertEquals(provider.get("a.b.c").get(), "abcValue-fromIni"); http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties/UC2CombinePropertiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties/UC2CombinePropertiesTest.java b/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties/UC2CombinePropertiesTest.java new file mode 100644 index 0000000..d887589 --- /dev/null +++ b/core/src/test/java/org/apache/tamaya/ucs/UC2CombineProperties/UC2CombinePropertiesTest.java @@ -0,0 +1,74 @@ +/** + * 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 current 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.ucs.UC2CombineProperties; + +import org.apache.tamaya.*; +import org.junit.Test; + +import java.util.Map; +import java.util.function.BiFunction; +import java.util.stream.Collectors; + +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assert.*; + +/** + * Configuration is organized as key/value pairs. This basically can be modeled as {@code Map<String,String>} + * Configuration should be as simple as possible. Advanced use cases can often easily implemented by combining + * multiple property maps and applying hereby some combination policy. This test class demonstrates the different + * options Tamaya is providing and the according mechanisms. + */ +public class UC2CombinePropertiesTest { + + /** + * The most common use cases is aggregating two property providers to new provider, hereby {@link org.apache.tamaya.AggregationPolicy} + * defines the current variants supported. + */ + @Test + public void simpleAggregationTests() { + PropertyProvider props1 = PropertyProviders.fromPaths("classpath:ucs/UC2CombineProperties/props1.properties"); + PropertyProvider props2 = PropertyProviders.fromPaths("classpath:ucs/UC2CombineProperties/props2.properties"); + PropertyProvider unionOverriding = PropertyProviders.aggregate(AggregationPolicy.OVERRIDE(), props1, props2); + System.out.println("unionOverriding: " + unionOverriding); + PropertyProvider unionIgnoringDuplicates = PropertyProviders.aggregate(AggregationPolicy.IGNORE_DUPLICATES(), props1, props2); + System.out.println("unionIgnoringDuplicates: " + unionIgnoringDuplicates); + PropertyProvider unionCombined = PropertyProviders.aggregate(AggregationPolicy.COMBINE(), props1, props2); + System.out.println("unionCombined: " + unionCombined); + try{ + PropertyProviders.aggregate(AggregationPolicy.EXCEPTION(), props1, props2); + } + catch(ConfigException e){ + // expected! + } + } + + /** + * For advanced use cases aggregation . + */ + @Test + public void dynamicAggregationTests() { + PropertyProvider props1 = PropertyProviders.fromPaths("classpath:ucs/UC2CombineProperties/props1.properties"); + PropertyProvider props2 = PropertyProviders.fromPaths("classpath:ucs/UC2CombineProperties/props2.properties"); + PropertyProvider props = PropertyProviders.aggregate((k, v1, v2) -> (v1 != null ? v1 : "") + '[' + v2 + "]", MetaInfo.of("dynamicAggregationTests"), + props1, props2); + System.out.println(props); + } + + +} http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/beans.xml b/core/src/test/resources/META-INF/beans.xml index f1fdb07..1d5c20b 100644 --- a/core/src/test/resources/META-INF/beans.xml +++ b/core/src/test/resources/META-INF/beans.xml @@ -6,7 +6,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/config.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/config.properties b/core/src/test/resources/META-INF/config.properties index cc8170a..d7b8927 100644 --- a/core/src/test/resources/META-INF/config.properties +++ b/core/src/test/resources/META-INF/config.properties @@ -5,7 +5,7 @@ # 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 +# with the License. You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/config/example.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/config/example.properties b/core/src/test/resources/META-INF/config/example.properties index 3b0047b..93d70f9 100644 --- a/core/src/test/resources/META-INF/config/example.properties +++ b/core/src/test/resources/META-INF/config/example.properties @@ -5,7 +5,7 @@ # 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 +# with the License. You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/config/example.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/config/example.xml b/core/src/test/resources/META-INF/config/example.xml index 1b0fafa..e3c050a 100644 --- a/core/src/test/resources/META-INF/config/example.xml +++ b/core/src/test/resources/META-INF/config/example.xml @@ -4,7 +4,7 @@ # Copyright 2014 Anatole Tresch and other (see authors). # # you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/env/application.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/env/application.properties b/core/src/test/resources/META-INF/env/application.properties index 35164b9..1807045 100644 --- a/core/src/test/resources/META-INF/env/application.properties +++ b/core/src/test/resources/META-INF/env/application.properties @@ -5,7 +5,7 @@ # 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 +# with the License. You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/env/system.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/env/system.properties b/core/src/test/resources/META-INF/env/system.properties index 27415a0..af76f44 100644 --- a/core/src/test/resources/META-INF/env/system.properties +++ b/core/src/test/resources/META-INF/env/system.properties @@ -5,7 +5,7 @@ # 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 +# with the License. You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/meta-model.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/meta-model.properties b/core/src/test/resources/META-INF/meta-model.properties index 2872cad..f3199f2 100644 --- a/core/src/test/resources/META-INF/meta-model.properties +++ b/core/src/test/resources/META-INF/meta-model.properties @@ -5,7 +5,7 @@ # 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 +# with the License. You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi b/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi index 7b9ed48..9e8983f 100644 --- a/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi +++ b/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi @@ -5,7 +5,7 @@ # 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 +# with the License. You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.PropertyAdaptersSingletonSpi ---------------------------------------------------------------------- diff --git a/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.PropertyAdaptersSingletonSpi b/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.PropertyAdaptersSingletonSpi deleted file mode 100644 index b546a27..0000000 --- a/core/src/test/resources/META-INF/services/org.apache.tamaya.core.spi.PropertyAdaptersSingletonSpi +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright 2014 Anatole Tresch and other (see authors). -# -# 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. -# - http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/cfg/test.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/cfg/test.xml b/core/src/test/resources/cfg/test.xml index 923cc79..fc65101 100644 --- a/core/src/test/resources/cfg/test.xml +++ b/core/src/test/resources/cfg/test.xml @@ -6,7 +6,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/test.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/test.properties b/core/src/test/resources/test.properties index 2f752c2..6798ad9 100644 --- a/core/src/test/resources/test.properties +++ b/core/src/test/resources/test.properties @@ -5,7 +5,7 @@ # 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 +# with the License. You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/ucs/UC1ReadProperties/UC1ReadPropertiesTest.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/ucs/UC1ReadProperties/UC1ReadPropertiesTest.xml b/core/src/test/resources/ucs/UC1ReadProperties/UC1ReadPropertiesTest.xml index 425233c..535134f 100644 --- a/core/src/test/resources/ucs/UC1ReadProperties/UC1ReadPropertiesTest.xml +++ b/core/src/test/resources/ucs/UC1ReadProperties/UC1ReadPropertiesTest.xml @@ -6,7 +6,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/ucs/UC2CombineProperties/props1.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/ucs/UC2CombineProperties/props1.properties b/core/src/test/resources/ucs/UC2CombineProperties/props1.properties new file mode 100644 index 0000000..678bd25 --- /dev/null +++ b/core/src/test/resources/ucs/UC2CombineProperties/props1.properties @@ -0,0 +1,6 @@ +a=a +b=b +c=c +g=g +h=h +i=i \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/resources/ucs/UC2CombineProperties/props2.properties ---------------------------------------------------------------------- diff --git a/core/src/test/resources/ucs/UC2CombineProperties/props2.properties b/core/src/test/resources/ucs/UC2CombineProperties/props2.properties new file mode 100644 index 0000000..3ba720f --- /dev/null +++ b/core/src/test/resources/ucs/UC2CombineProperties/props2.properties @@ -0,0 +1,6 @@ +a=A +b=B +c=C +d=D +e=E +f=F http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/cdi/pom.xml ---------------------------------------------------------------------- diff --git a/modules/cdi/pom.xml b/modules/cdi/pom.xml index 9f12b7a..07f4389 100644 --- a/modules/cdi/pom.xml +++ b/modules/cdi/pom.xml @@ -5,7 +5,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/cdi/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/modules/cdi/src/main/resources/META-INF/beans.xml b/modules/cdi/src/main/resources/META-INF/beans.xml index 7927f8a..adee378 100644 --- a/modules/cdi/src/main/resources/META-INF/beans.xml +++ b/modules/cdi/src/main/resources/META-INF/beans.xml @@ -6,7 +6,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension ---------------------------------------------------------------------- diff --git a/modules/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/modules/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension index 82fbe1d..dbf3f1a 100644 --- a/modules/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension +++ b/modules/cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension @@ -5,7 +5,7 @@ # 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 +# with the License. You may obtain a copy current the License at # # http://www.apache.org/licenses/LICENSE-2.0 # http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/TestConfigProvider.java ---------------------------------------------------------------------- diff --git a/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/TestConfigProvider.java b/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/TestConfigProvider.java index d0fca0b..548ac4d 100644 --- a/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/TestConfigProvider.java +++ b/modules/cdi/src/test/java/org/apache/tamaya/ext/cdi/TestConfigProvider.java @@ -17,19 +17,19 @@ public class TestConfigProvider implements ConfigurationProviderSpi{ public TestConfigProvider(){ final Map<String,String> config = new HashMap<>(); - config.put("a.b.c.key1", "value of a.b.c.key1"); - config.put("a.b.c.key2", "value of a.b.c.key2"); - config.put("a.b.key3", "value of a.b.key3"); - config.put("a.b.key4", "value of a.b.key4"); - config.put("a.key5", "value of a.key5"); - config.put("a.key6", "value of a.key6"); + config.put("a.b.c.key1", "value current a.b.c.key1"); + config.put("a.b.c.key2", "value current a.b.c.key2"); + config.put("a.b.key3", "value current a.b.key3"); + config.put("a.b.key4", "value current a.b.key4"); + config.put("a.key5", "value current a.key5"); + config.put("a.key6", "value current a.key6"); config.put("int1", "123456"); config.put("int2", "111222"); config.put("testProperty", "testPropertyValue!"); config.put("booleanT", "true"); config.put("double1", "1234.5678"); config.put("BD", "123456789123456789123456789123456789.123456789123456789123456789123456789"); - config.put("testProperty", "value of testProperty"); + config.put("testProperty", "value current testProperty"); config.put("runtimeVersion", "${java.version}"); testConfig = Configurations.getConfiguration(MetaInfoBuilder.of().setName("test").build(), () -> config); http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/cdi/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/modules/cdi/src/test/resources/META-INF/beans.xml b/modules/cdi/src/test/resources/META-INF/beans.xml index 7927f8a..adee378 100644 --- a/modules/cdi/src/test/resources/META-INF/beans.xml +++ b/modules/cdi/src/test/resources/META-INF/beans.xml @@ -6,7 +6,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/managed/pom.xml ---------------------------------------------------------------------- diff --git a/modules/managed/pom.xml b/modules/managed/pom.xml index 61c9a39..97c8f73 100644 --- a/modules/managed/pom.xml +++ b/modules/managed/pom.xml @@ -5,7 +5,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java ---------------------------------------------------------------------- diff --git a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java index 0555697..381d43a 100644 --- a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java +++ b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedConfigMBean.java @@ -30,9 +30,9 @@ import java.util.Set; */ public interface ManagedConfigMBean { /** - * Get the names of the configuration's defined. + * Get the names current the configuration's defined. * - * @return the names of the configuration's defined. + * @return the names current the configuration's defined. */ public Set<String> getConfigurationNames(); @@ -49,7 +49,7 @@ public interface ManagedConfigMBean { public String getConfigurationInfo(String configName); /** - * Allows to determine if a configuration of a given type is available (accessible) in the + * Allows to determine if a configuration current a given type is available (accessible) in the * given environment context. * * @param configName the configuration name, not null. @@ -60,7 +60,7 @@ public interface ManagedConfigMBean { public boolean isConfigurationAvailable(String configName, String envType, String envContext); /** - * Allows to determine if a configuration of a given type is loaded in the + * Allows to determine if a configuration current a given type is loaded in the * given environment context. * * @param configName the configuration name, not null. @@ -71,7 +71,7 @@ public interface ManagedConfigMBean { public boolean isConfigurationLoaded(String configName, String envType, String envContext); /** - * Accesses a configuration of a given type as Map. + * Accesses a configuration current a given type as Map. * * @param configName the configuration name, not null. * @param envType the environment context, not null. @@ -83,7 +83,7 @@ public interface ManagedConfigMBean { throws ConfigException; /** - * Accesses a configuration values for of a given config area as Map. + * Accesses a configuration values for current a given config area as Map. * @param area the target area key, not null. * @param configName the configuration name, not null. * @param envType the environment context, not null. @@ -95,7 +95,7 @@ public interface ManagedConfigMBean { throws ConfigException; /** - * Accesses a configuration values for of a given config area as Map. + * Accesses a configuration values for current a given config area as Map. * @param area the target area key, not null. * @param configName the configuration name, not null. * @param envType the environment context, not null. @@ -107,7 +107,7 @@ public interface ManagedConfigMBean { throws ConfigException; /** - * Updates a configuration of a given type. + * Updates a configuration current a given type. * * @param configName the configuration name, not null. * @param envType the environment context, not null. http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java ---------------------------------------------------------------------- diff --git a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java index b91d363..7caff90 100644 --- a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java +++ b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironment.java @@ -51,7 +51,7 @@ public class ManagedEnvironment implements ManagedEnvironmentMBean{ @Override public Map<String, String> getEnvironment(String environmentType, String context) { try { - Optional<Environment> env = Environment.of(environmentType, context); + Optional<Environment> env = Environment.getInstance(environmentType, context); if (env.isPresent()) { return env.get().toMap(); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java ---------------------------------------------------------------------- diff --git a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java index ce5122c..5d86700 100644 --- a/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java +++ b/modules/managed/src/main/java/org/apache/tamaya/management/ManagedEnvironmentMBean.java @@ -67,7 +67,7 @@ public interface ManagedEnvironmentMBean { public Map<String,String> getEnvironment(String environmentContext, String context); /** - * Get a general JSON info on the currently available environments of the form: + * Get a general JSON info on the currently available environments current the form: * <pre> * EnvironmentInfo{ * host: "hostName", http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/managed/src/main/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/modules/managed/src/main/resources/META-INF/beans.xml b/modules/managed/src/main/resources/META-INF/beans.xml index 7927f8a..adee378 100644 --- a/modules/managed/src/main/resources/META-INF/beans.xml +++ b/modules/managed/src/main/resources/META-INF/beans.xml @@ -6,7 +6,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/managed/src/test/resources/META-INF/beans.xml ---------------------------------------------------------------------- diff --git a/modules/managed/src/test/resources/META-INF/beans.xml b/modules/managed/src/test/resources/META-INF/beans.xml index 7927f8a..adee378 100644 --- a/modules/managed/src/test/resources/META-INF/beans.xml +++ b/modules/managed/src/test/resources/META-INF/beans.xml @@ -6,7 +6,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/modules/pom.xml ---------------------------------------------------------------------- diff --git a/modules/pom.xml b/modules/pom.xml index 40771b8..a4be3a3 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -5,7 +5,7 @@ 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 +with the License. You may obtain a copy current the License at http://www.apache.org/licenses/LICENSE-2.0
