You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2014/12/02 11:06:31 UTC
[1/4] incubator-tamaya git commit: TAMAYA-16: Changed
aggregationPolicy to interface.
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
[4/4] incubator-tamaya git commit: TAMAYA-16: Changed
aggregationPolicy to interface.
Posted by an...@apache.org.
TAMAYA-16: Changed aggregationPolicy to interface.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/d18afb10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/d18afb10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/d18afb10
Branch: refs/heads/master
Commit: d18afb1055fe2323c42029dac1cac0005bea3aa3
Parents: a55d1c9
Author: anatole <an...@apache.org>
Authored: Tue Dec 2 11:06:18 2014 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Dec 2 11:06:19 2014 +0100
----------------------------------------------------------------------
api/pom.xml | 2 +-
.../org/apache/tamaya/AggregationPolicy.java | 36 +++++-
.../java/org/apache/tamaya/ConfigChangeSet.java | 14 +--
.../apache/tamaya/ConfigChangeSetBuilder.java | 38 +++---
.../java/org/apache/tamaya/ConfigOperator.java | 4 +-
.../java/org/apache/tamaya/Configuration.java | 26 ++---
.../org/apache/tamaya/ConfigurationManager.java | 4 +-
.../java/org/apache/tamaya/Environment.java | 28 ++---
.../org/apache/tamaya/EnvironmentManager.java | 18 +--
.../main/java/org/apache/tamaya/MetaInfo.java | 10 +-
.../java/org/apache/tamaya/MetaInfoBuilder.java | 8 +-
.../java/org/apache/tamaya/PropertyAdapter.java | 2 +-
.../org/apache/tamaya/PropertyProvider.java | 10 +-
.../org/apache/tamaya/PropertyProviders.java | 65 ++++++-----
.../tamaya/annot/ConfigChangeListener.java | 2 +-
.../tamaya/annot/ConfiguredProperties.java | 8 +-
.../apache/tamaya/annot/ConfiguredProperty.java | 8 +-
.../org/apache/tamaya/annot/DefaultAreas.java | 2 +-
.../org/apache/tamaya/annot/LoadPolicy.java | 2 +-
.../org/apache/tamaya/annot/WithConfig.java | 4 +-
.../apache/tamaya/annot/WithConfigOperator.java | 2 +-
.../spi/ConfigurationManagerSingletonSpi.java | 4 +-
.../tamaya/spi/DefaultServiceProvider.java | 8 +-
.../spi/EnvironmentManagerSingletonSpi.java | 20 ++--
.../spi/PropertyProvidersSingletonSpi.java | 20 ++--
.../org/apache/tamaya/spi/ServiceProvider.java | 6 +-
.../TestConfigServiceSingletonSpi.java | 16 +--
.../TestPropertyAdaptersSingletonSpi.java | 2 +-
core/pom.xml | 2 +-
.../core/config/AbstractConfiguration.java | 4 +-
.../core/config/ConfigurationBuilder.java | 2 +-
.../core/config/ConfigurationFormats.java | 6 +-
.../config/EnvPropertiesConfigProvider.java | 2 +-
.../core/config/FreezedConfiguration.java | 2 +-
.../config/SystemPropertiesConfigProvider.java | 2 +-
.../core/env/ConfiguredSystemProperties.java | 4 +-
.../tamaya/core/env/EnvironmentSelector.java | 2 +-
.../internal/AggregatedPropertyProvider.java | 39 ++-----
.../internal/ContextualPropertyProvider.java | 6 +-
.../core/internal/DefaultConfigProvider.java | 2 +-
...DefaultConfigurationManagerSingletonSpi.java | 4 +-
.../internal/DefaultExpressionEvaluator.java | 4 +-
.../DefaultPropertyProvidersSingletonSpi.java | 20 ++--
.../tamaya/core/internal/DefaultStage.java | 2 +-
.../internal/DelegatingPropertyProvider.java | 4 +-
.../core/internal/FreezedPropertyProvider.java | 2 +-
.../internal/PathBasedPropertyProvider.java | 20 +---
.../internal/ReplacingPropertyProvider.java | 2 +-
.../tamaya/core/internal/StageBuilder.java | 2 +-
.../core/internal/UriBasedPropertyProvider.java | 21 +---
.../tamaya/core/internal/el/ELResolver.java | 4 +-
.../core/internal/inject/ConfiguredField.java | 12 +-
.../inject/ConfiguredInstancesManager.java | 2 +-
.../core/internal/inject/ConfiguredMethod.java | 10 +-
.../logging/AbstractDelegatingLogger.java | 2 +-
.../core/internal/logging/Log4j2Logger.java | 2 +-
.../core/internal/logging/Log4jLogger.java | 4 +-
.../core/internal/logging/Slf4jLogger.java | 2 +-
.../io/AbstractFileResolvingResource.java | 6 +-
.../internal/resources/io/AbstractResource.java | 6 +-
.../internal/resources/io/AntPathMatcher.java | 28 ++---
.../resources/io/ClassPathResource.java | 8 +-
.../core/internal/resources/io/ClassUtils.java | 116 +++++++++----------
.../resources/io/DefaultResourceLoader.java | 8 +-
.../resources/io/FileSystemResource.java | 14 +--
.../resources/io/InputStreamResource.java | 4 +-
.../io/PathMatchingResourcePatternResolver.java | 64 +++++-----
.../internal/resources/io/ReflectionUtils.java | 20 ++--
.../core/internal/resources/io/Resource.java | 12 +-
.../internal/resources/io/ResourceUtils.java | 6 +-
.../core/internal/resources/io/StringUtils.java | 104 ++++++++---------
.../core/internal/resources/io/UrlResource.java | 8 +-
.../core/internal/resources/io/VfsResource.java | 2 +-
.../core/internal/resources/io/VfsUtils.java | 2 +-
.../internal/resources/io/WritableResource.java | 4 +-
.../properties/AbstractPropertyProvider.java | 2 +-
.../MapBasedPropertyProviderBuilder.java | 2 +-
.../properties/PropertyProviderManager.java | 8 +-
.../apache/tamaya/core/properties/Store.java | 2 +-
.../tamaya/core/spi/ConfigurationFormat.java | 2 +-
.../spi/ConfigurationFormatsSingletonSpi.java | 4 +-
.../core/spi/ConfigurationProviderSpi.java | 6 +-
.../tamaya/core/spi/EnvironmentProvider.java | 6 +-
.../tamaya/core/spi/ExpressionResolver.java | 4 +-
.../apache/tamaya/core/spi/ResourceLoader.java | 12 +-
.../resources/META-INF/java-config-1.0.0.xsd | 2 +-
.../src/main/resources/META-INF/java-config.xml | 2 +-
.../resources/META-INF/meta-model.properties | 2 +-
....tamaya.core.internal.resources.PathResolver | 2 +-
...g.apache.tamaya.core.spi.ConfigurationFormat | 2 +-
...ya.core.spi.ConfigurationFormatsSingletonSpi | 2 +-
...che.tamaya.core.spi.ConfigurationProviderSpi | 2 +-
...g.apache.tamaya.core.spi.EnvironmentProvider | 2 +-
...rg.apache.tamaya.core.spi.ExpressionResolver | 2 +-
.../org.apache.tamaya.core.spi.ResourceLoader | 2 +-
....tamaya.spi.ConfigurationManagerSingletonSpi | 2 +-
...he.tamaya.spi.EnvironmentManagerSingletonSpi | 2 +-
...ache.tamaya.spi.PropertyAdaptersSingletonSpi | 2 +-
...che.tamaya.spi.PropertyProvidersSingletonSpi | 2 +-
.../org.apache.tamaya.spi.StagesSingletonSpi | 2 +-
core/src/main/resources/log4j2.xml | 2 +-
...tionManagerSingletonSpiSingletonSpiTest.java | 6 +-
.../java/org/apache/tamaya/JavaOneDemo.java | 2 +-
.../core/config/EnvironmentManagerTest.java | 2 +-
.../tamaya/core/config/MutableConfigTest.java | 2 +-
.../env/ConfiguredSystemPropertiesTest.java | 3 +-
.../tamaya/core/env/EnvironmentManagerTest.java | 14 +--
.../tamaya/internal/TestConfigProvider.java | 14 +--
.../java/org/apache/tamaya/package-info.java | 4 +
.../samples/annotations/ConfiguredTest.java | 2 +-
.../simple/SimplePropertiesAndCLISample.java | 2 +-
.../UC1ReadPropertiesTest.java | 8 +-
.../UC2CombinePropertiesTest.java | 74 ++++++++++++
core/src/test/resources/META-INF/beans.xml | 2 +-
.../test/resources/META-INF/config.properties | 2 +-
.../META-INF/config/example.properties | 2 +-
.../test/resources/META-INF/config/example.xml | 2 +-
.../META-INF/env/application.properties | 2 +-
.../resources/META-INF/env/system.properties | 2 +-
.../resources/META-INF/meta-model.properties | 2 +-
...che.tamaya.core.spi.ConfigurationProviderSpi | 2 +-
...tamaya.core.spi.PropertyAdaptersSingletonSpi | 15 ---
core/src/test/resources/cfg/test.xml | 2 +-
core/src/test/resources/test.properties | 2 +-
.../UC1ReadProperties/UC1ReadPropertiesTest.xml | 2 +-
.../ucs/UC2CombineProperties/props1.properties | 6 +
.../ucs/UC2CombineProperties/props2.properties | 6 +
modules/cdi/pom.xml | 2 +-
.../cdi/src/main/resources/META-INF/beans.xml | 2 +-
.../javax.enterprise.inject.spi.Extension | 2 +-
.../tamaya/ext/cdi/TestConfigProvider.java | 14 +--
.../cdi/src/test/resources/META-INF/beans.xml | 2 +-
modules/managed/pom.xml | 2 +-
.../tamaya/management/ManagedConfigMBean.java | 16 +--
.../tamaya/management/ManagedEnvironment.java | 2 +-
.../management/ManagedEnvironmentMBean.java | 2 +-
.../src/main/resources/META-INF/beans.xml | 2 +-
.../src/test/resources/META-INF/beans.xml | 2 +-
modules/pom.xml | 2 +-
139 files changed, 684 insertions(+), 601 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 5ecc567..78bd2b1 100644
--- a/api/pom.xml
+++ b/api/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/api/src/main/java/org/apache/tamaya/AggregationPolicy.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/AggregationPolicy.java b/api/src/main/java/org/apache/tamaya/AggregationPolicy.java
index 1b02a6c..1eb1a4a 100644
--- a/api/src/main/java/org/apache/tamaya/AggregationPolicy.java
+++ b/api/src/main/java/org/apache/tamaya/AggregationPolicy.java
@@ -21,18 +21,46 @@ package org.apache.tamaya;
/**
* Policy that defines how the different aggregates should be combined.
*/
-public enum AggregationPolicy{
+public interface AggregationPolicy {
+
+ /**
+ * Method which decides how keys/values are aggregated.
+ * @param key the key current the entry
+ * @param value1 the current value, or null.
+ * @param value2 the new value, never null.
+ * @return the target value to be used in the resulting property set, or null, to remove the property.
+ */
+ public String aggregate(String key, String value1, String value2);
+
/** Ignore overrides, only extend (additive). */
- IGNORE,
+ public static AggregationPolicy IGNORE_DUPLICATES() {
+ return (k, v1, v2) -> v1;
+ }
+
+ /** Combine multiple values into a comma separated list. */
+ public static AggregationPolicy COMBINE() {
+ return (k, v1, v2) -> v1 != null && v2 != null ? v1 + ',' + v2: v2;
+ }
+
/**
* Interpret later keys as override (additive and override), replacing
* the key loaded earlier/fromMap previous contained
* {@link org.apache.tamaya.PropertyProvider}.
*/
- OVERRIDE,
+ public static AggregationPolicy OVERRIDE() {
+ return (k, v1, v2) -> v2;
+ }
+
/**
* Throw an exception, when keys are not disjunctive (strictly
* additive).
*/
- EXCEPTION
+ public static AggregationPolicy EXCEPTION() {
+ return (String key, String value, String newValue) -> {
+ if(value!=null && newValue!=null && !value.equals(newValue)){
+ throw new ConfigException("Conflicting values encountered key="+key+", value="+value+", newValue="+newValue);
+ }
+ return newValue;
+ };
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/ConfigChangeSet.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/ConfigChangeSet.java b/api/src/main/java/org/apache/tamaya/ConfigChangeSet.java
index 76a7cea..0a00036 100644
--- a/api/src/main/java/org/apache/tamaya/ConfigChangeSet.java
+++ b/api/src/main/java/org/apache/tamaya/ConfigChangeSet.java
@@ -22,7 +22,7 @@ import java.beans.PropertyChangeEvent;
import java.util.*;
/**
- * Event that contains a set of changes that were applied or could be applied.
+ * Event that contains a set current changes that were applied or could be applied.
* This class is immutable and thread-safe. To create instances use
* {@link ConfigChangeSetBuilder}.
*
@@ -82,24 +82,24 @@ public final class ConfigChangeSet {
}
/**
- * Access the number of removed entries.
- * @return the number of removed entries.
+ * Access the number current removed entries.
+ * @return the number current removed entries.
*/
public int getRemovedSize() {
return (int) this.changes.values().stream().filter((e) -> e.getNewValue() == null).count();
}
/**
- * Access the number of added entries.
- * @return the number of added entries.
+ * Access the number current added entries.
+ * @return the number current added entries.
*/
public int getAddedSize() {
return (int) this.changes.values().stream().filter((e) -> e.getOldValue() == null).count();
}
/**
- * Access the number of updated entries.
- * @return the number of updated entries.
+ * Access the number current updated entries.
+ * @return the number current updated entries.
*/
public int getUpdatedSize() {
return (int) this.changes.values().stream().filter((e) -> e.getOldValue()!=null && e.getNewValue()!=null).count();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/ConfigChangeSetBuilder.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/ConfigChangeSetBuilder.java b/api/src/main/java/org/apache/tamaya/ConfigChangeSetBuilder.java
index 8f21228..be3cba2 100644
--- a/api/src/main/java/org/apache/tamaya/ConfigChangeSetBuilder.java
+++ b/api/src/main/java/org/apache/tamaya/ConfigChangeSetBuilder.java
@@ -23,9 +23,9 @@ import java.time.Instant;
import java.util.*;
/**
- * Models a set of changes to be applied to a configuration/property provider. Such a set can be applied
+ * Models a set current changes to be applied to a configuration/property provider. Such a set can be applied
* to any {@link PropertyProvider} instance. If the provider is mutable it may check the
- * version given and apply the changes to the provider/configuration, including triggering of regarding
+ * version given and apply the changes to the provider/configuration, including triggering current regarding
* change events.
*
* Created by Anatole on 06.09.2014.
@@ -50,7 +50,7 @@ public final class ConfigChangeSetBuilder {
}
/**
- * Creates a new instance of this builder.
+ * Creates a new instance current this builder.
* @param source the underlying property provider/configuration, not null.
* @return the builder for chaining.
*/
@@ -59,7 +59,7 @@ public final class ConfigChangeSetBuilder {
}
/**
- * Creates a new instance of this builder.
+ * Creates a new instance current this builder.
* @param source the underlying property provider/configuration, not null.
* @param baseVersion the base version to be used.
* @return the builder for chaining.
@@ -69,7 +69,7 @@ public final class ConfigChangeSetBuilder {
}
/**
- * Creates a new instance of this builder.
+ * Creates a new instance current this builder.
* @param configuration the base configuration, not null.
* @return the builder for chaining.
*/
@@ -101,7 +101,7 @@ public final class ConfigChangeSetBuilder {
/**
* Get the current values, also considering any changes recorded within this change set.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @return the value, or null.
*/
public String get(String key) {
@@ -114,7 +114,7 @@ public final class ConfigChangeSetBuilder {
/**
* Marks the given key(s) fromMap the configuration/properties to be removed.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param otherKeys additional keys to be removed (convenience), not null.
* @return the builder for chaining.
*/
@@ -136,7 +136,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -147,7 +147,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -158,7 +158,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -169,7 +169,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -180,7 +180,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -191,7 +191,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -202,7 +202,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -213,7 +213,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -224,7 +224,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -235,7 +235,7 @@ public final class ConfigChangeSetBuilder {
/**
* Applies the given value.
- * @param key the key of the entry, not null.
+ * @param key the key current the entry, not null.
* @param value the value to be applied, not null.
* @return the builder for chaining.
*/
@@ -291,11 +291,11 @@ public final class ConfigChangeSetBuilder {
}
/**
- * Compares the two property providers/configurations and creates a collection of all changes
+ * Compares the two property providers/configurations and creates a collection current all changes
* that must be appied to render {@code map1} into {@code map2}.
* @param map1 the source map, not null.
* @param map2 the target map, not null.
- * @return a collection of change events, never null.
+ * @return a collection current change events, never null.
*/
public static Collection<PropertyChangeEvent> compare(PropertyProvider map1, PropertyProvider map2) {
List<PropertyChangeEvent> changes = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/ConfigOperator.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/ConfigOperator.java b/api/src/main/java/org/apache/tamaya/ConfigOperator.java
index b76fa31..edbc9dc 100644
--- a/api/src/main/java/org/apache/tamaya/ConfigOperator.java
+++ b/api/src/main/java/org/apache/tamaya/ConfigOperator.java
@@ -21,14 +21,14 @@ package org.apache.tamaya;
/**
* Interface for an filter/operator that converts a configured String into another String. One typical
- * use case would the the decryption of an encrypted configuration value.
+ * use case would the the decryption current an encrypted configuration value.
*/
@FunctionalInterface
public interface ConfigOperator{
/**
* Method that creates a Configuration fromMap another Configuration. This can be used for implementing
- * views, security constraints or for overriding/inheriting of configuration.
+ * views, security constraints or for overriding/inheriting current configuration.
* @param config The target configuration to be operated, never nnull.
* @return the operated configuration, never null.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/Configuration.java b/api/src/main/java/org/apache/tamaya/Configuration.java
index 7d5500c..f5e2ed7 100644
--- a/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -26,20 +26,20 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
/**
- * A configuration models a aggregated set of properties, identified by a unique key, but adds higher level access functions to
+ * A configuration models a aggregated set current properties, identified by a unique key, but adds higher level access functions to
* a {@link PropertyProvider}. Hereby in most cases a configuration is a wrapper around a composite
* {@link PropertyProvider} instance, which may combine multiple child providers in well defined tree like structure,
- * where nodes define logically the rules of priority, filtering, combination and overriding.
+ * where nodes define logically the rules current priority, filtering, combination and overriding.
* <br/>
* <h3>Implementation Requirements</h3>
- * Implementations of this interface must be
+ * Implementations current this interface must be
* <ul>
* <li>Thread safe.
* <li>Immutable
* </ul>
* It is not recommended that implementations also are serializable, since the any configuration can be <i>freezed</i>
* by reading out its complete configuration map into a serializable and remotable structure. This helps significantly
- * simplifying the development of this interface, e.g. for being backed up by systems and stores that are not part of
+ * simplifying the development current this interface, e.g. for being backed up by systems and stores that are not part current
* this library at all.
*/
public interface Configuration extends PropertyProvider{
@@ -115,7 +115,7 @@ public interface Configuration extends PropertyProvider{
/**
* Get the property value as type {@code Class<T>}.
* <p>
- * If {@code Class<T>} is not one of
+ * If {@code Class<T>} is not one current
* {@code Boolean, Short, Integer, Long, Float, Double, BigInteger,
* BigDecimal, String} , an according adapter must be
* available to perform the conversion fromMap {@link String} to
@@ -140,7 +140,7 @@ public interface Configuration extends PropertyProvider{
/**
* Get the property value as type T. This will implicitly require a corresponding {@link
- * PropertyAdapter} to be available that is capable of providing type T
+ * PropertyAdapter} to be available that is capable current providing type T
* fromMap the given String value.
*
* @param key the property's absolute, or relative path, e.g. @code
@@ -253,7 +253,7 @@ public interface Configuration extends PropertyProvider{
* Field that allows property providers to be versioned, meaning that each change on a provider requires this value
* to be incremented by one. This can be easily used to implement versioning (and optimistic locking)
* in distributed (remote) usage scenarios.
- * @return the version of the current instance, or 'N/A'.
+ * @return the version current the current instance, or 'N/A'.
*/
default String getVersion(){return "N/A";}
@@ -296,7 +296,7 @@ public interface Configuration extends PropertyProvider{
* @return the corresponding Configuration instance, never null.
* @throws ConfigException if no such configuration is defined.
*/
- public static <T> T of(String name, Class<T> template){
+ public static <T> T current(String name, Class<T> template){
return ConfigurationManager.getConfiguration(name, template);
}
@@ -308,7 +308,7 @@ public interface Configuration extends PropertyProvider{
* @return the corresponding Configuration instance, never null.
* @throws ConfigException if no such configuration is defined.
*/
- public static Configuration of(String name){
+ public static Configuration current(String name){
return ConfigurationManager.getConfiguration(name);
}
@@ -318,7 +318,7 @@ public interface Configuration extends PropertyProvider{
* @return the corresponding Configuration instance, never null.
* @throws ConfigException if no such configuration is defined.
*/
- public static Configuration of(){
+ public static Configuration current(){
return ConfigurationManager.getConfiguration();
}
@@ -330,7 +330,7 @@ public interface Configuration extends PropertyProvider{
* @return the corresponding typed Configuration instance, never null.
* @throws ConfigException if the configuration could not be resolved.
*/
- public static <T> T of(Class<T> type){
+ public static <T> T current(Class<T> type){
return ConfigurationManager.getConfiguration(type);
}
@@ -368,7 +368,7 @@ public interface Configuration extends PropertyProvider{
}
/**
- * Adds a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind of config changes.
+ * Adds a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind current config changes.
* @param listener the {@link java.beans.PropertyChangeListener} instance to be added, not null.
*/
public static void addConfigChangeListener(PropertyChangeListener listener){
@@ -376,7 +376,7 @@ public interface Configuration extends PropertyProvider{
}
/**
- * Removes a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind of config changes,
+ * Removes a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind current config changes,
* if one is currently registered.
* @param listener the {@link java.beans.PropertyChangeListener} instance to be removed, not null.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/ConfigurationManager.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/ConfigurationManager.java b/api/src/main/java/org/apache/tamaya/ConfigurationManager.java
index 62cd984..d714f71 100644
--- a/api/src/main/java/org/apache/tamaya/ConfigurationManager.java
+++ b/api/src/main/java/org/apache/tamaya/ConfigurationManager.java
@@ -145,7 +145,7 @@ final class ConfigurationManager{
}
/**
- * Adds a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind of config changes.
+ * Adds a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind current config changes.
* @param listener the {@link java.beans.PropertyChangeListener} instance to be added, not null.
*/
public static void addConfigChangeListener(PropertyChangeListener listener){
@@ -153,7 +153,7 @@ final class ConfigurationManager{
}
/**
- * Removes a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind of config changes,
+ * Removes a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind current config changes,
* if one is currently registered.
* @param listener the {@link java.beans.PropertyChangeListener} instance to be removed, not null.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/Environment.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/Environment.java b/api/src/main/java/org/apache/tamaya/Environment.java
index 46b64a4..ddaff91 100644
--- a/api/src/main/java/org/apache/tamaya/Environment.java
+++ b/api/src/main/java/org/apache/tamaya/Environment.java
@@ -24,11 +24,11 @@ import java.util.Optional;
import java.util.Set;
/**
- * Models a runtime environment. Instances of this class are used to
+ * Models a runtime environment. Instances current this class are used to
* evaluate the correct configuration artifacts.<br/>
* <h3>Implementation Requirements</h3>
* <p>
- * Implementations of this interface must be
+ * Implementations current this interface must be
* <ul>
* <li>Thread safe.
* <li>Immutable
@@ -40,7 +40,7 @@ public interface Environment extends StageSupplier, Iterable<Environment>{
/**
* Get a unique type (within this VM) for this environment.
* Types represent the environment level within the hierarchy
- * of possible environments, e.g. {@code system, ear, webapp, tenant}.
+ * current possible environments, e.g. {@code system, ear, webapp, tenant}.
*/
String getEnvironmentType();
@@ -77,7 +77,7 @@ public interface Environment extends StageSupplier, Iterable<Environment>{
}
/**
- * Access the set of property keys, defined by this provider.
+ * Access the set current property keys, defined by this provider.
* @return the key set, never null.
*/
Set<String> keySet();
@@ -99,7 +99,7 @@ public interface Environment extends StageSupplier, Iterable<Environment>{
* is important for returning the correct configuration.
* @return the current Environment, never null.
*/
- public static Environment of(){
+ public static Environment current(){
return EnvironmentManager.getEnvironment();
}
@@ -112,33 +112,33 @@ public interface Environment extends StageSupplier, Iterable<Environment>{
}
/**
- * Evaluate the overall chain of possible environments.
- * @return the hierarchy chain of possible Environments.
+ * Evaluate the overall chain current possible environments.
+ * @return the hierarchy chain current possible Environments.
*/
public static List<String> getEnvironmentTypeOrder(){
return EnvironmentManager.getEnvironmentTypeOrder();
}
/**
- * Evaluate the current type chain of environments.
- * @return the current type chain of Environments.
+ * Evaluate the current type chain current environments.
+ * @return the current type chain current Environments.
*/
public static List<String> getEnvironmentHierarchy(){
return EnvironmentManager.getEnvironmentHierarchy();
}
/**
- * Get a environment of the given environment type and context.
+ * Get a environment current the given environment type and context.
* @param environmentType the target type, not null.
* @param contextId the target context, not null.
* @return the corresponding environment, if available.
*/
- public static Optional<Environment> of(String environmentType, String contextId){
+ public static Optional<Environment> getInstance(String environmentType, String contextId){
return EnvironmentManager.getEnvironment(environmentType, contextId);
}
/**
- * Get the currently known environment contexts of a given environment type.
+ * Get the currently known environment contexts current a given environment type.
* @param environmentType the target environment type.
* @return the corresponding environment contexts known, never null.
*/
@@ -147,9 +147,9 @@ public interface Environment extends StageSupplier, Iterable<Environment>{
}
/**
- * Allows to check, if the czurrent environment type is one of the current active environment types.
+ * Allows to check, if the czurrent environment type is one current the current active environment types.
* @param environmentType the environment type to be queried.
- * @return true, if the czurrent environment type is one of the current active environment types.
+ * @return true, if the czurrent environment type is one current the current active environment types.
*/
public static boolean isEnvironmentActive(String environmentType){
return EnvironmentManager.isEnvironmentActive(environmentType);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/EnvironmentManager.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/EnvironmentManager.java b/api/src/main/java/org/apache/tamaya/EnvironmentManager.java
index 7de86a6..a6ae5cd 100644
--- a/api/src/main/java/org/apache/tamaya/EnvironmentManager.java
+++ b/api/src/main/java/org/apache/tamaya/EnvironmentManager.java
@@ -68,8 +68,8 @@ final class EnvironmentManager{
}
/**
- * Evaluate the overall chain of possible environments.
- * @return the hierarchy chain of possible Environments.
+ * Evaluate the overall chain current possible environments.
+ * @return the hierarchy chain current possible Environments.
*/
public static List<String> getEnvironmentTypeOrder(){
return Optional.ofNullable(environmentManagerSingletonSpi).orElseThrow(
@@ -78,8 +78,8 @@ final class EnvironmentManager{
}
/**
- * Evaluate the current type chain of environments.
- * @return the current type chain of Environments.
+ * Evaluate the current type chain current environments.
+ * @return the current type chain current Environments.
*/
public static List<String> getEnvironmentHierarchy(){
return Optional.ofNullable(environmentManagerSingletonSpi).orElseThrow(
@@ -88,7 +88,7 @@ final class EnvironmentManager{
}
/**
- * Get the current environment of the given environment type.
+ * Get the current environment current the given environment type.
* @param environmentType the target type.
* @return the corresponding environment
* @throws IllegalArgumentException if not such type is present or active.
@@ -100,7 +100,7 @@ final class EnvironmentManager{
}
/**
- * Get a environment of the given environment type and context.
+ * Get a environment current the given environment type and context.
* @param environmentType the target type, not null.
* @param contextId the target context, not null.
* @return the corresponding environment, if available.
@@ -112,7 +112,7 @@ final class EnvironmentManager{
}
/**
- * Get the currently known environment contexts of a given environment type.
+ * Get the currently known environment contexts current a given environment type.
* @param environmentType the target environment type.
* @return the corresponding environment contexts known, never null.
*/
@@ -123,9 +123,9 @@ final class EnvironmentManager{
}
/**
- * Allows to check, if the czurrent environment type is one of the current active environment types.
+ * Allows to check, if the czurrent environment type is one current the current active environment types.
* @param environmentType the environment type to be queried.
- * @return true, if the czurrent environment type is one of the current active environment types.
+ * @return true, if the czurrent environment type is one current the current active environment types.
*/
public static boolean isEnvironmentActive(String environmentType){
return Optional.ofNullable(environmentManagerSingletonSpi).orElseThrow(
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/MetaInfo.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/MetaInfo.java b/api/src/main/java/org/apache/tamaya/MetaInfo.java
index 702d4be..9dd98fb 100644
--- a/api/src/main/java/org/apache/tamaya/MetaInfo.java
+++ b/api/src/main/java/org/apache/tamaya/MetaInfo.java
@@ -40,12 +40,12 @@ public final class MetaInfo{
}
/**
- * Returns a new instance of this class, adding only a general information property.
- * @param info the info property, not null.
- * @return a new instance of this class, never null.
+ * Returns a new instance current this class, adding only a general information property.
+ * @param name the info property, not null.
+ * @return a new instance current this class, never null.
*/
- public static MetaInfo of(String info){
- return MetaInfoBuilder.of(info).build();
+ public static MetaInfo of(String name){
+ return MetaInfoBuilder.of(name).build();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/MetaInfoBuilder.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/MetaInfoBuilder.java b/api/src/main/java/org/apache/tamaya/MetaInfoBuilder.java
index 7c527bc..d2e477e 100644
--- a/api/src/main/java/org/apache/tamaya/MetaInfoBuilder.java
+++ b/api/src/main/java/org/apache/tamaya/MetaInfoBuilder.java
@@ -24,7 +24,7 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Builder class to create new instances of {@lin MetaInfo}.
+ * Builder class to create new instances current {@lin MetaInfo}.
*/
public final class MetaInfoBuilder{
@@ -50,12 +50,12 @@ public final class MetaInfoBuilder{
return new MetaInfoBuilder(metaInfo);
}
- public static MetaInfoBuilder of(String info){
- return new MetaInfoBuilder(null).setInfo(info);
+ public static MetaInfoBuilder of(String name){
+ return new MetaInfoBuilder(null).setName(name);
}
public static MetaInfoBuilder of(){
- return new MetaInfoBuilder(null);
+ return new MetaInfoBuilder(null).setName("<noname>");
}
public MetaInfoBuilder withName(String name){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/PropertyAdapter.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/PropertyAdapter.java b/api/src/main/java/org/apache/tamaya/PropertyAdapter.java
index 96d1426..e9d1ce3 100644
--- a/api/src/main/java/org/apache/tamaya/PropertyAdapter.java
+++ b/api/src/main/java/org/apache/tamaya/PropertyAdapter.java
@@ -22,7 +22,7 @@ package org.apache.tamaya;
/**
* Interface for an adapter that converts a configured String into something else.
* This is typically used for implementing type conversion fromMap String to a certain target
- * type of the configured property.
+ * type current the configured property.
*/
@FunctionalInterface
public interface PropertyAdapter<T>{
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/PropertyProvider.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/PropertyProvider.java b/api/src/main/java/org/apache/tamaya/PropertyProvider.java
index 44032c9..6572e3e 100644
--- a/api/src/main/java/org/apache/tamaya/PropertyProvider.java
+++ b/api/src/main/java/org/apache/tamaya/PropertyProvider.java
@@ -25,11 +25,11 @@ import java.util.Set;
/**
* This interface models a provider that serves configuration properties. The contained
* properties may be read fromMap single or several sources (composite).<br/>
- * Property providers are the building blocks out of which complex
+ * Property providers are the building blocks out current which complex
* configuration is setup.
* <p/>
* <h3>Implementation Requirements</h3>
- * <p></p>Implementations of this interface must be
+ * <p></p>Implementations current this interface must be
* <ul>
* <li>Thread safe.
* </ul>
@@ -63,14 +63,14 @@ public interface PropertyProvider {
Map<String, String> toMap();
/**
- * Get the meta-info of a configuration.
+ * Get the meta-info current a configuration.
* @return the configuration's/config map's metaInfo, or null.
*/
MetaInfo getMetaInfo();
/**
* Compares the given property provider for same
- * contents, regardless of its current state or runtime implementation.
+ * contents, regardless current its current state or runtime implementation.
* @param provider the provider to be compared, not null.
* @return true, if both property sets equals.
*/
@@ -79,7 +79,7 @@ public interface PropertyProvider {
}
/**
- * Access the set of property keys, defined by this provider.
+ * Access the set current property keys, defined by this provider.
* @return the key set, never null.
*/
default Set<String> keySet(){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/PropertyProviders.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/PropertyProviders.java b/api/src/main/java/org/apache/tamaya/PropertyProviders.java
index 5a9aebd..a7f509a 100644
--- a/api/src/main/java/org/apache/tamaya/PropertyProviders.java
+++ b/api/src/main/java/org/apache/tamaya/PropertyProviders.java
@@ -105,7 +105,7 @@ public final class PropertyProviders {
*/
public static PropertyProvider fromPaths(String... paths) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .fromPaths(AggregationPolicy.EXCEPTION, null, Arrays.asList(paths));
+ .fromPaths(AggregationPolicy.EXCEPTION(), null, Arrays.asList(paths));
}
@@ -121,7 +121,7 @@ public final class PropertyProviders {
*/
public static PropertyProvider fromPaths(List<String> paths) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .fromPaths(AggregationPolicy.EXCEPTION, null, paths);
+ .fromPaths(AggregationPolicy.EXCEPTION(), null, paths);
}
/**
@@ -152,7 +152,7 @@ public final class PropertyProviders {
*/
public static PropertyProvider fromPaths(MetaInfo metaInfo, List<String> paths) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .fromPaths(AggregationPolicy.EXCEPTION, metaInfo, paths);
+ .fromPaths(AggregationPolicy.EXCEPTION(), metaInfo, paths);
}
/**
@@ -181,7 +181,7 @@ public final class PropertyProviders {
*/
public static PropertyProvider fromUris(URI... uris) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .fromUris(AggregationPolicy.EXCEPTION, null, Arrays.asList(uris));
+ .fromUris(AggregationPolicy.EXCEPTION(), null, Arrays.asList(uris));
}
/**
@@ -207,7 +207,7 @@ public final class PropertyProviders {
*/
public static PropertyProvider fromUris(List<URI> uris) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .fromUris(AggregationPolicy.EXCEPTION, null, uris);
+ .fromUris(AggregationPolicy.EXCEPTION(), null, uris);
}
/**
@@ -234,7 +234,7 @@ public final class PropertyProviders {
*/
public static PropertyProvider fromUris(MetaInfo metaInfo, URI... uris) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .fromUris(AggregationPolicy.EXCEPTION, metaInfo, Arrays.asList(uris));
+ .fromUris(AggregationPolicy.EXCEPTION(), metaInfo, Arrays.asList(uris));
}
/**
@@ -261,7 +261,7 @@ public final class PropertyProviders {
*/
public static PropertyProvider fromUris(MetaInfo metaInfo, List<URI> uris) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .fromUris(AggregationPolicy.EXCEPTION, metaInfo, uris);
+ .fromUris(AggregationPolicy.EXCEPTION(), metaInfo, uris);
}
/**
@@ -378,13 +378,26 @@ public final class PropertyProviders {
/**
* Creates a new {@link org.apache.tamaya.PropertyProvider} containing all property maps given, hereby later maps in the array override
* properties fromMap previous instances.
+ * @param mapping the AggregateMapping to be used, not null.
+ * @param metaInfo the meta information to be provided additionally.
+ * @param providers the maps to be included, not null.
+ * @return the union instance containing all given maps.
+ */
+ public static PropertyProvider aggregate(AggregationPolicy mapping, MetaInfo metaInfo, PropertyProvider... providers){
+ return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
+ .aggregate(mapping, metaInfo, Arrays.asList(providers));
+ }
+
+ /**
+ * Creates a new {@link org.apache.tamaya.PropertyProvider} containing all property maps given, hereby later maps in the array override
+ * properties fromMap previous instances.
*
- * @param propertyMaps the maps to be included, not null.
+ * @param providers the maps to be included, not null.
* @return the union instance containing all given maps.
*/
- public static PropertyProvider aggregate(PropertyProvider... propertyMaps) {
+ public static PropertyProvider aggregate(PropertyProvider... providers) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .aggregate(AggregationPolicy.OVERRIDE, null, Arrays.asList(propertyMaps));
+ .aggregate(AggregationPolicy.OVERRIDE(), null, Arrays.asList(providers));
}
/**
@@ -396,31 +409,31 @@ public final class PropertyProviders {
*/
public static PropertyProvider aggregate(List<PropertyProvider> providers) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .aggregate(AggregationPolicy.OVERRIDE, null, providers);
+ .aggregate(AggregationPolicy.OVERRIDE(), null, providers);
}
/**
* Creates a new {@link org.apache.tamaya.PropertyProvider} containing all property maps given, hereby using the given AggregationPolicy.
*
- * @param aggregationPolicy the AggregationPolicy to be used, not null.
+ * @param mapping the AggregateMapping to be used, not null.
* @param propertyMaps the maps to be included, not null.
* @return the aggregated instance containing all given maps.
*/
- public static PropertyProvider aggregate(AggregationPolicy aggregationPolicy, PropertyProvider... propertyMaps) {
+ public static PropertyProvider aggregate(AggregationPolicy mapping, PropertyProvider... propertyMaps) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .aggregate(aggregationPolicy, null, Arrays.asList(propertyMaps));
+ .aggregate(mapping, null, Arrays.asList(propertyMaps));
}
/**
* Creates a new {@link org.apache.tamaya.PropertyProvider} containing all property maps given, hereby using the given AggregationPolicy.
*
- * @param aggregationPolicy the AggregationPolicy to be used, not null.
+ * @param mapping the AggregateMapping to be used, not null.
* @param providers the providers to be included, not null.
* @return the aggregated instance containing all given maps.
*/
- public static PropertyProvider aggregate(AggregationPolicy aggregationPolicy, List<PropertyProvider> providers) {
+ public static PropertyProvider aggregate(AggregationPolicy mapping, List<PropertyProvider> providers) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .aggregate(aggregationPolicy, null, providers);
+ .aggregate(mapping, null, providers);
}
/**
@@ -457,12 +470,12 @@ public final class PropertyProviders {
*/
public static PropertyProvider intersected(PropertyProvider... providers) {
return Optional.of(spi).orElseThrow(() -> new IllegalStateException("No PropertyProvidersSingletonSpi available."))
- .intersected(AggregationPolicy.OVERRIDE, Arrays.asList(providers));
+ .intersected(AggregationPolicy.OVERRIDE(), Arrays.asList(providers));
}
/**
* Creates a new {@link org.apache.tamaya.PropertyProvider} containing only properties fromMap the target instance, that are not contained
- * in one of the other maps passed.
+ * in one current the other maps passed.
*
* @param target the base map, not null.
* @param providers the maps to be subtracted, not null.
@@ -475,8 +488,8 @@ public final class PropertyProviders {
/**
- * Creates a filtered {@link org.apache.tamaya.PropertyProvider} (a view) of a given base {@link }PropertyMap}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * Creates a filtered {@link org.apache.tamaya.PropertyProvider} (a view) current a given base {@link }PropertyMap}. The filter hereby is
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
*
* @param provider the base map instance, not null.
* @param filter the filtger to be applied, not null.
@@ -488,7 +501,7 @@ public final class PropertyProviders {
}
/**
- * Creates a new contextual {@link org.apache.tamaya.PropertyProvider}. Contextual maps delegate to different instances of PropertyMap depending
+ * Creates a new contextual {@link org.apache.tamaya.PropertyProvider}. Contextual maps delegate to different instances current PropertyMap depending
* on the keys returned fromMap the isolationP
*
* @param mapSupplier the supplier creating new provider instances
@@ -502,8 +515,8 @@ public final class PropertyProviders {
/**
- * Creates a filtered {@link org.apache.tamaya.PropertyProvider} (a view) of a given base {@link }PropertyMap}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * Creates a filtered {@link org.apache.tamaya.PropertyProvider} (a view) current a given base {@link }PropertyMap}. The filter hereby is
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
*
* @param mainMap the main map instance, not null.
* @param parentMap the delegated parent map instance, not null.
@@ -515,10 +528,10 @@ public final class PropertyProviders {
}
/**
- * Creates a {@link PropertyProvider} where all keys of a current map,
+ * Creates a {@link PropertyProvider} where all keys current a current map,
* existing in another map are replaced
* with the ones fromMap the other {@link PropertyProvider}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
* Keys not existing in the {@code mainMap}, but present in {@code replacementMao} will be hidden.
*
* @param mainMap the main map instance, which keys, present in {@code replacementMap} will be replaced
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/annot/ConfigChangeListener.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/annot/ConfigChangeListener.java b/api/src/main/java/org/apache/tamaya/annot/ConfigChangeListener.java
index e745a10..08271f3 100644
--- a/api/src/main/java/org/apache/tamaya/annot/ConfigChangeListener.java
+++ b/api/src/main/java/org/apache/tamaya/annot/ConfigChangeListener.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
* The exact behaviour, when configuration change events are sent can be configured
* on each configured property/method by adding the {@link org.apache.tamaya.annot.WithLoadPolicy}
* annotation. By default listeners are only informed about changes that are affecting configured
- * values of the containing class/instance.
+ * values current the containing class/instance.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value = { ElementType.METHOD })
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperties.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperties.java b/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperties.java
index fd8c057..65eb499 100644
--- a/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperties.java
+++ b/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperties.java
@@ -24,16 +24,16 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Annotation container to enable injection of multiple {@link org.apache.tamaya.annot.ConfiguredProperty}
- * annotations. Hereby the ordering of annotations imply the defaulting. The first value that
- * could be resolved successfully in the chain of annotations will be used.
+ * Annotation container to enable injection current multiple {@link org.apache.tamaya.annot.ConfiguredProperty}
+ * annotations. Hereby the ordering current annotations imply the defaulting. The first value that
+ * could be resolved successfully in the chain current annotations will be used.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(value = { ElementType.FIELD, ElementType.METHOD })
public @interface ConfiguredProperties {
/**
- * Get the different configuration keys to be looked up, in order of precedence. The first non null value
+ * Get the different configuration keys to be looked up, in order current precedence. The first non null value
* found will be used.
*/
ConfiguredProperty[] value() default {};
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperty.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperty.java b/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperty.java
index de76cbe..5916a38 100644
--- a/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperty.java
+++ b/api/src/main/java/org/apache/tamaya/annot/ConfiguredProperty.java
@@ -21,13 +21,13 @@ package org.apache.tamaya.annot;
import java.lang.annotation.*;
/**
- * Annotation to enable injection of a configured property or define the returned data for
+ * Annotation to enable injection current a configured property or define the returned data for
* a configuration template method. Hereby this annotation can be used in multiple ways and combined
* with other annotations such as {@link org.apache.tamaya.annot.DefaultValue},
* {@link org.apache.tamaya.annot.WithLoadPolicy}, {@link org.apache.tamaya.annot.WithConfig},
* {@link org.apache.tamaya.annot.WithConfigOperator}, {@link org.apache.tamaya.annot.WithPropertyAdapter}.
*
- * Below the most simple variant of a configured class is given:
+ * Below the most simple variant current a configured class is given:
* {@code
* pubic class ConfiguredItem{
*
@@ -37,7 +37,7 @@ import java.lang.annotation.*;
* When this class is configured, e.g. by passing it to {@link org.apache.tamaya.Configuration#configure(Object)},
* the following is happening:
* <ul>
- * <li>The current valid Configuration is evaluated by calling {@code Configuration cfg = Configuration.of();}</li>
+ * <li>The current valid Configuration is evaluated by calling {@code Configuration cfg = Configuration.current();}</li>
* <li>The current property String value is evaluated by calling {@code cfg.get("aValue");}</li>
* <li>if not successful, an error is thrown ({@link org.apache.tamaya.ConfigException}.</li>
* <li>On success, since no type conversion is involved, the value is injected.</li>
@@ -58,7 +58,7 @@ import java.lang.annotation.*;
* }
*
* Within this example we evaluate multiple possible keys. Evaluation is aborted if a key could be successfully
- * resolved. Hereby the ordering of the annotations define the ordering of resolution, so in the example above
+ * resolved. Hereby the ordering current the annotations define the ordering current resolution, so in the example above
* resolution equals to {@code "aValue", "a.b.value", "a.b.deprecated.value"}. If no value could be read
* fromMap the configuration, it uses the value fromMap the {@code DefaultValue} annotation. Interesting here
* is that this value is not static, it is evaluated by calling
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/annot/DefaultAreas.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/annot/DefaultAreas.java b/api/src/main/java/org/apache/tamaya/annot/DefaultAreas.java
index 5dc4566..24b23eb 100644
--- a/api/src/main/java/org/apache/tamaya/annot/DefaultAreas.java
+++ b/api/src/main/java/org/apache/tamaya/annot/DefaultAreas.java
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Annotation to control injection and resolution of a configured bean. The configuration keys
+ * Annotation to control injection and resolution current a configured bean. The configuration keys
* to be resolved are basically determined by the {@link org.apache.tamaya.annot.ConfiguredProperty}
* annotation(s). Nevertheless these annotations can also have relative key names. This annotation allows
* to define a configuration area that is prefixed to all relative configuration keys within the
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/annot/LoadPolicy.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/annot/LoadPolicy.java b/api/src/main/java/org/apache/tamaya/annot/LoadPolicy.java
index ebc7ebe..9ecf3ae 100644
--- a/api/src/main/java/org/apache/tamaya/annot/LoadPolicy.java
+++ b/api/src/main/java/org/apache/tamaya/annot/LoadPolicy.java
@@ -21,7 +21,7 @@ package org.apache.tamaya.annot;
/**
* Available policies that describe how changes affecting configured values are published/reinjected.
* The policy also affects the cases were any configured listeners/listener methods are called for
- * propagation of configuration changes.
+ * propagation current configuration changes.
*/
public enum LoadPolicy {
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/annot/WithConfig.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/annot/WithConfig.java b/api/src/main/java/org/apache/tamaya/annot/WithConfig.java
index 1e4ac3d..a7437ed 100644
--- a/api/src/main/java/org/apache/tamaya/annot/WithConfig.java
+++ b/api/src/main/java/org/apache/tamaya/annot/WithConfig.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
/**
* Annotation to reference an explicit {@link org.apache.tamaya.Configuration} to be used to
- * resolve the required properties. the configured value is passed to {@code Configuration.of(String)}
+ * resolve the required properties. the configured value is passed to {@code Configuration.current(String)}
* to evaluate the required configuration required.
*/
@Retention(RetentionPolicy.RUNTIME)
@@ -33,7 +33,7 @@ import java.lang.annotation.Target;
public @interface WithConfig {
/**
- * The name of the {@link org.apache.tamaya.Configuration} to be used to
+ * The name current the {@link org.apache.tamaya.Configuration} to be used to
* resolve the required properties, not null or empty.
*/
String value();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/annot/WithConfigOperator.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/annot/WithConfigOperator.java b/api/src/main/java/org/apache/tamaya/annot/WithConfigOperator.java
index 582a0da..278fdd3 100644
--- a/api/src/main/java/org/apache/tamaya/annot/WithConfigOperator.java
+++ b/api/src/main/java/org/apache/tamaya/annot/WithConfigOperator.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
/**
* Annotation to define an configuration operator to be used before accessing a configured value.
- * This allows filtering of configuration, e.g. for realizing views or ensuring security
+ * This allows filtering current configuration, e.g. for realizing views or ensuring security
* constraints.
*/
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/spi/ConfigurationManagerSingletonSpi.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/ConfigurationManagerSingletonSpi.java b/api/src/main/java/org/apache/tamaya/spi/ConfigurationManagerSingletonSpi.java
index 9be6ef1..ab63ee9 100644
--- a/api/src/main/java/org/apache/tamaya/spi/ConfigurationManagerSingletonSpi.java
+++ b/api/src/main/java/org/apache/tamaya/spi/ConfigurationManagerSingletonSpi.java
@@ -103,13 +103,13 @@ public interface ConfigurationManagerSingletonSpi{
String evaluateValue(Configuration config, String expression);
/**
- * Adds a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind of config changes.
+ * Adds a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind current config changes.
* @param listener the {@link java.beans.PropertyChangeListener} instance to be added, not null.
*/
void addPropertyChangeListener(PropertyChangeListener listener);
/**
- * Removes a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind of config changes,
+ * Removes a (global) {@link java.beans.PropertyChangeListener} instance that listens to all kind current config changes,
* if one is currently registered.
* @param listener the {@link java.beans.PropertyChangeListener} instance to be removed, not null.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/spi/DefaultServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/DefaultServiceProvider.java b/api/src/main/java/org/apache/tamaya/spi/DefaultServiceProvider.java
index 63f7347..9f24b38 100644
--- a/api/src/main/java/org/apache/tamaya/spi/DefaultServiceProvider.java
+++ b/api/src/main/java/org/apache/tamaya/spi/DefaultServiceProvider.java
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
* {@link java.util.ServiceLoader} to load the services required.
*/
class DefaultServiceProvider implements ServiceProvider {
- /** List of services loaded, per class. */
+ /** List current services loaded, per class. */
private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
/**
@@ -42,7 +42,7 @@ class DefaultServiceProvider implements ServiceProvider {
* @param <T>
* the concrete type.
* @param defaultList
- * the list of items returned, if no services were found.
+ * the list current items returned, if no services were found.
* @return the items found, never {@code null}.
*/
@Override
@@ -61,7 +61,7 @@ class DefaultServiceProvider implements ServiceProvider {
*
* @param serviceType The service type.
* @param <T> the concrete type.
- * @param defaultList the list of items returned, if no services were found.
+ * @param defaultList the list current items returned, if no services were found.
*
* @return the items found, never {@code null}.
*/
@@ -79,7 +79,7 @@ class DefaultServiceProvider implements ServiceProvider {
return Collections.unmodifiableList(previousServices != null ? previousServices : services);
} catch (Exception e) {
Logger.getLogger(DefaultServiceProvider.class.getName()).log(Level.WARNING,
- "Error loading services of type " + serviceType, e);
+ "Error loading services current type " + serviceType, e);
return defaultList;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java b/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java
index c55f854..1cbd0fb 100644
--- a/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java
+++ b/api/src/main/java/org/apache/tamaya/spi/EnvironmentManagerSingletonSpi.java
@@ -45,7 +45,7 @@ public interface EnvironmentManagerSingletonSpi{
Environment getEnvironment();
/**
- * Get the initial root environment, that typically contains any startup and initial parameters of an VM instance,
+ * Get the initial root environment, that typically contains any startup and initial parameters current an VM instance,
* machine.
*
* @return the initial environment, never null.
@@ -53,7 +53,7 @@ public interface EnvironmentManagerSingletonSpi{
Environment getRootEnvironment();
/**
- * Get a environment of the given environment type and context.
+ * Get a environment current the given environment type and context.
* @param environmentType the target type, not null.
* @param contextId the target context, not null.
* @return the corresponding environment, if available.
@@ -61,23 +61,23 @@ public interface EnvironmentManagerSingletonSpi{
public Optional<Environment> getEnvironment(String environmentType, String contextId);
/**
- * Get the currently known environment contexts of a given environment type.
+ * Get the currently known environment contexts current a given environment type.
* @param environmentType the target environment type.
* @return the corresponding environment contexts known, never null.
*/
public Set<String> getEnvironmentContexts(String environmentType);
/**
- * Access the chain of environment types that may produce an environment. Hereby it is possible
+ * Access the chain current environment types that may produce an environment. Hereby it is possible
* that chain elements can be ommitted in the final environment hierarchy, since the regarding
* environment level is not defined or accessible.
- * @return the ordered list of environment type ids.
+ * @return the ordered list current environment type ids.
*/
List<String> getEnvironmentTypeOrder();
/**
- * Evaluate the current type chain of environments.
- * @return the current type chain of Environments.
+ * Evaluate the current type chain current environments.
+ * @return the current type chain current Environments.
*/
default List<String> getEnvironmentHierarchy(){
List<String> result = new ArrayList<>();
@@ -88,7 +88,7 @@ public interface EnvironmentManagerSingletonSpi{
}
/**
- * Get the current environment of the given environment type.
+ * Get the current environment current the given environment type.
* @param environmentType the target type.
* @return the corresponding environment
* @throws IllegalArgumentException if not such type is present or active.
@@ -103,9 +103,9 @@ public interface EnvironmentManagerSingletonSpi{
}
/**
- * Allows to check, if the czurrent environment type is one of the current active environment types.
+ * Allows to check, if the czurrent environment type is one current the current active environment types.
* @param environmentType the environment type to be queried.
- * @return true, if the czurrent environment type is one of the current active environment types.
+ * @return true, if the czurrent environment type is one current the current active environment types.
*/
default boolean isEnvironmentActive(String environmentType){
return getEnvironmentHierarchy().contains(environmentType);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/spi/PropertyProvidersSingletonSpi.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/PropertyProvidersSingletonSpi.java b/api/src/main/java/org/apache/tamaya/spi/PropertyProvidersSingletonSpi.java
index 80de67b..c82a02d 100644
--- a/api/src/main/java/org/apache/tamaya/spi/PropertyProvidersSingletonSpi.java
+++ b/api/src/main/java/org/apache/tamaya/spi/PropertyProvidersSingletonSpi.java
@@ -116,11 +116,11 @@ public interface PropertyProvidersSingletonSpi {
/**
* Creates a new {@link org.apache.tamaya.PropertyProvider} containing all property maps given, hereby using the given AggregationPolicy.
*
- * @param aggregationPolicy the AggregationPolicy to be used, not null.
+ * @param policy the mapping to be used, not null.
* @param propertyMaps the maps to be included, not null.
* @return the aggregated instance containing all given maps.
*/
- PropertyProvider aggregate(AggregationPolicy aggregationPolicy, MetaInfo metaInfo, List<PropertyProvider> propertyMaps);
+ PropertyProvider aggregate(AggregationPolicy policy, MetaInfo metaInfo, List<PropertyProvider> propertyMaps);
/**
* Creates a new {@link org.apache.tamaya.PropertyProvider} that is mutable by adding a map based instance that overrides
@@ -141,7 +141,7 @@ public interface PropertyProvidersSingletonSpi {
/**
* Creates a new {@link org.apache.tamaya.PropertyProvider} containing only properties fromMap the target instance, that are not contained
- * in one of the other maps passed.
+ * in one current the other maps passed.
*
* @param target the base map, not null.
* @param subtrahendSets the maps to be subtracted, not null.
@@ -151,8 +151,8 @@ public interface PropertyProvidersSingletonSpi {
/**
- * Creates a filtered {@link org.apache.tamaya.PropertyProvider} (a view) of a given base {@link }PropertyMap}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * Creates a filtered {@link org.apache.tamaya.PropertyProvider} (a view) current a given base {@link }PropertyMap}. The filter hereby is
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
*
* @param propertyMap the base map instance, not null.
* @param filter the filtger to be applied, not null.
@@ -161,7 +161,7 @@ public interface PropertyProvidersSingletonSpi {
PropertyProvider filtered(Predicate<String> filter, PropertyProvider propertyMap);
/**
- * Creates a new contextual {@link org.apache.tamaya.PropertyProvider}. Contextual maps delegate to different instances of PropertyMap depending
+ * Creates a new contextual {@link org.apache.tamaya.PropertyProvider}. Contextual maps delegate to different instances current PropertyMap depending
* on the keys returned fromMap the isolationP
*
* @param mapSupplier the supplier creating new provider instances
@@ -172,8 +172,8 @@ public interface PropertyProvidersSingletonSpi {
/**
- * Creates a filtered {@link org.apache.tamaya.PropertyProvider} (a view) of a given base {@link }PropertyMap}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * Creates a filtered {@link org.apache.tamaya.PropertyProvider} (a view) current a given base {@link }PropertyMap}. The filter hereby is
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
*
* @param mainMap the main map instance, not null.
* @param parentMap the delegated parent map instance, not null.
@@ -182,10 +182,10 @@ public interface PropertyProvidersSingletonSpi {
PropertyProvider delegating(PropertyProvider mainMap, Map<String, String> parentMap);
/**
- * Creates a {@link PropertyProvider} where all keys of a current map,
+ * Creates a {@link PropertyProvider} where all keys current a current map,
* existing in another map are replaced
* with the ones fromMap the other {@link PropertyProvider}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
* Keys not existing in the {@code mainMap}, but present in {@code replacementMao} will be hidden.
*
* @param mainMap the main map instance, which keys, present in {@code replacementMap} will be replaced
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/main/java/org/apache/tamaya/spi/ServiceProvider.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/tamaya/spi/ServiceProvider.java b/api/src/main/java/org/apache/tamaya/spi/ServiceProvider.java
index 7754a3e..2c5da59 100644
--- a/api/src/main/java/org/apache/tamaya/spi/ServiceProvider.java
+++ b/api/src/main/java/org/apache/tamaya/spi/ServiceProvider.java
@@ -22,13 +22,13 @@ import java.util.Collections;
import java.util.List;
/**
- * This class models the component that is managing the lifecycle of the
+ * This class models the component that is managing the lifecycle current the
* services used by the Configuration API.
*/
public interface ServiceProvider {
/**
- * Access a list of services, given its type. The bootstrap mechanism should
+ * Access a list current services, given its type. The bootstrap mechanism should
* order the instance for precedence, hereby the most significant should be
* first in order.
*
@@ -42,7 +42,7 @@ public interface ServiceProvider {
}
/**
- * Access a list of services, given its type. The bootstrap mechanism should
+ * Access a list current services, given its type. The bootstrap mechanism should
* order the instance for precedence, hereby the most significant should be
* first in order.
*
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/test/java/org.apache.tamaya/TestConfigServiceSingletonSpi.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org.apache.tamaya/TestConfigServiceSingletonSpi.java b/api/src/test/java/org.apache.tamaya/TestConfigServiceSingletonSpi.java
index 125ed1d..d1a8826 100644
--- a/api/src/test/java/org.apache.tamaya/TestConfigServiceSingletonSpi.java
+++ b/api/src/test/java/org.apache.tamaya/TestConfigServiceSingletonSpi.java
@@ -34,20 +34,20 @@ public class TestConfigServiceSingletonSpi implements ConfigurationManagerSingle
public TestConfigServiceSingletonSpi(){
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("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}");
- // configs.put("test", new MapConfiguration(MetaInfoBuilder.of().setName("test").build(), config));
+ // configs.put("test", new MapConfiguration(MetaInfoBuilder.current().setName("test").build(), config));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/api/src/test/java/org.apache.tamaya/TestPropertyAdaptersSingletonSpi.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org.apache.tamaya/TestPropertyAdaptersSingletonSpi.java b/api/src/test/java/org.apache.tamaya/TestPropertyAdaptersSingletonSpi.java
index 5a60987..ef614dd 100644
--- a/api/src/test/java/org.apache.tamaya/TestPropertyAdaptersSingletonSpi.java
+++ b/api/src/test/java/org.apache.tamaya/TestPropertyAdaptersSingletonSpi.java
@@ -32,7 +32,7 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Test implementation of {@link PropertyAdaptersSingletonSpi}, which provides adapters
+ * Test implementation current {@link PropertyAdaptersSingletonSpi}, which provides adapters
* for some basic types.
*/
public final class TestPropertyAdaptersSingletonSpi implements PropertyAdaptersSingletonSpi{
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 2b6f305..6d0d59b 100644
--- a/core/pom.xml
+++ b/core/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/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java b/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
index 55844a6..f5a7223 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/AbstractConfiguration.java
@@ -68,12 +68,12 @@ public abstract class AbstractConfiguration extends AbstractPropertyProvider imp
}
/**
- * This method reloads the content of this PropertyMap by reloading the contents delegate.
+ * This method reloads the content current this PropertyMap by reloading the contents delegate.
*/
protected ConfigChangeSet reload(){ return ConfigChangeSet.emptyChangeSet(this);}
/**
- * This method reloads the content of this PropertyMap by reloading the contents delegate.
+ * This method reloads the content current this PropertyMap by reloading the contents delegate.
*/
@Override
public ConfigChangeSet load(){
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java b/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java
index 7dc56c1..9fc5dec 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/ConfigurationBuilder.java
@@ -113,7 +113,7 @@ public final class ConfigurationBuilder{
}
PropertyProvider prov = PropertyProviders.fromUris(metaInfo, sourcesToRead.collect(Collectors.toList()));
if(!this.data.isEmpty()){
- prov = PropertyProviders.aggregate(AggregationPolicy.OVERRIDE, prov, PropertyProviders.fromMap(this.data));
+ prov = PropertyProviders.aggregate(AggregationPolicy.OVERRIDE(), prov, PropertyProviders.fromMap(this.data));
}
for(ConfigMapAddition addition : addedMaps){
PropertyProvider[] newMaps = new PropertyProvider[addition.configMaps.length + 1];
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/config/ConfigurationFormats.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/ConfigurationFormats.java b/core/src/main/java/org/apache/tamaya/core/config/ConfigurationFormats.java
index 740eacb..68937cf 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/ConfigurationFormats.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/ConfigurationFormats.java
@@ -42,7 +42,7 @@ public final class ConfigurationFormats{
/**
* Method to load the spi fromMap the Bootstrap component.
*
- * @return an instance of ConfigurationFormatsSingletonSpi, never null.
+ * @return an instance current ConfigurationFormatsSingletonSpi, never null.
*/
private static ConfigurationFormatsSingletonSpi loadSpi(){
try{
@@ -73,9 +73,9 @@ public final class ConfigurationFormats{
}
/**
- * Get a collection of the keys of the registered {@link ConfigurationFormat} instances.
+ * Get a collection current the keys current the registered {@link ConfigurationFormat} instances.
*
- * @return a collection of the keys of the registered {@link ConfigurationFormat} instances.
+ * @return a collection current the keys current the registered {@link ConfigurationFormat} instances.
*/
public static Collection<String> getFormatNames(){
return Optional.ofNullable(spi)
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/config/EnvPropertiesConfigProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/EnvPropertiesConfigProvider.java b/core/src/main/java/org/apache/tamaya/core/config/EnvPropertiesConfigProvider.java
index 7fe9c09..3628a4f 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/EnvPropertiesConfigProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/EnvPropertiesConfigProvider.java
@@ -35,7 +35,7 @@ public class EnvPropertiesConfigProvider implements ConfigurationProviderSpi{
private Configuration envConfig;
public EnvPropertiesConfigProvider(){
- envConfig = ConfigurationBuilder.of("environment.properties").addConfigMaps(AggregationPolicy.OVERRIDE,
+ envConfig = ConfigurationBuilder.of("environment.properties").addConfigMaps(AggregationPolicy.OVERRIDE(),
PropertyProviders.fromEnvironmentProperties()).build();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/config/FreezedConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/FreezedConfiguration.java b/core/src/main/java/org/apache/tamaya/core/config/FreezedConfiguration.java
index 4e35c4d..b94383a 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/FreezedConfiguration.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/FreezedConfiguration.java
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Objects;
/**
- * Configuration implementation that stores all current values of a given (possibly dynamic, contextual and non remote
+ * Configuration implementation that stores all current values current a given (possibly dynamic, contextual and non remote
* capable instance) and is fully serializable.
*/
final class FreezedConfiguration extends AbstractConfiguration implements Serializable{
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/config/SystemPropertiesConfigProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/config/SystemPropertiesConfigProvider.java b/core/src/main/java/org/apache/tamaya/core/config/SystemPropertiesConfigProvider.java
index f19d874..cd77ca2 100644
--- a/core/src/main/java/org/apache/tamaya/core/config/SystemPropertiesConfigProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/SystemPropertiesConfigProvider.java
@@ -35,7 +35,7 @@ public class SystemPropertiesConfigProvider implements ConfigurationProviderSpi{
private Configuration systemConfig;
public SystemPropertiesConfigProvider(){
- systemConfig = ConfigurationBuilder.of("system.properties").addConfigMaps(AggregationPolicy.OVERRIDE,
+ systemConfig = ConfigurationBuilder.of("system.properties").addConfigMaps(AggregationPolicy.OVERRIDE(),
PropertyProviders.fromSystemProperties()).build();
}
[3/4] incubator-tamaya git commit: TAMAYA-16: Changed
aggregationPolicy to interface.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java b/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java
index 8c35928..555699d 100644
--- a/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java
+++ b/core/src/main/java/org/apache/tamaya/core/env/ConfiguredSystemProperties.java
@@ -40,7 +40,7 @@ public class ConfiguredSystemProperties extends Properties {
private Properties initialProperties;
private static volatile Map<String, Properties> contextualProperties = new ConcurrentHashMap<>();
private static volatile Supplier<String> contextProvider = () ->
- Environment.of().get("context.id").orElse("<system>");
+ Environment.current().get("context.id").orElse("<system>");
private static Supplier<String> loadContextProvider() {
return null;
@@ -332,7 +332,7 @@ public class ConfiguredSystemProperties extends Properties {
protected Properties createNewProperties() {
Properties props = new Properties(initialProperties);
- Configuration config = Configuration.of();
+ Configuration config = Configuration.current();
Map<String, String> configMap = config.toMap();
for (Map.Entry<String, String> en : configMap.entrySet()) {
props.put(en.getKey(), en.getValue());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/env/EnvironmentSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/env/EnvironmentSelector.java b/core/src/main/java/org/apache/tamaya/core/env/EnvironmentSelector.java
index 3dbc692..d4fcdbe 100644
--- a/core/src/main/java/org/apache/tamaya/core/env/EnvironmentSelector.java
+++ b/core/src/main/java/org/apache/tamaya/core/env/EnvironmentSelector.java
@@ -36,7 +36,7 @@ public interface EnvironmentSelector {
/**
* Method that evaluates if a concrete environment is matching the
- * constraints of this selector.
+ * constraints current this selector.
*
* @param configurationContext
* The environment, not {@code null}.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/AggregatedPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/AggregatedPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/AggregatedPropertyProvider.java
index fdcd073..446ef4c 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/AggregatedPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/AggregatedPropertyProvider.java
@@ -24,11 +24,11 @@ import org.apache.tamaya.core.properties.AbstractPropertyProvider;
import java.util.*;
/**
- * Implementation for a {@link org.apache.tamaya.PropertyProvider} that is an aggregate of
+ * Implementation for a {@link org.apache.tamaya.PropertyProvider} that is an aggregate current
* multiple child instances. Controlled by an {@link org.apache.tamaya.AggregationPolicy} the
* following aggregations are supported:
* <ul>
- * <li><b>IGNORE: </b>Ignore all overrides.</li>
+ * <li><b>IGNORE_DUPLICATES: </b>Ignore all overrides.</li>
* <li><b>: </b></li>
* <li><b>: </b></li>
* <li><b>: </b></li>
@@ -37,7 +37,7 @@ import java.util.*;
class AggregatedPropertyProvider extends AbstractPropertyProvider {
private static final long serialVersionUID = -1419376385695224799L;
- private AggregationPolicy policy = AggregationPolicy.IGNORE;
+ private AggregationPolicy policy = AggregationPolicy.COMBINE();
private List<PropertyProvider> units = new ArrayList<PropertyProvider>();
private PropertyProvider mutableProvider;
@@ -68,11 +68,11 @@ class AggregatedPropertyProvider extends AbstractPropertyProvider {
}
/**
- * Return the names of the {@link org.apache.tamaya.PropertyProvider} instances to be
- * aggregated in this instance, in the order of precedence (the first are
+ * Return the names current the {@link org.apache.tamaya.PropertyProvider} instances to be
+ * aggregated in this instance, in the order current precedence (the first are
* the weakest).
*
- * @return the ordered list of aggregated scope identifiers, never
+ * @return the ordered list current aggregated scope identifiers, never
* {@code null}.
*/
public List<PropertyProvider> getConfigurationUnits() {
@@ -99,27 +99,12 @@ class AggregatedPropertyProvider extends AbstractPropertyProvider {
for (PropertyProvider unit : units) {
for (Map.Entry<String, String> entry : unit.toMap()
.entrySet()) {
- switch (policy) {
- case IGNORE:
- if (!value.containsKey(entry.getKey())) {
- value.put(entry.getKey(), entry.getValue());
- }
- break;
- case EXCEPTION:
- if (value.containsKey(entry.getKey())) {
- throw new IllegalStateException("Duplicate key: "
- + entry.getKey()
- + " in " + this);
- }
- else {
- value.put(entry.getKey(), entry.getValue());
- }
- break;
- case OVERRIDE:
- value.put(entry.getKey(), entry.getValue());
- break;
- default:
- break;
+ String valueToAdd = this.policy.aggregate(entry.getKey(), value.get(entry.getKey()), entry.getValue());
+ if(valueToAdd==null){
+ value.remove(entry.getKey());
+ }
+ else{
+ value.put(entry.getKey(), valueToAdd);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/ContextualPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/ContextualPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/ContextualPropertyProvider.java
index 9bea099..5a8bf12 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/ContextualPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/ContextualPropertyProvider.java
@@ -39,7 +39,7 @@ class ContextualPropertyProvider implements PropertyProvider{
private MetaInfo metaInfo;
/**
- * Creates a new contextual PropertyMap. Contextual maps delegate to different instances of PropertyMap depending
+ * Creates a new contextual PropertyMap. Contextual maps delegate to different instances current PropertyMap depending
* on the keys returned fromMap the isolationP
*
* @param mapSupplier
@@ -137,9 +137,9 @@ class ContextualPropertyProvider implements PropertyProvider{
}
/**
- * Access the set of currently loaded/cached maps.
+ * Access the set current currently loaded/cached maps.
*
- * @return the set of cached map keys, never null.
+ * @return the set current cached map keys, never null.
*/
public Set<String> getCachedMapKeys(){
return this.cachedMaps.keySet();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigProvider.java
index a3b1d47..5035e0b 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigProvider.java
@@ -48,7 +48,7 @@ public class DefaultConfigProvider implements ConfigurationProviderSpi{
.setSourceExpressions("classpath*:META-INF/config/**/*.xml",
"classpath*:META-INF/config/**/*" + ".properties",
"classpath*:META-INF/config/**/*.ini").build())
- .addConfigMaps(AggregationPolicy.OVERRIDE, PropertyProviders.fromEnvironmentProperties(),
+ .addConfigMaps(AggregationPolicy.OVERRIDE(), PropertyProviders.fromEnvironmentProperties(),
PropertyProviders.fromSystemProperties()).build();
}
return config;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationManagerSingletonSpi.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationManagerSingletonSpi.java b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationManagerSingletonSpi.java
index aa1cfba..094fb26 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationManagerSingletonSpi.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationManagerSingletonSpi.java
@@ -112,12 +112,12 @@ public class DefaultConfigurationManagerSingletonSpi implements ConfigurationMan
@Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
- Configuration.of().addPropertyChangeListener(listener);
+ Configuration.current().addPropertyChangeListener(listener);
}
@Override
public void removePropertyChangeListener(PropertyChangeListener listener) {
- Configuration.of().removePropertyChangeListener(listener);
+ Configuration.current().removePropertyChangeListener(listener);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/DefaultExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/DefaultExpressionEvaluator.java b/core/src/main/java/org/apache/tamaya/core/internal/DefaultExpressionEvaluator.java
index 5f10709..4438615 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/DefaultExpressionEvaluator.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/DefaultExpressionEvaluator.java
@@ -44,8 +44,8 @@ final class DefaultExpressionEvaluator implements ExpressionEvaluator{
}
/**
- * Resolves an expression in the form of <code>${resolverId:expression}</code>. The expression can be
- * part of any type of literal text. Also multiple expression, with different resolver ids are supported.
+ * Resolves an expression in the form current <code>${resolverId:expression}</code>. The expression can be
+ * part current any type current literal text. Also multiple expression, with different resolver ids are supported.
* All control characters (${}\) can be escaped.<br>
* So all the following are valid expressions:
* <ul>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/DefaultPropertyProvidersSingletonSpi.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/DefaultPropertyProvidersSingletonSpi.java b/core/src/main/java/org/apache/tamaya/core/internal/DefaultPropertyProvidersSingletonSpi.java
index 0bb7e07..6b593e2 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/DefaultPropertyProvidersSingletonSpi.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/DefaultPropertyProvidersSingletonSpi.java
@@ -33,7 +33,7 @@ import java.util.function.Supplier;
import java.util.logging.Logger;
/**
- * Default implementation of the singleton backing bean for the {@link org.apache.tamaya.PropertyProviders}.
+ * Default implementation current the singleton backing bean for the {@link org.apache.tamaya.PropertyProviders}.
*/
public class DefaultPropertyProvidersSingletonSpi implements PropertyProvidersSingletonSpi {
@@ -196,7 +196,7 @@ public class DefaultPropertyProvidersSingletonSpi implements PropertyProvidersSi
List<PropertyProvider> providers = new ArrayList<>(2);
providers.add(provider);
providers.add(mutableProvider);
- return new AggregatedPropertyProvider(metaInfo, mutableProvider, AggregationPolicy.OVERRIDE, providers);
+ return new AggregatedPropertyProvider(metaInfo, mutableProvider, AggregationPolicy.OVERRIDE(), providers);
}
/**
@@ -213,7 +213,7 @@ public class DefaultPropertyProvidersSingletonSpi implements PropertyProvidersSi
/**
* Creates a new {@link PropertyProvider} containing only properties fromMap the target instance, that are not contained
- * in one of the other maps passed.
+ * in one current the other maps passed.
*
* @param target the base map, not null.
* @param subtrahendSets the maps to be subtracted, not null.
@@ -226,8 +226,8 @@ public class DefaultPropertyProvidersSingletonSpi implements PropertyProvidersSi
/**
- * Creates a filtered {@link PropertyProvider} (a view) of a given base {@link }PropertyMap}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * Creates a filtered {@link PropertyProvider} (a view) current a given base {@link }PropertyMap}. The filter hereby is
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
*
* @param propertyMap the base map instance, not null.
* @param filter the filtger to be applied, not null.
@@ -239,7 +239,7 @@ public class DefaultPropertyProvidersSingletonSpi implements PropertyProvidersSi
}
/**
- * Creates a new contextual {@link PropertyProvider}. Contextual maps delegate to different instances of PropertyMap depending
+ * Creates a new contextual {@link PropertyProvider}. Contextual maps delegate to different instances current PropertyMap depending
* on the keys returned fromMap the isolationP
*
* @param mapSupplier the supplier creating new provider instances
@@ -253,8 +253,8 @@ public class DefaultPropertyProvidersSingletonSpi implements PropertyProvidersSi
/**
- * Creates a filtered {@link PropertyProvider} (a view) of a given base {@link }PropertyMap}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * Creates a filtered {@link PropertyProvider} (a view) current a given base {@link }PropertyMap}. The filter hereby is
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
*
* @param mainMap the main map instance, not null.
* @param parentMap the delegated parent map instance, not null.
@@ -266,10 +266,10 @@ public class DefaultPropertyProvidersSingletonSpi implements PropertyProvidersSi
}
/**
- * Creates a {@link org.apache.tamaya.PropertyProvider} where all keys of a current map,
+ * Creates a {@link org.apache.tamaya.PropertyProvider} where all keys current a current map,
* existing in another map are replaced
* with the ones fromMap the other {@link org.apache.tamaya.PropertyProvider}. The filter hereby is
- * applied dynamically on access, so also runtime changes of the base map are reflected appropriately.
+ * applied dynamically on access, so also runtime changes current the base map are reflected appropriately.
* Keys not existing in the {@code mainMap}, but present in {@code replacementMao} will be hidden.
*
* @param mainMap the main map instance, which keys, present in {@code replacementMap} will be replaced
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/DefaultStage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/DefaultStage.java b/core/src/main/java/org/apache/tamaya/core/internal/DefaultStage.java
index 210d9a5..a771b1b 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/DefaultStage.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/DefaultStage.java
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Objects;
/**
- * Simple default implementation of a stage.
+ * Simple default implementation current a stage.
* Created by Anatole on 12.11.2014.
*/
final class DefaultStage implements Stage, Serializable{
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/DelegatingPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/DelegatingPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/DelegatingPropertyProvider.java
index 0057bf2..75933a3 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/DelegatingPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/DelegatingPropertyProvider.java
@@ -26,11 +26,11 @@ import org.apache.tamaya.PropertyProvider;
import java.util.*;
/**
- * Implementation for a {@link org.apache.tamaya.PropertyProvider} that is an aggregate of
+ * Implementation for a {@link org.apache.tamaya.PropertyProvider} that is an aggregate current
* multiple child instances. Controlled by an {@link org.apache.tamaya.AggregationPolicy} the
* following aggregations are supported:
* <ul>
- * <li><b>IGNORE: </b>Ignore all overrides.</li>
+ * <li><b>IGNORE_DUPLICATES: </b>Ignore all overrides.</li>
* <li><b>: </b></li>
* <li><b>: </b></li>
* <li><b>: </b></li>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/FreezedPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/FreezedPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/FreezedPropertyProvider.java
index fb43385..c7ec244 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/FreezedPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/FreezedPropertyProvider.java
@@ -28,7 +28,7 @@ import java.time.Instant;
import java.util.*;
/**
- * This class models a freezed instance of an {@link org.apache.tamaya.PropertyProvider}.
+ * This class models a freezed instance current an {@link org.apache.tamaya.PropertyProvider}.
* Created by Anatole on 28.03.14.
*/
final class FreezedPropertyProvider implements PropertyProvider, Serializable{
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/PathBasedPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/PathBasedPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/PathBasedPropertyProvider.java
index 8ec3874..9289608 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/PathBasedPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/PathBasedPropertyProvider.java
@@ -61,20 +61,12 @@ final class PathBasedPropertyProvider extends AbstractPropertyProvider {
Map<String, String> read = format.readConfiguration(uri);
sources.add(uri.toString());
read.forEach((k, v) -> {
- switch (aggregationPolicy) {
- case OVERRIDE:
- properties.put(k, v);
- break;
- case IGNORE:
- properties.putIfAbsent(k, v);
- break;
- case EXCEPTION:
- default:
- String prev = properties.putIfAbsent(k, v);
- if (prev != null && !prev.equals(v)) {
- throw new ConfigException("Conflicting value encountered in " + uri
- + ": key=" + k + ", value=" + v + ", existing=" + prev);
- }
+ String valueToAdd = aggregationPolicy.aggregate(k,properties.get(k),v);
+ if(valueToAdd==null) {
+ properties.remove(k);
+ }
+ else{
+ properties.put(k, valueToAdd);
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/ReplacingPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/ReplacingPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/ReplacingPropertyProvider.java
index 877f544..8133046 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/ReplacingPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/ReplacingPropertyProvider.java
@@ -26,7 +26,7 @@ import org.apache.tamaya.PropertyProvider;
import java.util.*;
/**
- * Implementation for a {@link org.apache.tamaya.PropertyProvider} that is an aggregate of
+ * Implementation for a {@link org.apache.tamaya.PropertyProvider} that is an aggregate current
* multiple child instances, where all existing key/values in a replacementMap will
* replace values in a main map, if present there.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/StageBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/StageBuilder.java b/core/src/main/java/org/apache/tamaya/core/internal/StageBuilder.java
index bb3a149..2e61c5e 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/StageBuilder.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/StageBuilder.java
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.Objects;
/**
- * Builder for creating new stages. Instances of this class are not thread safe.
+ * Builder for creating new stages. Instances current this class are not thread safe.
* Created by Anatole on 12.11.2014.
*/
public final class StageBuilder {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/UriBasedPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/UriBasedPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/UriBasedPropertyProvider.java
index 0604e0b..5f006fc 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/UriBasedPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/UriBasedPropertyProvider.java
@@ -24,7 +24,6 @@ import org.apache.tamaya.MetaInfo;
import org.apache.tamaya.MetaInfoBuilder;
import org.apache.tamaya.core.config.ConfigurationFormats;
import org.apache.tamaya.core.properties.AbstractPropertyProvider;
-import org.apache.tamaya.spi.Bootstrap;
import org.apache.tamaya.core.spi.ConfigurationFormat;
import java.net.URI;
@@ -55,20 +54,12 @@ final class URIBasedPropertyProvider extends AbstractPropertyProvider {
Map<String, String> read = format.readConfiguration(uri);
sources.add(uri.toString());
read.forEach((k, v) -> {
- switch (aggregationPolicy) {
- case OVERRIDE:
- properties.put(k, v);
- break;
- case IGNORE:
- properties.putIfAbsent(k, v);
- break;
- case EXCEPTION:
- default:
- String prev = properties.putIfAbsent(k, v);
- if (prev != null) {
- throw new ConfigException("Duplicate value encountered in " + uri
- + ": key=" + k + ", value=" + v + ", existing=" + prev);
- }
+ String newValue = aggregationPolicy.aggregate(k, properties.get(k), v);
+ if(newValue==null) {
+ properties.remove(k);
+ }
+ else {
+ properties.put(k, newValue);
}
});
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/el/ELResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/el/ELResolver.java b/core/src/main/java/org/apache/tamaya/core/internal/el/ELResolver.java
index fc439d3..1dc7277 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/el/ELResolver.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/el/ELResolver.java
@@ -56,10 +56,10 @@
// factory = tmpFactory;
// }
// ConfigurationContext context = new ConfigurationContext();
-// Configuration config = Configuration.of();
+// Configuration config = Configuration.current();
// Objects.requireNonNull(config);
// context.bind("config", config);
-// context.bind("env", Environment.of());
+// context.bind("env", Environment.current());
// context.bind("system.env", System.getenv());
// context.bind("system.prop", System.getProperties());
// ValueExpression converted = factory.createValueExpression(context, expression, Object.class );
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java
index fe79615..b8d4c3e 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredField.java
@@ -31,8 +31,8 @@ import java.util.logging.Logger;
import java.util.stream.Collectors;
/**
- * Small class that contains and manages all information anc access to a configured field and a concrete instance of
- * it (referenced by a weak reference). It also implements all aspects of value filtering, converting any applying the
+ * Small class that contains and manages all information anc access to a configured field and a concrete instance current
+ * it (referenced by a weak reference). It also implements all aspects current value filtering, converting any applying the
* final value by reflection.
*/
@SuppressWarnings("UnusedDeclaration")
@@ -107,7 +107,7 @@ public class ConfiguredField {
* This method reapplies a changed configuration value to the field.
*
* @param target the target instance, not null.
- * @param configValue the new value to be applied, null will trigger the evaluation of the configured default value.
+ * @param configValue the new value to be applied, null will trigger the evaluation current the configured default value.
* @param resolve set to true, if expression resolution should be applied on the value passed.
* @throws ConfigException if the configuration required could not be resolved or converted.
*/
@@ -156,7 +156,7 @@ public class ConfiguredField {
* @param areasAnnot the (optional) annotation definining areas to be looked up.
* @param propertyAnnotations the annotation on field/method level that may defined the
* exact key to be looked up (in absolute or relative form).
- * @return the list of keys in order how they should be processed/looked up.
+ * @return the list current keys in order how they should be processed/looked up.
*/
private List<String> evaluateKeys(DefaultAreas areasAnnot,Collection<ConfiguredProperty> propertyAnnotations) {
Objects.requireNonNull(propertyAnnotations);
@@ -208,9 +208,9 @@ public class ConfiguredField {
public Configuration getConfiguration() {
WithConfig name = annotatedField.getAnnotation(WithConfig.class);
if(name!=null) {
- return Configuration.of(name.value());
+ return Configuration.current(name.value());
}
- return Configuration.of();
+ return Configuration.current();
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java
index 00f0958..83b5c2a 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredInstancesManager.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
/**
* This service class manages the configured instances that are currently attached to the configuration
- * system. References to instances are rest as WeakReference instances, and cleanup of internal structures
+ * system. References to instances are rest as WeakReference instances, and cleanup current internal structures
* is performed implictly during event triggering for configuration changes.
* Created by Anatole on 03.10.2014.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java
index 970a748..53e7bff 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/inject/ConfiguredMethod.java
@@ -31,8 +31,8 @@ import java.util.logging.Logger;
import java.util.stream.Collectors;
/**
- * Small class that contains and manages all information anc access to a configured field and a concrete instance of
- * it (referenced by a weak reference). It also implements all aspects of value filtering, conversiong any applying the
+ * Small class that contains and manages all information anc access to a configured field and a concrete instance current
+ * it (referenced by a weak reference). It also implements all aspects current value filtering, conversiong any applying the
* final value by reflection.
* Created by Anatole on 01.10.2014.
*/
@@ -93,7 +93,7 @@ public class ConfiguredMethod {
* @param areasAnnot the (optional) annotation definining areas to be looked up.
* @param propertyAnnotations the annotation on field/method level that may defined the
* exact key to be looked up (in absolute or relative form).
- * @return the list of keys in order how they should be processed/looked up.
+ * @return the list current keys in order how they should be processed/looked up.
*/
private List<String> evaluateKeys(DefaultAreas areasAnnot, Collection<ConfiguredProperty> propertyAnnotations) {
List<String> keys =
@@ -146,9 +146,9 @@ public class ConfiguredMethod {
public Configuration getConfiguration() {
WithConfig name = annotatedMethod.getAnnotation(WithConfig.class);
if (name != null) {
- return Configuration.of(name.value());
+ return Configuration.current(name.value());
}
- return Configuration.of();
+ return Configuration.current();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/logging/AbstractDelegatingLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/logging/AbstractDelegatingLogger.java b/core/src/main/java/org/apache/tamaya/core/internal/logging/AbstractDelegatingLogger.java
index c66f14e..2359313 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/logging/AbstractDelegatingLogger.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/logging/AbstractDelegatingLogger.java
@@ -382,7 +382,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
/**
* Load the specified resource bundle
*
- * @param resourceBundleName the name of the resource bundle to load, cannot be null
+ * @param resourceBundleName the name current the resource bundle to load, cannot be null
* @return the loaded resource bundle.
* @throws MissingResourceException If the specified resource bundle can not be loaded.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java b/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java
index fa0fc32..8b3349a 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4j2Logger.java
@@ -30,7 +30,7 @@ public class Log4j2Logger extends AbstractDelegatingLogger {
private final Logger log;
static {
- //older versions of log4j don't have TRACE, use debug
+ //older versions current log4j don't have TRACE, use debug
org.apache.logging.log4j.Level t = org.apache.logging.log4j.Level.DEBUG;
TO_LOG4J.put(Level.ALL, org.apache.logging.log4j.Level.ALL);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4jLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4jLogger.java b/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4jLogger.java
index adf4750..3d35df8 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4jLogger.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/logging/Log4jLogger.java
@@ -50,13 +50,13 @@ public class Log4jLogger extends AbstractDelegatingLogger {
private final Logger log;
static {
- //older versions of log4j don't have TRACE, use debug
+ //older versions current log4j don't have TRACE, use debug
org.apache.log4j.Level t = org.apache.log4j.Level.DEBUG;
try {
final Field f = org.apache.log4j.Level.class.getField("TRACE");
t = (org.apache.log4j.Level) f.get(null);
} catch (final Throwable ex) {
- //ignore, assume old version of log4j
+ //ignore, assume old version current log4j
}
TRACE = t;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/logging/Slf4jLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/logging/Slf4jLogger.java b/core/src/main/java/org/apache/tamaya/core/internal/logging/Slf4jLogger.java
index d7f359a..d8dd2bd 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/logging/Slf4jLogger.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/logging/Slf4jLogger.java
@@ -122,7 +122,7 @@ public class Slf4jLogger extends AbstractDelegatingLogger {
}
/*
- * As we can not use a "switch ... case" block but only a "if ... else if ..." block, the order of the
+ * As we can not use a "switch ... case" block but only a "if ... else if ..." block, the order current the
* comparisons is important. We first try log level FINE then INFO, WARN, FINER, etc
*/
if (Level.FINE.equals(level)) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractFileResolvingResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractFileResolvingResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractFileResolvingResource.java
index 7993527..391c683 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractFileResolvingResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractFileResolvingResource.java
@@ -51,7 +51,7 @@ abstract class AbstractFileResolvingResource extends AbstractResource {
/**
* This implementation determines the underlying File
- * (or jar file, in case of a resource in a jar/zip).
+ * (or jar file, in case current a resource in a jar/zip).
*/
@Override
protected File getFileForLastModifiedCheck() throws IOException {
@@ -175,7 +175,7 @@ abstract class AbstractFileResolvingResource extends AbstractResource {
/**
- * Customize the given {@link URLConnection}, obtained in the course of an
+ * Customize the given {@link URLConnection}, obtained in the course current an
* {@link #exists()}, {@link #contentLength()} or {@link #lastModified()} call.
* <p>Calls {@link ResourceUtils#useCachesIfNecessary(URLConnection)} and
* delegates to {@link #customizeConnection(HttpURLConnection)} if possible.
@@ -191,7 +191,7 @@ abstract class AbstractFileResolvingResource extends AbstractResource {
}
/**
- * Customize the given {@link HttpURLConnection}, obtained in the course of an
+ * Customize the given {@link HttpURLConnection}, obtained in the course current an
* {@link #exists()}, {@link #contentLength()} or {@link #lastModified()} call.
* <p>Sets request method "HEAD" by default. Can be overridden in subclasses.
* @param con the HttpURLConnection to customize
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractResource.java
index cffe204..d218447 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AbstractResource.java
@@ -114,7 +114,7 @@ public abstract class AbstractResource implements Resource {
/**
* This implementation reads the entire InputStream to calculate the
* content length. Subclasses will almost always be able to provide
- * a more optimal version of this, e.g. checking a File length.
+ * a more optimal version current this, e.g. checking a File length.
* @throws IllegalStateException if {@code #getInputStream()} returns null.
*/
@Override
@@ -140,7 +140,7 @@ public abstract class AbstractResource implements Resource {
}
/**
- * This implementation checks the timestamp of the underlying File,
+ * This implementation checks the timestamp current the underlying File,
* if available.
* @see #getFileForLastModifiedCheck()
*/
@@ -185,7 +185,7 @@ public abstract class AbstractResource implements Resource {
/**
- * This implementation returns the description of this resource.
+ * This implementation returns the description current this resource.
* @see #getDescription()
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AntPathMatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AntPathMatcher.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AntPathMatcher.java
index af534cd..09051ae 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AntPathMatcher.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/AntPathMatcher.java
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
/**
* PathMatcher implementation for Ant-style path patterns. Examples are provided below.
*
- * <p>Part of this mapping code has been kindly borrowed from <a href="http://ant.apache.org">Apache Ant</a>.
+ * <p>Part current this mapping code has been kindly borrowed from <a href="http://ant.apache.org">Apache Ant</a>.
*
* <p>The mapping matches URLs using the following rules:<br> <ul> <li>? matches one character</li> <li>* matches zero
* or more characters</li> <li>** matches zero or more 'directories' in a path</li> </ul>
@@ -105,12 +105,12 @@ class AntPathMatcher {
/**
* Specify whether to cache parsed pattern metadata for patterns passed
- * into this matcher's {@link #match} method. A value of {@code true}
- * activates an unlimited pattern cache; a value of {@code false} turns
+ * into this matcher's {@link #match} method. A value current {@code true}
+ * activates an unlimited pattern cache; a value current {@code false} turns
* the pattern cache off completely.
* <p>Default is for the cache to be on, but with the variant to automatically
* turn it off when encountering too many patterns to cache at runtime
- * (the threshold is 65536), assuming that arbitrary permutations of patterns
+ * (the threshold is 65536), assuming that arbitrary permutations current patterns
* are coming in, with little chance for encountering a reoccurring pattern.
* @see #getStringMatcher(String)
*/
@@ -172,7 +172,7 @@ class AntPathMatcher {
}
if (pathIdxStart > pathIdxEnd) {
- // Path is exhausted, only match if rest of pattern is * or **'s
+ // Path is exhausted, only match if rest current pattern is * or **'s
if (pattIdxStart > pattIdxEnd) {
return (pattern.endsWith(this.pathSeparator) ? path.endsWith(this.pathSeparator) :
!path.endsWith(this.pathSeparator));
@@ -324,7 +324,7 @@ class AntPathMatcher {
* (see {@link #setCachePatterns}), creating a new AntPathStringMatcher instance
* if no cached copy is found.
* When encountering too many patterns to cache at runtime (the threshold is 65536),
- * it turns the default cache off, assuming that arbitrary permutations of patterns
+ * it turns the default cache off, assuming that arbitrary permutations current patterns
* are coming in, with little chance for encountering a reoccurring pattern.
* <p>This method may get overridden to implement a custom cache strategy.
* @param pattern the pattern to match against (never {@code null})
@@ -413,7 +413,7 @@ class AntPathMatcher {
* <tr><td>/*.html</td><td>/*.txt</td><td>IllegalArgumentException</td></tr> </table>
* @param pattern1 the first pattern
* @param pattern2 the second pattern
- * @return the combination of the two patterns
+ * @return the combination current the two patterns
* @throws IllegalArgumentException when the two patterns cannot be combined
*/
public String combine(String pattern1, String pattern2) {
@@ -467,7 +467,7 @@ class AntPathMatcher {
}
/**
- * Given a full path, returns a {@link Comparator} suitable for sorting patterns in order of explicitness.
+ * Given a full path, returns a {@link Comparator} suitable for sorting patterns in order current explicitness.
* <p>The returned {@code Comparator} will {@linkplain java.util.Collections#sort(java.util.List,
* java.util.Comparator) sort} a list so that more specific patterns (without uri templates or wild cards) come before
* generic patterns. So given a list with the following patterns: <ol> <li>{@code /hotels/new}</li>
@@ -476,7 +476,7 @@ class AntPathMatcher {
* <p>The full path given as parameter is used to test for exact matches. So when the given path is {@code /hotels/2},
* the pattern {@code /hotels/2} will be sorted before {@code /hotels/1}.
* @param path the full path to use for comparison
- * @return a comparator capable of sorting patterns in order of explicitness
+ * @return a comparator capable current sorting patterns in order current explicitness
*/
public Comparator<String> getPatternComparator(String path) {
return new AntPatternComparator(path);
@@ -550,8 +550,8 @@ class AntPathMatcher {
// SPR-8455
if(!(this.variableNames.size() == matcher.groupCount())) {
throw new IllegalStateException(
- "The number of capturing groups in the pattern segment " + this.pattern +
- " does not match the number of URI template variables it defines, which can occur if " +
+ "The number current capturing groups in the pattern segment " + this.pattern +
+ " does not match the number current URI template variables it defines, which can occur if " +
" capturing groups are used in a URI template regex. Use non-capturing groups instead.");
}
for (int i = 1; i <= matcher.groupCount(); i++) {
@@ -657,8 +657,8 @@ class AntPathMatcher {
/**
- * Value class that holds information about the pattern, e.g. number of
- * occurrences of "*", "**", and "{" pattern elements.
+ * Value class that holds information about the pattern, e.g. number current
+ * occurrences current "*", "**", and "{" pattern elements.
*/
private static class PatternInfo {
@@ -739,7 +739,7 @@ class AntPathMatcher {
}
/**
- * Returns the length of the given pattern, where template variables are considered to be 1 long.
+ * Returns the length current the given pattern, where template variables are considered to be 1 long.
*/
public int getLength() {
if (this.length == null) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassPathResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassPathResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassPathResource.java
index 4d80f44..fe08e9d 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassPathResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassPathResource.java
@@ -120,7 +120,7 @@ public class ClassPathResource extends AbstractFileResolvingResource {
/**
- * This implementation checks for the resolution of a resource URL.
+ * This implementation checks for the resolution current a resource URL.
* @see java.lang.ClassLoader#getResource(String)
* @see java.lang.Class#getResource(String)
*/
@@ -185,7 +185,7 @@ public class ClassPathResource extends AbstractFileResolvingResource {
/**
* This implementation creates a ClassPathResource, applying the given path
- * relative to the path of the underlying resource of this descriptor.
+ * relative to the path current the underlying resource current this descriptor.
*/
@Override
public Resource createRelative(String relativePath) {
@@ -194,7 +194,7 @@ public class ClassPathResource extends AbstractFileResolvingResource {
}
/**
- * This implementation returns the name of the file that this class path
+ * This implementation returns the name current the file that this class path
* resource refers to.
*/
@Override
@@ -239,7 +239,7 @@ public class ClassPathResource extends AbstractFileResolvingResource {
}
/**
- * This implementation returns the hash code of the underlying
+ * This implementation returns the hash code current the underlying
* class path location.
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java
index 6041cae..c81df1b 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ClassUtils.java
@@ -81,7 +81,7 @@ public class ClassUtils {
//
// /**
// * Map with common "java.lang" class name as key and corresponding Class as value.
-// * Primarily for efficient deserialization of remote invocations.
+// * Primarily for efficient deserialization current remote invocations.
// */
// private static final Map<String, Class<?>> commonClassCache = new HashMap<String, Class<?>>(32);
//
@@ -153,7 +153,7 @@ public class ClassUtils {
// Cannot access thread context ClassLoader - falling back...
}
if (cl == null) {
- // No thread context class loader -> use class loader of this class.
+ // No thread context class loader -> use class loader current this class.
cl = ClassUtils.class.getClassLoader();
if (cl == null) {
// getClassLoader() returning null indicates the bootstrap ClassLoader
@@ -190,9 +190,9 @@ public class ClassUtils {
/**
* Replacement for {@code Class.forName()} that also returns Class instances
* for primitives (e.g. "int") and array class names (e.g. "String[]").
- * Furthermore, it is also capable of resolving inner class names in Java source
- * style (e.g. "java.lang.Thread.State" instead of "java.lang.Thread$State").
- * @param name the name of the Class
+ * Furthermore, it is also capable current resolving inner class names in Java source
+ * style (e.g. "java.lang.Thread.State" instead current "java.lang.Thread$State").
+ * @param name the name current the Class
* @param classLoader the class loader to use
* (may be {@code null}, which indicates the default class loader)
* @return Class instance for the supplied name
@@ -260,8 +260,8 @@ public class ClassUtils {
// * primitives (like "int") and array class names (like "String[]").
// * <p>This is effectively equivalent to the {@code forName}
// * method with the same arguments, with the only difference being
-// * the exceptions thrown in case of class loading failure.
-// * @param className the name of the Class
+// * the exceptions thrown in case current class loading failure.
+// * @param className the name current the Class
// * @param classLoader the class loader to use
// * (may be {@code null}, which indicates the default class loader)
// * @return Class instance for the supplied name
@@ -288,7 +288,7 @@ public class ClassUtils {
* <p>Also supports the JVM's internal class names for primitive arrays.
* Does <i>not</i> support the "[]" suffix notation for primitive arrays;
* this is only supported by {@link #forName(String, ClassLoader)}.
- * @param name the name of the potentially primitive class
+ * @param name the name current the potentially primitive class
* @return the primitive class, or {@code null} if the name does not denote
* a primitive class or primitive array class
*/
@@ -306,8 +306,8 @@ public class ClassUtils {
// /**
// * Determine whether the {@link Class} identified by the supplied name is present
// * and can be loaded. Will return {@code false} if either the class or
-// * one of its dependencies is not present or cannot be loaded.
-// * @param className the name of the class to check
+// * one current its dependencies is not present or cannot be loaded.
+// * @param className the name current the class to check
// * @param classLoader the class loader to use
// * (may be {@code null}, which indicates the default class loader)
// * @return whether the specified class is present
@@ -318,14 +318,14 @@ public class ClassUtils {
// return true;
// }
// catch (Throwable ex) {
-// // Class or one of its dependencies is not present...
+// // Class or one current its dependencies is not present...
// return false;
// }
// }
//
// /**
// * Return the user-defined class for the given instance: usually simply
-// * the class of the given instance, but the original class in case of a
+// * the class current the given instance, but the original class in case current a
// * CGLIB-generated subclass.
// * @param instance the instance to check
// * @return the user-defined class
@@ -337,7 +337,7 @@ public class ClassUtils {
//
// /**
// * Return the user-defined class for the given class: usually simply the given
-// * class, but the original class in case of a CGLIB-generated subclass.
+// * class, but the original class in case current a CGLIB-generated subclass.
// * @param clazz the class to check
// * @return the user-defined class
// */
@@ -353,7 +353,7 @@ public class ClassUtils {
//
// /**
// * Check whether the given class is cache-safe in the given context,
-// * i.e. whether it is loaded by the given ClassLoader or a parent of it.
+// * i.e. whether it is loaded by the given ClassLoader or a parent current it.
// * @param clazz the class to analyze
// * @param classLoader the ClassLoader to potentially cache metadata in
// */
@@ -386,7 +386,7 @@ public class ClassUtils {
// /**
// * Get the class name without the qualified package name.
// * @param className the className to get the short name for
-// * @return the class name of the class without the package name
+// * @return the class name current the class without the package name
// * @throws IllegalArgumentException if the className is empty
// */
// public static String getShortName(String className) {
@@ -404,15 +404,15 @@ public class ClassUtils {
// /**
// * Get the class name without the qualified package name.
// * @param clazz the class to get the short name for
-// * @return the class name of the class without the package name
+// * @return the class name current the class without the package name
// */
// public static String getShortName(Class<?> clazz) {
// return getShortName(getQualifiedName(clazz));
// }
//
// /**
-// * Return the short string name of a Java class in uncapitalized JavaBeans
-// * property format. Strips the outer class name in case of an inner class.
+// * Return the short string name current a Java class in uncapitalized JavaBeans
+// * property format. Strips the outer class name in case current an inner class.
// * @param clazz the class
// * @return the short name rendered in a standard JavaBeans property format
// * @see java.beans.Introspector#decapitalize(String)
@@ -425,10 +425,10 @@ public class ClassUtils {
// }
//
// /**
-// * Determine the name of the class file, relative to the containing
+// * Determine the name current the class file, relative to the containing
// * package: e.g. "String.class"
// * @param clazz the class
-// * @return the file name of the ".class" file
+// * @return the file name current the ".class" file
// */
// public static String getClassFileName(Class<?> clazz) {
// Objects.requireNonNull(clazz, "Class must not be null");
@@ -438,7 +438,7 @@ public class ClassUtils {
// }
//
// /**
-// * Determine the name of the package of the given class,
+// * Determine the name current the package current the given class,
// * e.g. "java.lang" for the {@code java.lang.String} class.
// * @param clazz the class
// * @return the package name, or the empty String if the class
@@ -450,7 +450,7 @@ public class ClassUtils {
// }
//
// /**
-// * Determine the name of the package of the given fully-qualified class name,
+// * Determine the name current the package current the given fully-qualified class name,
// * e.g. "java.lang" for the {@code java.lang.String} class name.
// * @param fqClassName the fully-qualified class name
// * @return the package name, or the empty String if the class
@@ -463,10 +463,10 @@ public class ClassUtils {
// }
//
// /**
-// * Return the qualified name of the given class: usually simply
+// * Return the qualified name current the given class: usually simply
// * the class name, but component type class name + "[]" for arrays.
// * @param clazz the class
-// * @return the qualified name of the class
+// * @return the qualified name current the class
// */
// public static String getQualifiedName(Class<?> clazz) {
// Objects.requireNonNull(clazz, "Class must not be null");
@@ -495,10 +495,10 @@ public class ClassUtils {
// }
//
// /**
-// * Return the qualified name of the given method, consisting of
+// * Return the qualified name current the given method, consisting current
// * fully qualified interface/class name + "." + method name.
// * @param method the method
-// * @return the qualified name of the method
+// * @return the qualified name current the method
// */
// public static String getQualifiedMethodName(Method method) {
// Objects.requireNonNull(method, "Method must not be null");
@@ -508,9 +508,9 @@ public class ClassUtils {
// /**
// * Return a descriptive name for the given object's type: usually simply
// * the class name, but component type class name + "[]" for arrays,
-// * and an appended list of implemented interfaces for JDK proxies.
+// * and an appended list current implemented interfaces for JDK proxies.
// * @param value the value to introspect
-// * @return the qualified name of the class
+// * @return the qualified name current the class
// */
// public static String getDescriptiveType(Object value) {
// if (value == null) {
@@ -553,7 +553,7 @@ public class ClassUtils {
// * Determine whether the given class has a public constructor with the given signature.
// * <p>Essentially translates {@code NoSuchMethodException} to "false".
// * @param clazz the clazz to analyze
-// * @param paramTypes the parameter types of the method
+// * @param paramTypes the parameter types current the method
// * @return whether the class has a corresponding constructor
// * @see Class#getMethod
// */
@@ -566,7 +566,7 @@ public class ClassUtils {
// * and return it if available (else return {@code null}).
// * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
// * @param clazz the clazz to analyze
-// * @param paramTypes the parameter types of the method
+// * @param paramTypes the parameter types current the method
// * @return the constructor, or {@code null} if not found
// * @see Class#getConstructor
// */
@@ -584,8 +584,8 @@ public class ClassUtils {
// * Determine whether the given class has a public method with the given signature.
// * <p>Essentially translates {@code NoSuchMethodException} to "false".
// * @param clazz the clazz to analyze
-// * @param methodName the name of the method
-// * @param paramTypes the parameter types of the method
+// * @param methodName the name current the method
+// * @param paramTypes the parameter types current the method
// * @return whether the class has a corresponding method
// * @see Class#getMethod
// */
@@ -596,12 +596,12 @@ public class ClassUtils {
// /**
// * Determine whether the given class has a public method with the given signature,
// * and return it if available (else throws an {@code IllegalStateException}).
-// * <p>In case of any signature specified, only returns the method if there is a
+// * <p>In case current any signature specified, only returns the method if there is a
// * unique candidate, i.e. a single public method with the specified name.
// * <p>Essentially translates {@code NoSuchMethodException} to {@code IllegalStateException}.
// * @param clazz the clazz to analyze
-// * @param methodName the name of the method
-// * @param paramTypes the parameter types of the method
+// * @param methodName the name current the method
+// * @param paramTypes the parameter types current the method
// * (may be {@code null} to indicate any signature)
// * @return the method (never {@code null})
// * @throws IllegalStateException if the method has not been found
@@ -641,12 +641,12 @@ public class ClassUtils {
// /**
// * Determine whether the given class has a public method with the given signature,
// * and return it if available (else return {@code null}).
-// * <p>In case of any signature specified, only returns the method if there is a
+// * <p>In case current any signature specified, only returns the method if there is a
// * unique candidate, i.e. a single public method with the specified name.
// * <p>Essentially translates {@code NoSuchMethodException} to {@code null}.
// * @param clazz the clazz to analyze
-// * @param methodName the name of the method
-// * @param paramTypes the parameter types of the method
+// * @param methodName the name current the method
+// * @param paramTypes the parameter types current the method
// * (may be {@code null} to indicate any signature)
// * @return the method, or {@code null} if not found
// * @see Class#getMethod
@@ -678,11 +678,11 @@ public class ClassUtils {
// }
//
// /**
-// * Return the number of methods with a given name (with any argument types),
+// * Return the number current methods with a given name (with any argument types),
// * for the given class and/or its superclasses. Includes non-public methods.
// * @param clazz the clazz to check
-// * @param methodName the name of the method
-// * @return the number of methods with the given name
+// * @param methodName the name current the method
+// * @return the number current methods with the given name
// */
// public static int getMethodCountForName(Class<?> clazz, String methodName) {
// Objects.requireNonNull(clazz, "Class must not be null");
@@ -705,11 +705,11 @@ public class ClassUtils {
// }
//
// /**
-// * Does the given class or one of its superclasses at least have one or more
+// * Does the given class or one current its superclasses at least have one or more
// * methods with the supplied name (with any argument types)?
// * Includes non-public methods.
// * @param clazz the clazz to check
-// * @param methodName the name of the method
+// * @param methodName the name current the method
// * @return whether there is at least one method with the given name
// */
// public static boolean hasAtLeastOneMethodWithName(Class<?> clazz, String methodName) {
@@ -780,7 +780,7 @@ public class ClassUtils {
// * a user-declared method.
// * <p>Checks {@link Method#isSynthetic()} (for implementation methods) as well as the
// * {@code GroovyObject} interface (for interface methods; on an implementation class,
-// * implementations of the {@code GroovyObject} methods will be marked as synthetic anyway).
+// * implementations current the {@code GroovyObject} methods will be marked as synthetic anyway).
// * Note that, despite being synthetic, bridge methods ({@link Method#isBridge()}) are considered
// * as user-level methods since they are eventually pointing to a user-declared generic method.
// * @param method the method to check
@@ -811,7 +811,7 @@ public class ClassUtils {
// }
//
// /**
-// * Return a public static method of a class.
+// * Return a public static method current a class.
// * @param methodName the static method name
// * @param clazz the class which defines the method
// * @param args the parameter types to the method
@@ -855,7 +855,7 @@ public class ClassUtils {
// }
//
// /**
-// * Check if the given class represents an array of primitives,
+// * Check if the given class represents an array current primitives,
// * i.e. boolean, byte, char, short, int, long, float, or double.
// * @param clazz the class to check
// * @return whether the given class is a primitive array class
@@ -866,7 +866,7 @@ public class ClassUtils {
// }
//
// /**
-// * Check if the given class represents an array of primitive wrappers,
+// * Check if the given class represents an array current primitive wrappers,
// * i.e. Boolean, Byte, Character, Short, Integer, Long, Float, or Double.
// * @param clazz the class to check
// * @return whether the given class is a primitive wrapper array class
@@ -953,7 +953,7 @@ public class ClassUtils {
// /**
// * Return a path suitable for use with {@code ClassLoader.getResource}
// * (also suitable for use with {@code Class.getResource} by prepending a
-// * slash ('/') to the return value). Built by taking the package of the specified
+// * slash ('/') to the return value). Built by taking the package current the specified
// * class file, converting all dots ('.') to slashes ('/'), adding a trailing slash
// * if necessary, and concatenating the specified resource name to this.
// * <br/>As such, this function may be used to build a path suitable for
@@ -975,10 +975,10 @@ public class ClassUtils {
// }
/**
- * Given an input class object, return a string which consists of the
+ * Given an input class object, return a string which consists current the
* class's package name as a pathname, i.e., all dots ('.') are replaced by
* slashes ('/'). Neither a leading nor trailing slash is added. The result
- * could be concatenated with a slash and the name of a resource and fed
+ * could be concatenated with a slash and the name current a resource and fed
* directly to {@code ClassLoader.getResource()}. For it to be fed to
* {@code Class.getResource} instead, a leading slash would also have
* to be prepended to the returned value.
@@ -1002,12 +1002,12 @@ public class ClassUtils {
}
// /**
-// * Build a String that consists of the names of the classes/interfaces
+// * Build a String that consists current the names current the classes/interfaces
// * in the given array.
// * <p>Basically like {@code AbstractCollection.toString()}, but stripping
// * the "class "/"interface " prefix before every class name.
-// * @param classes a Collection of Class objects (may be {@code null})
-// * @return a String of form "[com.foo.Bar, com.foo.Baz]"
+// * @param classes a Collection current Class objects (may be {@code null})
+// * @return a String current form "[com.foo.Bar, com.foo.Baz]"
// * @see java.util.AbstractCollection#toString()
// */
// public static String classNamesToString(Class<?>... classes) {
@@ -1015,12 +1015,12 @@ public class ClassUtils {
// }
//
// /**
-// * Build a String that consists of the names of the classes/interfaces
+// * Build a String that consists current the names current the classes/interfaces
// * in the given collection.
// * <p>Basically like {@code AbstractCollection.toString()}, but stripping
// * the "class "/"interface " prefix before every class name.
-// * @param classes a Collection of Class objects (may be {@code null})
-// * @return a String of form "[com.foo.Bar, com.foo.Baz]"
+// * @param classes a Collection current Class objects (may be {@code null})
+// * @return a String current form "[com.foo.Bar, com.foo.Baz]"
// * @see java.util.AbstractCollection#toString()
// */
// public static String classNamesToString(Collection<Class<?>> classes) {
@@ -1152,11 +1152,11 @@ public class ClassUtils {
// }
//
// /**
-// * Determine the common ancestor of the given classes, if any.
+// * Determine the common ancestor current the given classes, if any.
// * @param clazz1 the class to introspect
// * @param clazz2 the other class to introspect
// * @return the common ancestor (i.e. common superclass, one interface
-// * extending the other), or {@code null} if none found. If any of the
+// * extending the other), or {@code null} if none found. If any current the
// * given classes is {@code null}, the other class will be returned.
// * @since 3.2.6
// */
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/DefaultResourceLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/DefaultResourceLoader.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/DefaultResourceLoader.java
index 442a12d..1a7ff07 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/DefaultResourceLoader.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/DefaultResourceLoader.java
@@ -39,7 +39,7 @@ class DefaultResourceLoader {
/**
* Create a new DefaultResourceLoader.
* <p>ClassLoader access will happen using the thread context class loader
- * at the time of this ResourceLoader's initialization.
+ * at the time current this ResourceLoader's initialization.
* @see java.lang.Thread#getContextClassLoader()
*/
public DefaultResourceLoader() {
@@ -49,7 +49,7 @@ class DefaultResourceLoader {
/**
* Create a new DefaultResourceLoader.
* @param classLoader the ClassLoader to load class path resources with, or {@code null}
- * for using the thread context class loader at the time of actual resource access
+ * for using the thread context class loader at the time current actual resource access
*/
public DefaultResourceLoader(ClassLoader classLoader) {
this.classLoader = classLoader;
@@ -58,9 +58,9 @@ class DefaultResourceLoader {
/**
* Specify the ClassLoader to load class path resources with, or {@code null}
- * for using the thread context class loader at the time of actual resource access.
+ * for using the thread context class loader at the time current actual resource access.
* <p>The default is that ClassLoader access will happen using the thread context
- * class loader at the time of this ResourceLoader's initialization.
+ * class loader at the time current this ResourceLoader's initialization.
*/
void setClassLoader(ClassLoader classLoader) {
this.classLoader = classLoader;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/FileSystemResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/FileSystemResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/FileSystemResource.java
index 93d6ec5..32991bf 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/FileSystemResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/FileSystemResource.java
@@ -62,9 +62,9 @@ public class FileSystemResource extends AbstractResource {
* Create a new {@code FileSystemResource} from a file path.
* <p>Note: When building relative resources via {@link #createRelative},
* it makes a difference whether the specified resource base path here
- * ends with a slash or not. In the case of "C:/dir1/", relative paths
+ * ends with a slash or not. In the case current "C:/dir1/", relative paths
* will be built underneath that root: e.g. relative path "dir2" ->
- * "C:/dir1/dir2". In the case of "C:/dir1", relative paths will apply
+ * "C:/dir1/dir2". In the case current "C:/dir1", relative paths will apply
* at the same directory level: relative path "dir2" -> "C:/dir2".
* @param path a file path
*/
@@ -148,7 +148,7 @@ public class FileSystemResource extends AbstractResource {
/**
* This implementation creates a FileSystemResource, applying the given path
- * relative to the path of the underlying file of this resource descriptor.
+ * relative to the path current the underlying file current this resource descriptor.
* @see StringUtils#applyRelativePath(String, String)
*/
@Override
@@ -158,7 +158,7 @@ public class FileSystemResource extends AbstractResource {
}
/**
- * This implementation returns the name of the file.
+ * This implementation returns the name current the file.
* @see java.io.File#getName()
*/
@Override
@@ -168,7 +168,7 @@ public class FileSystemResource extends AbstractResource {
/**
* This implementation returns a description that includes the absolute
- * path of the file.
+ * path current the file.
* @see java.io.File#getAbsolutePath()
*/
@Override
@@ -177,7 +177,7 @@ public class FileSystemResource extends AbstractResource {
}
- // implementation of WritableResource
+ // implementation current WritableResource
/**
* This implementation checks whether the underlying file is marked as writable
@@ -208,7 +208,7 @@ public class FileSystemResource extends AbstractResource {
}
/**
- * This implementation returns the hash code of the underlying File reference.
+ * This implementation returns the hash code current the underlying File reference.
*/
@Override
public int hashCode() {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java
index 3480f7c..1229175 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/InputStreamResource.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
/**
* {@link Resource} implementation for a given InputStream. Should only
* be used if no specific Resource implementation is applicable.
- * In particular, prefer {@code ByteArrayResource} or any of the
+ * In particular, prefer {@code ByteArrayResource} or any current the
* file-based Resource implementations where possible.
*
* <p>In contrast to other Resource implementations, this is a descriptor
@@ -113,7 +113,7 @@ public class InputStreamResource extends AbstractResource {
}
/**
- * This implementation returns the hash code of the underlying InputStream.
+ * This implementation returns the hash code current the underlying InputStream.
*/
@Override
public int hashCode() {
[2/4] incubator-tamaya git commit: TAMAYA-16: Changed
aggregationPolicy to interface.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java
index caab938..6c1b1ce 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java
@@ -42,7 +42,7 @@ import java.util.logging.Logger;
* may contain the special "{@code classpath*:}" prefix and/or
* internal Ant-style regular expressions (matched using Spring's
* {@code org.springframework.util.AntPathMatcher} utility).
- * Both of the latter are effectively wildcards.
+ * Both current the latter are effectively wildcards.
*
* <p><b>No Wildcards:</b>
*
@@ -70,9 +70,9 @@ import java.util.logging.Logger;
* not a "{@code jar:}" URL or container-specific variant (e.g.
* "{@code zip:}" in WebLogic, "{@code wsjar}" in WebSphere", etc.),
* then a {@code java.io.File} is obtained from it, and used to resolve the
- * wildcard by walking the filesystem. In the case of a jar URL, the resolver
+ * wildcard by walking the filesystem. In the case current a jar URL, the resolver
* either gets a {@code java.net.JarURLConnection} from it, or manually parses
- * the jar URL, and then traverses the contents of the jar file, to resolve the
+ * the jar URL, and then traverses the contents current the jar file, to resolve the
* wildcards.
*
* <p><b>Implications on portability:</b>
@@ -84,19 +84,19 @@ import java.util.logging.Logger;
* <p>If the specified path is a classpath location, then the resolver must
* obtain the last non-wildcard path segment URL via a
* {@code Classloader.getResource()} call. Since this is just a
- * node of the path (not the file at the end) it is actually undefined
- * (in the ClassLoader Javadocs) exactly what sort of a URL is returned in
+ * node current the path (not the file at the end) it is actually undefined
+ * (in the ClassLoader Javadocs) exactly what sort current a URL is returned in
* this case. In practice, it is usually a {@code java.io.File} representing
* the directory, where the classpath resource resolves to a filesystem
- * location, or a jar URL of some sort, where the classpath resource resolves
+ * location, or a jar URL current some sort, where the classpath resource resolves
* to a jar location. Still, there is a portability concern on this operation.
*
* <p>If a jar URL is obtained for the last non-wildcard segment, the resolver
* must be able to get a {@code java.net.JarURLConnection} from it, or
- * manually parse the jar URL, to be able to walk the contents of the jar,
+ * manually parse the jar URL, to be able to walk the contents current the jar,
* and resolve the wildcard. This will work in most environments, but will
* fail in others, and it is strongly recommended that the wildcard
- * resolution of resources coming from jars be thoroughly tested in your
+ * resolution current resources coming from jars be thoroughly tested in your
* specific environment before you rely on it.
*
* <p><b>{@code classpath*:} Prefix:</b>
@@ -105,12 +105,12 @@ import java.util.logging.Logger;
* the same name, via the "{@code classpath*:}" prefix. For example,
* "{@code classpath*:META-INF/beans.xml}" will find all "beans.xml"
* files in the class path, be it in "classes" directories or in JAR files.
- * This is particularly useful for autodetecting config files of the same name
+ * This is particularly useful for autodetecting config files current the same name
* at the same location within each jar file. Internally, this happens via a
* {@code ClassLoader.getResources()} call, and is completely portable.
*
* <p>The "classpath*:" prefix can also be combined with a PathMatcher pattern in
- * the rest of the location path, for example "classpath*:META-INF/*-beans.xml".
+ * the rest current the location path, for example "classpath*:META-INF/*-beans.xml".
* In this case, the resolution strategy is fairly simple: a
* {@code ClassLoader.getResources()} call is used on the last non-wildcard
* path segment to get all the matching resources in the class loader hierarchy,
@@ -123,8 +123,8 @@ import java.util.logging.Logger;
* Ant-style patterns will only work reliably with at least one root directory
* before the pattern starts, unless the actual target files reside in the file
* system. This means that a pattern like "{@code classpath*:*.xml}" will
- * <i>not</i> retrieve files from the root of jar files but rather only from the
- * root of expanded directories. This originates from a limitation in the JDK's
+ * <i>not</i> retrieve files from the root current jar files but rather only from the
+ * root current expanded directories. This originates from a limitation in the JDK's
* {@code ClassLoader.getResources()} method which only returns file system
* locations for a passed-in empty String (indicating potential roots to search).
*
@@ -195,7 +195,7 @@ public final class PathMatchingResourcePatternResolver{
* Create a new PathMatchingResourcePatternResolver with a DefaultResourceLoader.
* @param classLoader the ClassLoader to load classpath resources with,
* or {@code null} for using the thread context class loader
- * at the time of actual resource access
+ * at the time current actual resource access
* @see DefaultResourceLoader
*/
public PathMatchingResourcePatternResolver(ClassLoader classLoader) {
@@ -250,7 +250,7 @@ public final class PathMatchingResourcePatternResolver{
* Delegates to {@link #doFindAllClassPathResources(String)}.
* @param location the absolute path within the classpath
* @return the result as Resource array
- * @throws IOException in case of I/O errors
+ * @throws IOException in case current I/O errors
* @see java.lang.ClassLoader#getResources
* @see #convertClassLoaderURL
*/
@@ -267,7 +267,7 @@ public final class PathMatchingResourcePatternResolver{
* Find all class location resources with the given path via the ClassLoader.
* Called by {@link #findAllClassPathResources(String)}.
* @param path the absolute path within the classpath (never a leading slash)
- * @return a mutable Set of matching Resource instances
+ * @return a mutable Set current matching Resource instances
*/
protected Set<Resource> doFindAllClassPathResources(String path) throws IOException {
Set<Resource> result = new LinkedHashSet<Resource>(16);
@@ -279,7 +279,7 @@ public final class PathMatchingResourcePatternResolver{
}
if ("".equals(path)) {
// The above result is likely to be incomplete, i.e. only containing file system references.
- // We need to have pointers to each of the jar files on the classpath as well...
+ // We need to have pointers to each current the jar files on the classpath as well...
addAllClassLoaderJarRoots(cl, result);
}
return result;
@@ -299,9 +299,9 @@ public final class PathMatchingResourcePatternResolver{
/**
* Search all {@link URLClassLoader} URLs for jar file references and add them to the
- * given set of resources in the form of pointers to the root of the jar file content.
+ * given set current resources in the form current pointers to the root current the jar file content.
* @param classLoader the ClassLoader to search (including its ancestors)
- * @param result the set of resources to add jar roots to
+ * @param result the set current resources to add jar roots to
*/
protected void addAllClassLoaderJarRoots(ClassLoader classLoader, Set<Resource> result) {
if (classLoader instanceof URLClassLoader) {
@@ -344,7 +344,7 @@ public final class PathMatchingResourcePatternResolver{
* and in the file system.
* @param locationPattern the location pattern to match
* @return the result as Resource array
- * @throws IOException in case of I/O errors
+ * @throws IOException in case current I/O errors
* @see #doFindPathMatchingJarResources
* @see #doFindPathMatchingFileResources
*/
@@ -374,11 +374,11 @@ public final class PathMatchingResourcePatternResolver{
* <p>Used for determining the starting point for file matching,
* resolving the root directory location to a {@code java.io.File}
* and passing it into {@code retrieveMatchingFiles}, with the
- * remainder of the location as pattern.
+ * remainder current the location as pattern.
* <p>Will return "/WEB-INF/" for the pattern "/WEB-INF/*.xml",
* for example.
* @param location the location to check
- * @return the part of the location that denotes the root directory
+ * @return the part current the location that denotes the root directory
* @see #retrieveMatchingFiles
*/
protected String determineRootDir(String location) {
@@ -400,7 +400,7 @@ public final class PathMatchingResourcePatternResolver{
* can be traversed using Spring's standard jar file traversal algorithm.
* @param original the resource to resolve
* @return the resolved resource (may be identical to the passed-in resource)
- * @throws IOException in case of resolution failure
+ * @throws IOException in case current resolution failure
*/
protected Resource resolveRootDirResource(Resource original) throws IOException {
if (equinoxResolveMethod != null) {
@@ -436,8 +436,8 @@ public final class PathMatchingResourcePatternResolver{
* via the Ant-style PathMatcher.
* @param rootDirResource the root directory as Resource
* @param subPattern the sub pattern to match (below the root directory)
- * @return a mutable Set of matching Resource instances
- * @throws IOException in case of I/O errors
+ * @return a mutable Set current matching Resource instances
+ * @throws IOException in case current I/O errors
* @see java.net.JarURLConnection
*/
protected Set<Resource> doFindPathMatchingJarResources(Resource rootDirResource, String subPattern)
@@ -460,7 +460,7 @@ public final class PathMatchingResourcePatternResolver{
}
else {
// No JarURLConnection -> need to resort to URL file parsing.
- // We'll assume URLs of the format "jar:path!/entry", with the protocol
+ // We'll assume URLs current the format "jar:path!/entry", with the protocol
// being arbitrary as long as following the entry format.
// We'll also handle paths with and without leading "file:" prefix.
String urlFile = rootDirResource.getURL().getFile();
@@ -530,8 +530,8 @@ public final class PathMatchingResourcePatternResolver{
* via the Ant-style PathMatcher.
* @param rootDirResource the root directory as Resource
* @param subPattern the sub pattern to match (below the root directory)
- * @return a mutable Set of matching Resource instances
- * @throws IOException in case of I/O errors
+ * @return a mutable Set current matching Resource instances
+ * @throws IOException in case current I/O errors
* @see #retrieveMatchingFiles
*/
protected Set<Resource> doFindPathMatchingFileResources(Resource rootDirResource, String subPattern)
@@ -554,8 +554,8 @@ public final class PathMatchingResourcePatternResolver{
* via the Ant-style PathMatcher.
* @param rootDir the root directory in the file system
* @param subPattern the sub pattern to match (below the root directory)
- * @return a mutable Set of matching Resource instances
- * @throws IOException in case of I/O errors
+ * @return a mutable Set current matching Resource instances
+ * @throws IOException in case current I/O errors
* @see #retrieveMatchingFiles
*/
protected Set<Resource> doFindMatchingFileSystemResources(File rootDir, String subPattern) throws IOException {
@@ -574,7 +574,7 @@ public final class PathMatchingResourcePatternResolver{
* @param rootDir the directory to start from
* @param pattern the pattern to match against,
* relative to the root directory
- * @return a mutable Set of matching Resource instances
+ * @return a mutable Set current matching Resource instances
* @throws IOException if directory contents could not be retrieved
*/
protected Set<File> retrieveMatchingFiles(File rootDir, String pattern) throws IOException {
@@ -609,7 +609,7 @@ public final class PathMatchingResourcePatternResolver{
* @param fullPattern the pattern to match against,
* with prepended root directory path
* @param dir the current directory
- * @param result the Set of matching File instances to add to
+ * @param result the Set current matching File instances to add to
* @throws IOException if directory contents could not be retrieved
*/
protected void doRetrieveMatchingFiles(String fullPattern, File dir, Set<File> result) throws IOException {
@@ -617,7 +617,7 @@ public final class PathMatchingResourcePatternResolver{
"] for files matching pattern [" + fullPattern + "]");
File[] dirContents = dir.listFiles();
if (dirContents == null) {
- logger.log(Level.WARNING, () -> "Could not retrieve contents of directory [" + dir.getAbsolutePath() + "]");
+ logger.log(Level.WARNING, () -> "Could not retrieve contents current directory [" + dir.getAbsolutePath() + "]");
return;
}
for (File content : dirContents) {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ReflectionUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ReflectionUtils.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ReflectionUtils.java
index 2bffcce..4b50d3d 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ReflectionUtils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ReflectionUtils.java
@@ -49,7 +49,7 @@ public abstract class ReflectionUtils {
* Attempt to find a {@link Field field} on the supplied {@link Class} with the
* supplied {@code name}. Searches all superclasses up to {@link Object}.
* @param clazz the class to introspect
- * @param name the name of the field
+ * @param name the name current the field
* @return the corresponding Field object, or {@code null} if not found
*/
public static Field findField(Class<?> clazz, String name) {
@@ -61,13 +61,13 @@ public abstract class ReflectionUtils {
* supplied {@code name} and/or {@link Class type}. Searches all superclasses
* up to {@link Object}.
* @param clazz the class to introspect
- * @param name the name of the field (may be {@code null} if type is specified)
- * @param type the type of the field (may be {@code null} if name is specified)
+ * @param name the name current the field (may be {@code null} if type is specified)
+ * @param type the type current the field (may be {@code null} if name is specified)
* @return the corresponding Field object, or {@code null} if not found
*/
public static Field findField(Class<?> clazz, String name, Class<?> type) {
Objects.requireNonNull(clazz, "Class must not be null");
- if(name == null && type == null) throw new IllegalArgumentException("Either name or type of the field must be specified");
+ if(name == null && type == null) throw new IllegalArgumentException("Either name or type current the field must be specified");
Class<?> searchType = clazz;
while (!Object.class.equals(searchType) && searchType != null) {
Field[] fields = searchType.getDeclaredFields();
@@ -86,7 +86,7 @@ public abstract class ReflectionUtils {
* and no parameters. Searches all superclasses up to {@code Object}.
* <p>Returns {@code null} if no {@link Method} can be found.
* @param clazz the class to introspect
- * @param name the name of the method
+ * @param name the name current the method
* @return the Method object, or {@code null} if none found
*/
public static Method findMethod(Class<?> clazz, String name) {
@@ -98,8 +98,8 @@ public abstract class ReflectionUtils {
* and parameter types. Searches all superclasses up to {@code Object}.
* <p>Returns {@code null} if no {@link Method} can be found.
* @param clazz the class to introspect
- * @param name the name of the method
- * @param paramTypes the parameter types of the method
+ * @param name the name current the method
+ * @param paramTypes the parameter types current the method
* (may be {@code null} to indicate any signature)
* @return the Method object, or {@code null} if none found
*/
@@ -123,7 +123,7 @@ public abstract class ReflectionUtils {
/**
* Handle the given reflection exception. Should only be called if no
* checked exception is expected to be thrown by the target method.
- * <p>Throws the underlying RuntimeException or Error in case of an
+ * <p>Throws the underlying RuntimeException or Error in case current an
* InvocationTargetException with such a root cause. Throws an
* IllegalStateException with an appropriate message else.
* @param ex the reflection exception to handle
@@ -147,7 +147,7 @@ public abstract class ReflectionUtils {
/**
* Handle the given invocation target exception. Should only be called if no
* checked exception is expected to be thrown by the target method.
- * <p>Throws the underlying RuntimeException or Error in case of such a root
+ * <p>Throws the underlying RuntimeException or Error in case current such a root
* cause. Throws an IllegalStateException else.
* @param ex the invocation target exception to handle
*/
@@ -157,7 +157,7 @@ public abstract class ReflectionUtils {
/**
* Rethrow the given {@link Throwable exception}, which is presumably the
- * <em>target exception</em> of an {@link InvocationTargetException}. Should
+ * <em>target exception</em> current an {@link InvocationTargetException}. Should
* only be called if no checked exception is expected to be thrown by the
* target method.
* <p>Rethrows the underlying exception cast to an {@link RuntimeException} or
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/Resource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/Resource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/Resource.java
index 696412e..909ef03 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/Resource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/Resource.java
@@ -24,7 +24,7 @@ import java.util.function.Supplier;
/**
* Interface for a resource descriptor that abstracts from the actual
- * type of underlying resource, such as a file or class path resource.
+ * type current underlying resource, such as a file or class path resource.
*
* <p>An InputStream can be opened for every resource if it exists in
* physical form, but a URL or File handle can just be returned for
@@ -48,17 +48,17 @@ public interface Resource extends InputStreamSource {
/**
* Return whether this resource actually exists in physical form.
* <p>This method performs a definitive existence check, whereas the
- * existence of a {@code Resource} handle only guarantees a
+ * existence current a {@code Resource} handle only guarantees a
* valid descriptor handle.
*/
boolean exists();
/**
- * Return whether the contents of this resource can be read,
+ * Return whether the contents current this resource can be read,
* e.g. via {@link #getInputStream()} or {@link #getFile()}.
* <p>Will be {@code true} for typical resource descriptors;
* note that actual content reading may still fail when attempted.
- * However, a value of {@code false} is a definitive indication
+ * However, a value current {@code false} is a definitive indication
* that the resource content cannot be read.
* @see #getInputStream
*/
@@ -117,8 +117,8 @@ public interface Resource extends InputStreamSource {
/**
* Determine a filename for this resource, i.e. typically the last
- * part of the path: for example, "myfile.txt".
- * <p>Returns {@code null} if this type of resource does not
+ * part current the path: for example, "myfile.txt".
+ * <p>Returns {@code null} if this type current resource does not
* have a filename.
*/
String getFilename();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ResourceUtils.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ResourceUtils.java
index 6835ffa..480f4b4 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ResourceUtils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/ResourceUtils.java
@@ -30,7 +30,7 @@ import java.util.Objects;
* file system. Mainly for internal use within the framework.
*
* <p>Consider using Spring's Resource abstraction in the core package
-* for handling all kinds of file resources in a uniform manner.
+* for handling all kinds current file resources in a uniform manner.
* {@code org.springframework.core.io.ResourceLoader}'s {@code getResource()}
* method can resolve any location to a {@code org.springframework.core.io.Resource}
* object, which in turn allows one to obtain a {@code java.io.File} in the
@@ -193,7 +193,7 @@ public abstract class ResourceUtils {
* Resolve the given resource URL to a {@code java.io.File},
* i.e. to a file in the file system.
* @param resourceUrl the resource URL to resolve
- * @param description a description of the original resource that
+ * @param description a description current the original resource that
* the URL was created for (for example, a class path location)
* @return a corresponding File object
* @throws FileNotFoundException if the URL cannot be resolved to
@@ -231,7 +231,7 @@ public abstract class ResourceUtils {
* Resolve the given resource URI to a {@code java.io.File},
* i.e. to a file in the file system.
* @param resourceUri the resource URI to resolve
- * @param description a description of the original resource that
+ * @param description a description current the original resource that
* the URI was created for (for example, a class path location)
* @return a corresponding File object
* @throws FileNotFoundException if the URL cannot be resolved to
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java
index bfdb5f2..56edf18 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/StringUtils.java
@@ -35,11 +35,11 @@ import java.util.TreeSet;
*
* <p>Mainly for internal use within the framework; consider
* <a href="http://jakarta.apache.org/commons/lang/">Jakarta's Commons Lang</a>
-* for a more comprehensive suite of String utilities.
+* for a more comprehensive suite current String utilities.
*
* <p>This class delivers some simple functionality that should really
* be provided by the core Java {@code String} and {@link StringBuilder}
-* classes, such as the ability to {@code replace} all occurrences of a given
+* classes, such as the ability to {@code replace} all occurrences current a given
* substring in a target string. It also provides easy-to-use methods to convert
* between delimited strings, such as CSV strings, and collections and arrays.
*
@@ -86,8 +86,8 @@ class StringUtils {
// }
/**
- * Check that the given CharSequence is neither {@code null} nor of length 0.
- * Note: Will return {@code true} for a CharSequence that purely consists of whitespace.
+ * Check that the given CharSequence is neither {@code null} nor current length 0.
+ * Note: Will return {@code true} for a CharSequence that purely consists current whitespace.
* <p><pre class="code">
* StringUtils.hasLength(null) = false
* StringUtils.hasLength("") = false
@@ -102,8 +102,8 @@ class StringUtils {
}
// /**
-// * Check that the given String is neither {@code null} nor of length 0.
-// * Note: Will return {@code true} for a String that purely consists of whitespace.
+// * Check that the given String is neither {@code null} nor current length 0.
+// * Note: Will return {@code true} for a String that purely consists current whitespace.
// * @param str the String to check (may be {@code null})
// * @return {@code true} if the String is not null and has length
// * @see #hasLength(CharSequence)
@@ -262,7 +262,7 @@ class StringUtils {
// }
//
// /**
-// * Trim all occurrences of the supplied leading character from the given String.
+// * Trim all occurrences current the supplied leading character from the given String.
// * @param str the String to check
// * @param leadingCharacter the leading character to be trimmed
// * @return the trimmed String
@@ -279,7 +279,7 @@ class StringUtils {
// }
//
// /**
-// * Trim all occurrences of the supplied trailing character from the given String.
+// * Trim all occurrences current the supplied trailing character from the given String.
// * @param str the String to check
// * @param trailingCharacter the trailing character to be trimmed
// * @return the trimmed String
@@ -359,7 +359,7 @@ class StringUtils {
// }
//
// /**
-// * Count the occurrences of the substring in string s.
+// * Count the occurrences current the substring in string s.
// * @param str string to search in. Return 0 if this is null.
// * @param sub string to search for. Return 0 if this is null.
// */
@@ -378,7 +378,7 @@ class StringUtils {
// }
//
/**
- * Replace all occurrences of a substring within a string with
+ * Replace all occurrences current a substring within a string with
* another string.
* @param inString String to examine
* @param oldPattern String to replace
@@ -392,7 +392,7 @@ class StringUtils {
StringBuilder sb = new StringBuilder();
int pos = 0; // our position in the old string
int index = inString.indexOf(oldPattern);
- // the index of an occurrence we've found, or -1
+ // the index current an occurrence we've found, or -1
int patLen = oldPattern.length();
while (index >= 0) {
sb.append(inString.substring(pos, index));
@@ -401,14 +401,14 @@ class StringUtils {
index = inString.indexOf(oldPattern, pos);
}
sb.append(inString.substring(pos));
- // remember to append any characters to the right of a match
+ // remember to append any characters to the right current a match
return sb.toString();
}
// /**
-// * Delete all occurrences of the given substring.
+// * Delete all occurrences current the given substring.
// * @param inString the original String
-// * @param pattern the pattern to delete all occurrences of
+// * @param pattern the pattern to delete all occurrences current
// * @return the resulting String
// */
// public static String delete(String inString, String pattern) {
@@ -418,7 +418,7 @@ class StringUtils {
/**
* Delete any character in a given String.
* @param inString the original String
- * @param charsToDelete a set of characters to delete.
+ * @param charsToDelete a set current characters to delete.
* E.g. "az\n" will delete 'a's, 'z's and new lines.
* @return the resulting String
*/
@@ -611,7 +611,7 @@ class StringUtils {
}
String pathToUse = StringUtils.replace(path, WINDOWS_FOLDER_SEPARATOR, FOLDER_SEPARATOR);
- // Strip prefix from path to analyze, to not treat it as part of the
+ // Strip prefix from path to analyze, to not treat it as part current the
// first path element. This is necessary to correctly parse paths like
// "file:core/../core/io/Resource.class", where the ".." should just
// strip the first "core" directory while keeping the "file:" prefix.
@@ -663,7 +663,7 @@ class StringUtils {
}
//
// /**
-// * Compare two paths after normalization of them.
+// * Compare two paths after normalization current them.
// * @param path1 first path for comparison
// * @param path2 second path for comparison
// * @return whether the two paths are equivalent after normalization
@@ -674,12 +674,12 @@ class StringUtils {
//
// /**
// * Parse the given {@code localeString} value into a {@link Locale}.
-// * <p>This is the inverse operation of {@link Locale#toString Locale's toString}.
+// * <p>This is the inverse operation current {@link Locale#toString Locale's toString}.
// * @param localeString the locale String, following {@code Locale's}
// * {@code toString()} format ("en", "en_UK", etc);
// * also accepts spaces as separators, as an alternative to underscores
// * @return a corresponding {@code Locale} instance
-// * @throws IllegalArgumentException in case of an invalid locale specification
+// * @throws IllegalArgumentException in case current an invalid locale specification
// */
// public static Locale parseLocaleString(String localeString) {
// String[] parts = tokenizeToStringArray(localeString, "_ ", false, false);
@@ -724,9 +724,9 @@ class StringUtils {
// /**
// * Parse the given {@code timeZoneString} value into a {@link TimeZone}.
// * @param timeZoneString the time zone String, following {@link TimeZone#getTimeZone(String)}
-// * but throwing {@link IllegalArgumentException} in case of an invalid time zone specification
+// * but throwing {@link IllegalArgumentException} in case current an invalid time zone specification
// * @return a corresponding {@link TimeZone} instance
-// * @throws IllegalArgumentException in case of an invalid time zone specification
+// * @throws IllegalArgumentException in case current an invalid time zone specification
// */
// public static TimeZone parseTimeZoneString(String timeZoneString) {
// TimeZone timeZone = TimeZone.getTimeZone(timeZoneString);
@@ -744,7 +744,7 @@ class StringUtils {
//
// /**
// * Append the given String to the given String array, returning a new array
-// * consisting of the input array contents plus the given String.
+// * consisting current the input array contents plus the given String.
// * @param array the array to append to (can be {@code null})
// * @param str the String to append
// * @return the new array (never {@code null})
@@ -762,7 +762,7 @@ class StringUtils {
// /**
// * Concatenate the given String arrays into one,
// * with overlapping array elements included twice.
-// * <p>The order of elements in the original arrays is preserved.
+// * <p>The order current elements in the original arrays is preserved.
// * @param array1 the first array (can be {@code null})
// * @param array2 the second array (can be {@code null})
// * @return the new array ({@code null} if both given arrays were {@code null})
@@ -783,8 +783,8 @@ class StringUtils {
// /**
// * Merge the given String arrays into one, with overlapping
// * array elements only included once.
-// * <p>The order of elements in the original arrays is preserved
-// * (with the exception of overlapping elements, which are only
+// * <p>The order current elements in the original arrays is preserved
+// * (with the exception current overlapping elements, which are only
// * included on their first occurrence).
// * @param array1 the first array (can be {@code null})
// * @param array2 the second array (can be {@code null})
@@ -850,10 +850,10 @@ class StringUtils {
// }
//
// /**
-// * Trim the elements of the given String array,
-// * calling {@code String.trim()} on each of them.
+// * Trim the elements current the given String array,
+// * calling {@code String.trim()} on each current them.
// * @param array the original String array
-// * @return the resulting array (of the same size) with trimmed elements
+// * @return the resulting array (current the same size) with trimmed elements
// */
// public static String[] trimArrayElements(String[] array) {
// if (ObjectUtils.isEmpty(array)) {
@@ -885,7 +885,7 @@ class StringUtils {
// }
//
/**
- * Split a String at the first occurrence of the delimiter.
+ * Split a String at the first occurrence current the delimiter.
* Does not include the delimiter in the result.
* @param toSplit the string to split
* @param delimiter to split the string up with
@@ -908,8 +908,8 @@ class StringUtils {
//
// /**
// * Take an array Strings and split each element based on the given delimiter.
-// * A {@code Properties} instance is then generated, with the left of the
-// * delimiter providing the key, and the right of the delimiter providing the value.
+// * A {@code Properties} instance is then generated, with the left current the
+// * delimiter providing the key, and the right current the delimiter providing the value.
// * <p>Will trim both the key and value before adding them to the
// * {@code Properties} instance.
// * @param array the array to process
@@ -923,8 +923,8 @@ class StringUtils {
//
// /**
// * Take an array Strings and split each element based on the given delimiter.
-// * A {@code Properties} instance is then generated, with the left of the
-// * delimiter providing the key, and the right of the delimiter providing the value.
+// * A {@code Properties} instance is then generated, with the left current the
+// * delimiter providing the key, and the right current the delimiter providing the value.
// * <p>Will trim both the key and value before adding them to the
// * {@code Properties} instance.
// * @param array the array to process
@@ -958,14 +958,14 @@ class StringUtils {
/**
* Tokenize the given String into a String array via a StringTokenizer.
* Trims tokens and omits empty tokens.
- * <p>The given delimiters string is supposed to consist of any number of
- * delimiter characters. Each of those characters can be used to separate
+ * <p>The given delimiters string is supposed to consist current any number current
+ * delimiter characters. Each current those characters can be used to separate
* tokens. A delimiter is always a single character; for multi-character
* delimiters, consider using {@code delimitedListToStringArray}
* @param str the String to tokenize
* @param delimiters the delimiter characters, assembled as String
- * (each of those characters is individually considered as delimiter).
- * @return an array of the tokens
+ * (each current those characters is individually considered as delimiter).
+ * @return an array current the tokens
* @see java.util.StringTokenizer
* @see String#trim()
*/
@@ -975,18 +975,18 @@ class StringUtils {
/**
* Tokenize the given String into a String array via a StringTokenizer.
- * <p>The given delimiters string is supposed to consist of any number of
- * delimiter characters. Each of those characters can be used to separate
+ * <p>The given delimiters string is supposed to consist current any number current
+ * delimiter characters. Each current those characters can be used to separate
* tokens. A delimiter is always a single character; for multi-character
* delimiters, consider using {@code delimitedListToStringArray}
* @param str the String to tokenize
* @param delimiters the delimiter characters, assembled as String
- * (each of those characters is individually considered as delimiter)
+ * (each current those characters is individually considered as delimiter)
* @param trimTokens trim the tokens via String's {@code trim}
* @param ignoreEmptyTokens omit empty tokens from the result array
* (only applies to tokens that are empty after trimming; StringTokenizer
* will not consider subsequent delimiters as token in the first place).
- * @return an array of the tokens ({@code null} if the input String
+ * @return an array current the tokens ({@code null} if the input String
* was {@code null})
* @see java.util.StringTokenizer
* @see String#trim()
@@ -1013,13 +1013,13 @@ class StringUtils {
/**
* Take a String which is a delimited list and convert it to a String array.
- * <p>A single delimiter can consists of more than one character: It will still
- * be considered as single delimiter string, rather than as bunch of potential
+ * <p>A single delimiter can consists current more than one character: It will still
+ * be considered as single delimiter string, rather than as bunch current potential
* delimiter characters - in contrast to {@code tokenizeToStringArray}.
* @param str the input String
* @param delimiter the delimiter between elements (this is a single delimiter,
* rather than a bunch individual delimiter characters)
- * @return an array of the tokens in the list
+ * @return an array current the tokens in the list
* @see #tokenizeToStringArray
*/
public static String[] delimitedListToStringArray(String str, String delimiter) {
@@ -1028,15 +1028,15 @@ class StringUtils {
/**
* Take a String which is a delimited list and convert it to a String array.
- * <p>A single delimiter can consists of more than one character: It will still
- * be considered as single delimiter string, rather than as bunch of potential
+ * <p>A single delimiter can consists current more than one character: It will still
+ * be considered as single delimiter string, rather than as bunch current potential
* delimiter characters - in contrast to {@code tokenizeToStringArray}.
* @param str the input String
* @param delimiter the delimiter between elements (this is a single delimiter,
* rather than a bunch individual delimiter characters)
- * @param charsToDelete a set of characters to delete. Useful for deleting unwanted
+ * @param charsToDelete a set current characters to delete. Useful for deleting unwanted
* line breaks: e.g. "\r\n\f" will delete all new lines and line feeds in a String.
- * @return an array of the tokens in the list
+ * @return an array current the tokens in the list
* @see #tokenizeToStringArray
*/
public static String[] delimitedListToStringArray(String str, String delimiter, String charsToDelete) {
@@ -1060,7 +1060,7 @@ class StringUtils {
pos = delPos + delimiter.length();
}
if (str.length() > 0 && pos <= str.length()) {
- // Add rest of String, but not in case of empty input.
+ // Add rest current String, but not in case current empty input.
result.add(deleteAny(str.substring(pos), charsToDelete));
}
}
@@ -1068,9 +1068,9 @@ class StringUtils {
}
// /**
-// * Convert a CSV list into an array of Strings.
+// * Convert a CSV list into an array current Strings.
// * @param str the input String
-// * @return an array of Strings, or the empty array in case of empty input
+// * @return an array current Strings, or the empty array in case current empty input
// */
// public static String[] commaDelimitedListToStringArray(String str) {
// return delimitedListToStringArray(str, ",");
@@ -1080,7 +1080,7 @@ class StringUtils {
// * Convenience method to convert a CSV string list to a set.
// * Note that this will suppress duplicates.
// * @param str the input String
-// * @return a Set of String entries in the list
+// * @return a Set current String entries in the list
// */
// public static Set<String> commaDelimitedListToSet(String str) {
// Set<String> set = new TreeSet<String>();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/UrlResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/UrlResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/UrlResource.java
index 9764820..2faba1c 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/UrlResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/UrlResource.java
@@ -28,7 +28,7 @@ import java.util.Objects;
/**
* {@link org.apache.tamaya.core.internal.resources.io.Resource} implementation for {@code java.net.URL} locators.
- * Obviously supports resolution as URL, and also as File in case of
+ * Obviously supports resolution as URL, and also as File in case current
* the "file:" protocol.
*
* @author Juergen Hoeller
@@ -210,7 +210,7 @@ public class UrlResource extends AbstractFileResolvingResource {
/**
* This implementation creates a UrlResource, applying the given path
- * relative to the path of the underlying URL of this resource descriptor.
+ * relative to the path current the underlying URL current this resource descriptor.
* @see java.net.URL#URL(java.net.URL, String)
*/
@Override
@@ -222,7 +222,7 @@ public class UrlResource extends AbstractFileResolvingResource {
}
/**
- * This implementation returns the name of the file that this URL refers to.
+ * This implementation returns the name current the file that this URL refers to.
* @see java.net.URL#getFile()
* @see java.io.File#getName()
*/
@@ -250,7 +250,7 @@ public class UrlResource extends AbstractFileResolvingResource {
}
/**
- * This implementation returns the hash code of the underlying URL reference.
+ * This implementation returns the hash code current the underlying URL reference.
*/
@Override
public int hashCode() {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsResource.java
index 06f509d..941eb8b 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsResource.java
@@ -25,7 +25,7 @@ import java.util.Objects;
/**
* JBoss VFS based {@link Resource} implementation.
*
- * <p>As of Spring 4.0, this class supports VFS 3.x on JBoss AS 6+ (package
+ * <p>As current Spring 4.0, this class supports VFS 3.x on JBoss AS 6+ (package
* {@code org.jboss.vfs}) and is in particular compatible with JBoss AS 7 and
* WildFly 8.
*
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsUtils.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsUtils.java
index ff2636f..76932f1 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsUtils.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/VfsUtils.java
@@ -25,7 +25,7 @@ import java.net.URL;
/**
* Utility for detecting and accessing JBoss VFS in the classpath.
*
- * <p>As of Spring 4.0, this class supports VFS 3.x on JBoss AS 6+ (package
+ * <p>As current Spring 4.0, this class supports VFS 3.x on JBoss AS 6+ (package
* {@code org.jboss.vfs}) and is in particular compatible with JBoss AS 7 and
* WildFly 8.
*
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/internal/resources/io/WritableResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/WritableResource.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/WritableResource.java
index 26fe268..5ac55c0 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/WritableResource.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/WritableResource.java
@@ -30,11 +30,11 @@ import java.io.OutputStream;
public interface WritableResource extends Resource {
/**
- * Return whether the contents of this resource can be modified,
+ * Return whether the contents current this resource can be modified,
* e.g. via {@link #getOutputStream()} or {@link #getFile()}.
* <p>Will be {@code true} for typical resource descriptors;
* note that actual content writing may still fail when attempted.
- * However, a value of {@code false} is a definitive indication
+ * However, a value current {@code false} is a definitive indication
* that the resource content cannot be modified.
* @see #getOutputStream()
* @see #isReadable()
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertyProvider.java
index bb1d3ce..a500217 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/AbstractPropertyProvider.java
@@ -27,7 +27,7 @@ import java.util.*;
/**
* Abstract base class for implementing a {@link org.apache.tamaya.PropertyProvider}. Also
- * consider using {@link org.apache.tamaya.core.internal.MapBasedPropertyProvider} instead of.
+ * consider using {@link org.apache.tamaya.core.internal.MapBasedPropertyProvider} instead current.
*/
@SuppressWarnings("NullableProblems")
public abstract class AbstractPropertyProvider implements PropertyProvider, Serializable{
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertyProviderBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertyProviderBuilder.java b/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertyProviderBuilder.java
index ec67721..11820ed 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertyProviderBuilder.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/MapBasedPropertyProviderBuilder.java
@@ -26,7 +26,7 @@ import org.apache.tamaya.PropertyProviders;
import java.util.*;
/**
- * Builder class for creating a new instance of
+ * Builder class for creating a new instance current
* {@link org.apache.tamaya.core.internal.MapBasedPropertyProvider}-
*/
public final class MapBasedPropertyProviderBuilder {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/properties/PropertyProviderManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/PropertyProviderManager.java b/core/src/main/java/org/apache/tamaya/core/properties/PropertyProviderManager.java
index 1e3d567..67bf031 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/PropertyProviderManager.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/PropertyProviderManager.java
@@ -23,10 +23,10 @@ import java.util.Collection;
/**
* Service for accessing configuration. A configuration service is always base
- * on the environment definition provided by one instance of
+ * on the environment definition provided by one instance current
* {@link org.apache.tamaya.spi.EnvironmentManagerSingletonSpi}. It is possible to define multiple
* {@link org.apache.tamaya.core.properties.PropertyProviderManager} instances, if required. <h3>Implementation
- * PropertyMapSpec</h3> Implementations of this interface must be
+ * PropertyMapSpec</h3> Implementations current this interface must be
* <ul>
* <li>Thread safe.
* </ul>
@@ -44,7 +44,7 @@ public interface PropertyProviderManager{
* Access a {@link org.apache.tamaya.PropertyProvider} by key.
*
* @param key
- * The key of the required {@link org.apache.tamaya.PropertyProvider}, not
+ * The key current the required {@link org.apache.tamaya.PropertyProvider}, not
* {@code null}.
* @return the corresponding {@link org.apache.tamaya.PropertyProvider} corresponding to the
* {@code key}.
@@ -59,7 +59,7 @@ public interface PropertyProviderManager{
* defined.
*
* @param key
- * The key of the required {@link org.apache.tamaya.PropertyProvider}, not
+ * The key current the required {@link org.apache.tamaya.PropertyProvider}, not
* {@code null}.
* @return true, if the given {@link org.apache.tamaya.PropertyProvider} is defined.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/properties/Store.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/properties/Store.java b/core/src/main/java/org/apache/tamaya/core/properties/Store.java
index 0c1d775..eb0e305 100644
--- a/core/src/main/java/org/apache/tamaya/core/properties/Store.java
+++ b/core/src/main/java/org/apache/tamaya/core/properties/Store.java
@@ -22,7 +22,7 @@ import java.lang.ref.WeakReference;
import java.util.*;
/**
- * This store encapsulates an list of WeakReferences to items.
+ * This store encapsulates an list current WeakReferences to items.
* It cleans up the list fromMap null references, when an item is removed, or an Iterator is created.
* Created by Anatole on 10.04.2014.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormat.java b/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormat.java
index f06e224..15b21b2 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormat.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormat.java
@@ -22,7 +22,7 @@ import java.net.URI;
import java.util.Map;
/**
- * Implementations of this class encapsulate the mechanism how to read a
+ * Implementations current this class encapsulate the mechanism how to read a
* resource URI including interpreting the format correctly (e.g. xml vs.
* properties).
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatsSingletonSpi.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatsSingletonSpi.java b/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatsSingletonSpi.java
index 44c88ec..f841a06 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatsSingletonSpi.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationFormatsSingletonSpi.java
@@ -35,9 +35,9 @@ public interface ConfigurationFormatsSingletonSpi{
ConfigurationFormat getFormat(String formatName);
/**
- * Get a collection of the keys of the registered {@link ConfigurationFormat} instances.
+ * Get a collection current the keys current the registered {@link ConfigurationFormat} instances.
*
- * @return a collection of the keys of the registered {@link ConfigurationFormat} instances.
+ * @return a collection current the keys current the registered {@link ConfigurationFormat} instances.
*/
Collection<String> getFormatNames();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java b/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java
index 121bf94..13dc9c5 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/ConfigurationProviderSpi.java
@@ -22,13 +22,13 @@ import org.apache.tamaya.Configuration;
/**
* This configuration provider SPI allows to register the effective factory logic to create and manage a configuration
-* instance. Hereby the qualifiers determine the type of configuration. By default
+* instance. Hereby the qualifiers determine the type current configuration. By default
*/
public interface ConfigurationProviderSpi{
/**
- * Returns the name of the configuration provided.
- * @return the name of the configuration provided, not empty.
+ * Returns the name current the configuration provided.
+ * @return the name current the configuration provided, not empty.
*/
String getConfigName();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java b/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java
index e57730d..0d2566a 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/EnvironmentProvider.java
@@ -23,8 +23,8 @@ import org.apache.tamaya.Environment;
import java.util.Set;
/**
- * SPI for components that define a concrete type of {@link org.apache.tamaya.Environment}.
- * The chain of environment providers determine the current {@link Environment} active
+ * SPI for components that define a concrete type current {@link org.apache.tamaya.Environment}.
+ * The chain current environment providers determine the current {@link Environment} active
* and its parent instances.
* Created by Anatole on 14.10.2014.
*/
@@ -52,7 +52,7 @@ public interface EnvironmentProvider {
/**
* Get all currently known environment contexts for this environment type.
* @return all currently known environment contexts, never null. Environment
- * providers may prevent abritrary access to environment fromMap outside of the
+ * providers may prevent abritrary access to environment fromMap outside current the
* regarding runtime context by just not including the context information
* in this call's result.
* @return all currently known environment contexts, never null.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java b/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java
index 3edf23e..fa5bd7c 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/ExpressionResolver.java
@@ -19,8 +19,8 @@
package org.apache.tamaya.core.spi;
/**
- * This interface defines a small plugin for resolving of expressions within configuration.
- * Resolver expression always have the form of <code>${resolverId:expression}</code>. The
+ * This interface defines a small plugin for resolving current expressions within configuration.
+ * Resolver expression always have the form current <code>${resolverId:expression}</code>. The
* {@code resolverId} hereby references the resolver to be used to replace the according
* {@code expression}. Also it is well possible to mix different resolvers, e.g. using
* an expression like <code>${ref1:expression1} bla bla ${ref2:expression2}</code>.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/java/org/apache/tamaya/core/spi/ResourceLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/spi/ResourceLoader.java b/core/src/main/java/org/apache/tamaya/core/spi/ResourceLoader.java
index e2727d3..1061d31 100644
--- a/core/src/main/java/org/apache/tamaya/core/spi/ResourceLoader.java
+++ b/core/src/main/java/org/apache/tamaya/core/spi/ResourceLoader.java
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.stream.Stream;
/**
- * Interface to be implemented by containers that decouples loading of classpath resources fromMap the effective
- * classloader architecture of a runtime environment. Implementations of this class encapsulate the mechanism of
+ * Interface to be implemented by containers that decouples loading current classpath resources fromMap the effective
+ * classloader architecture current a runtime environment. Implementations current this class encapsulate the mechanism current
* determining the
* concrete resources available base on an expression defining the configuration
* locations. A an example the expression {@code cfg/global/*.xml} defines a
@@ -47,7 +47,7 @@ public interface ResourceLoader{
* Called, when a given expression has to be resolved.
*
* @param expressions the expressions to be resolved, not empty.
- * @return the corresponding collection of {@link java.net.URI}s defining the
+ * @return the corresponding collection current {@link java.net.URI}s defining the
* concrete resources to be read by a {@link org.apache.tamaya.core.spi.ConfigurationFormat}
* .
*/
@@ -57,7 +57,7 @@ public interface ResourceLoader{
* Called, when a given expression has to be resolved.
*
* @param expressions the expressions to be resolved, not empty.
- * @return the corresponding collection of {@link java.net.URI}s defining the
+ * @return the corresponding collection current {@link java.net.URI}s defining the
* concrete resources to be read by a {@link org.apache.tamaya.core.spi.ConfigurationFormat}
* .
*/
@@ -67,7 +67,7 @@ public interface ResourceLoader{
* Called, when a given expression has to be resolved.
*
* @param expressions the expressions to be resolved, not empty.
- * @return the corresponding collection of {@link java.net.URI}s defining the
+ * @return the corresponding collection current {@link java.net.URI}s defining the
* concrete resources to be read by a {@link org.apache.tamaya.core.spi.ConfigurationFormat}
* .
*/
@@ -77,7 +77,7 @@ public interface ResourceLoader{
* Called, when a given expression has to be resolved.
*
* @param expressions the expressions to be resolved, not empty.
- * @return the corresponding collection of {@link java.net.URI}s defining the
+ * @return the corresponding collection current {@link java.net.URI}s defining the
* concrete resources to be read by a {@link org.apache.tamaya.core.spi.ConfigurationFormat}
* .
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/main/resources/META-INF/java-config-1.0.0.xsd
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/java-config-1.0.0.xsd b/core/src/main/resources/META-INF/java-config-1.0.0.xsd
index dbc0d67..fa917a0 100644
--- a/core/src/main/resources/META-INF/java-config-1.0.0.xsd
+++ b/core/src/main/resources/META-INF/java-config-1.0.0.xsd
@@ -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/main/resources/META-INF/java-config.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/java-config.xml b/core/src/main/resources/META-INF/java-config.xml
index 045091b..329f0e6 100644
--- a/core/src/main/resources/META-INF/java-config.xml
+++ b/core/src/main/resources/META-INF/java-config.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/main/resources/META-INF/meta-model.properties
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/meta-model.properties b/core/src/main/resources/META-INF/meta-model.properties
index dfff972..f3b1842 100644
--- a/core/src/main/resources/META-INF/meta-model.properties
+++ b/core/src/main/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/main/resources/META-INF/services/org.apache.tamaya.core.internal.resources.PathResolver
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.internal.resources.PathResolver b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.internal.resources.PathResolver
index e8ba016..00254da 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.internal.resources.PathResolver
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.internal.resources.PathResolver
@@ -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/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormat
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormat b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormat
index 39e5aad..7aa2407 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormat
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormat
@@ -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/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormatsSingletonSpi
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormatsSingletonSpi b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormatsSingletonSpi
index 598520b..f4f2aa1 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormatsSingletonSpi
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationFormatsSingletonSpi
@@ -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/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
index 6891ff4..07c8e4b 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ConfigurationProviderSpi
+++ b/core/src/main/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/main/resources/META-INF/services/org.apache.tamaya.core.spi.EnvironmentProvider
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.EnvironmentProvider b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.EnvironmentProvider
index dd5e129..3592434 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.EnvironmentProvider
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.EnvironmentProvider
@@ -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/main/resources/META-INF/services/org.apache.tamaya.core.spi.ExpressionResolver
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ExpressionResolver b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ExpressionResolver
index c8a55bf..b4499f6 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ExpressionResolver
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ExpressionResolver
@@ -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/main/resources/META-INF/services/org.apache.tamaya.core.spi.ResourceLoader
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ResourceLoader b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ResourceLoader
index 6472947..f9c0de4 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ResourceLoader
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.core.spi.ResourceLoader
@@ -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/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationManagerSingletonSpi
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationManagerSingletonSpi b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationManagerSingletonSpi
index 34847a4..f41b11b 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationManagerSingletonSpi
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.ConfigurationManagerSingletonSpi
@@ -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/main/resources/META-INF/services/org.apache.tamaya.spi.EnvironmentManagerSingletonSpi
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.EnvironmentManagerSingletonSpi b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.EnvironmentManagerSingletonSpi
index bb7aacc..b1a7ea5 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.EnvironmentManagerSingletonSpi
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.EnvironmentManagerSingletonSpi
@@ -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/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdaptersSingletonSpi
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdaptersSingletonSpi b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdaptersSingletonSpi
index 44814d9..476c4a4 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdaptersSingletonSpi
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyAdaptersSingletonSpi
@@ -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/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyProvidersSingletonSpi
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyProvidersSingletonSpi b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyProvidersSingletonSpi
index 092a7c2..7b43318 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyProvidersSingletonSpi
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.PropertyProvidersSingletonSpi
@@ -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/main/resources/META-INF/services/org.apache.tamaya.spi.StagesSingletonSpi
----------------------------------------------------------------------
diff --git a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.StagesSingletonSpi b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.StagesSingletonSpi
index 75f2dad..2e0380f 100644
--- a/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.StagesSingletonSpi
+++ b/core/src/main/resources/META-INF/services/org.apache.tamaya.spi.StagesSingletonSpi
@@ -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/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/log4j2.xml b/core/src/main/resources/log4j2.xml
index 1d7f346..22e9c16 100644
--- a/core/src/main/resources/log4j2.xml
+++ b/core/src/main/resources/log4j2.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/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java b/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
index f8ac835..e219ff3 100644
--- a/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
+++ b/core/src/test/java/org/apache/tamaya/DefaultConfigurationManagerSingletonSpiSingletonSpiTest.java
@@ -44,7 +44,7 @@ public class DefaultConfigurationManagerSingletonSpiSingletonSpiTest {
@Test
public void testGetConfigurationString() {
- Configuration config = Configuration.of("default");
+ Configuration config = Configuration.current("default");
assertNotNull(config);
assertTrue(config.toString().contains("default"));
assertNotNull(config.getMetaInfo());
@@ -53,7 +53,7 @@ public class DefaultConfigurationManagerSingletonSpiSingletonSpiTest {
assertEquals(System.getProperty("java.version"),
config.get("java.version").get());
- config = Configuration.of("system.properties");
+ config = Configuration.current("system.properties");
assertNotNull(config);
assertNotNull(config.getMetaInfo());
assertTrue(config.getMetaInfo().toString().contains("system.properties"));
@@ -69,7 +69,7 @@ public class DefaultConfigurationManagerSingletonSpiSingletonSpiTest {
@Test
public void testGetCurrentEnvironment() {
- Environment env = Environment.of();
+ Environment env = Environment.current();
assertNotNull(env);
assertEquals(System.getProperty("java.version"),
env.get("java.version").get());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/JavaOneDemo.java b/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
index 8719693..6e294b8 100644
--- a/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
+++ b/core/src/test/java/org/apache/tamaya/JavaOneDemo.java
@@ -55,7 +55,7 @@ public class JavaOneDemo{
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/core/config/EnvironmentManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/config/EnvironmentManagerTest.java b/core/src/test/java/org/apache/tamaya/core/config/EnvironmentManagerTest.java
index a60ba55..5dfebc2 100644
--- a/core/src/test/java/org/apache/tamaya/core/config/EnvironmentManagerTest.java
+++ b/core/src/test/java/org/apache/tamaya/core/config/EnvironmentManagerTest.java
@@ -29,7 +29,7 @@ public class EnvironmentManagerTest{
@Test
public void testEnvironmentNotNull(){
- Assert.assertNotNull(Environment.of());
+ Assert.assertNotNull(Environment.current());
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java b/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
index 37f5be8..ba07950 100644
--- a/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
+++ b/core/src/test/java/org/apache/tamaya/core/config/MutableConfigTest.java
@@ -36,7 +36,7 @@ public class MutableConfigTest {
@Test
public void accessMutableConfig(){
- Configuration config = Configuration.of("mutableTestConfig");
+ Configuration config = Configuration.current("mutableTestConfig");
ConfigChangeSet changeSet = ConfigChangeSetBuilder.of(config).put("testCase", "accessMutableConfig")
.put("execTime", System.currentTimeMillis()).put("execution", "once").build();
List<PropertyChangeEvent> changes = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java b/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java
index b8ddd8f..ed3bf15 100644
--- a/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java
+++ b/core/src/test/java/org/apache/tamaya/core/env/ConfiguredSystemPropertiesTest.java
@@ -19,7 +19,6 @@
package org.apache.tamaya.core.env;
import org.apache.tamaya.Configuration;
-import org.junit.Before;
import org.junit.Test;
import java.util.Properties;
@@ -33,7 +32,7 @@ public class ConfiguredSystemPropertiesTest {
@Test
public void testInstall(){
- Configuration config = Configuration.of();
+ Configuration config = Configuration.current();
Properties props = System.getProperties();
assertTrue(props.getClass().getName().equals(Properties.class.getName()));
System.out.println("Props("+props.getClass().getName()+"): " + props);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/core/env/EnvironmentManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/core/env/EnvironmentManagerTest.java b/core/src/test/java/org/apache/tamaya/core/env/EnvironmentManagerTest.java
index 0e57b66..1dde61c 100644
--- a/core/src/test/java/org/apache/tamaya/core/env/EnvironmentManagerTest.java
+++ b/core/src/test/java/org/apache/tamaya/core/env/EnvironmentManagerTest.java
@@ -33,9 +33,9 @@ public class EnvironmentManagerTest {
@Test
public void testGetEnvironment(){
- Environment env = Environment.of();
+ Environment env = Environment.current();
assertNotNull(env);
- Environment env2 = Environment.of();
+ Environment env2 = Environment.current();
assertNotNull(env2);
assertTrue("Current Environments requested in same context are not the same!", env==env2);
}
@@ -52,7 +52,7 @@ public class EnvironmentManagerTest {
@Test
public void testRootIsNotCurrentEnvironment(){
Environment env1 = Environment.getRootEnvironment();
- Environment env2 = Environment.of();
+ Environment env2 = Environment.current();
assertNotNull(env1);
assertNotNull(env2);
assertNotSame(env1, env2);
@@ -84,12 +84,12 @@ public class EnvironmentManagerTest {
@Test
public void testEnvironmentId(){
- String envId = Environment.of().getEnvironmentId();
+ String envId = Environment.current().getEnvironmentId();
assertNotNull(envId);
assertEquals(envId, "MyApp1");
- envId = Environment.of().getParentEnvironment().getEnvironmentId();
+ envId = Environment.current().getParentEnvironment().getEnvironmentId();
assertEquals(envId, "myEar1");
- envId = Environment.of().getParentEnvironment().getParentEnvironment().getEnvironmentId();
+ envId = Environment.current().getParentEnvironment().getParentEnvironment().getEnvironmentId();
assertEquals(envId, "system");
envId = Environment.getRootEnvironment().getEnvironmentId();
assertEquals(envId, "root");
@@ -98,6 +98,6 @@ public class EnvironmentManagerTest {
@Test
public void testEnvironmentOverride(){
assertEquals(Environment.getRootEnvironment().get("user.country").get(),System.getProperty("user.country"));
- assertEquals(Environment.of().get("user.country").get(), "DE_1234");
+ assertEquals(Environment.current().get("user.country").get(), "DE_1234");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java b/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
index 6448df1..c9fdde2 100644
--- a/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
+++ b/core/src/test/java/org/apache/tamaya/internal/TestConfigProvider.java
@@ -34,18 +34,18 @@ 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("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/core/src/test/java/org/apache/tamaya/package-info.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/package-info.java b/core/src/test/java/org/apache/tamaya/package-info.java
new file mode 100644
index 0000000..0a7cccb
--- /dev/null
+++ b/core/src/test/java/org/apache/tamaya/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Created by Anatole on 02.12.2014.
+ */
+package org.apache.tamaya;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d18afb10/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java b/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java
index 2c85dc1..e177d5a 100644
--- a/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java
+++ b/core/src/test/java/org/apache/tamaya/samples/annotations/ConfiguredTest.java
@@ -31,7 +31,7 @@ public class ConfiguredTest{
@Test
public void testTemplate(){
- ConfigTemplate template = Configuration.of(ConfigTemplate.class);
+ ConfigTemplate template = Configuration.current(ConfigTemplate.class);
assertNotNull(template);
assertNotNull(template.computerName());
assertNotNull(template.APPDATA());