You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by po...@apache.org on 2018/01/25 22:04:27 UTC
[01/12] incubator-tamaya git commit: TAMAYA-321: Fix javadoc.
Repository: incubator-tamaya
Updated Branches:
refs/heads/configjsr 97bd06a71 -> cd37ae9c4
TAMAYA-321: Fix javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/61845038
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/61845038
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/61845038
Branch: refs/heads/configjsr
Commit: 61845038374217f1029adcf6ab36162b33479145
Parents: 27c0d76
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Nov 27 21:40:42 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Nov 27 21:40:42 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/tamaya/Configuration.java | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/61845038/code/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/Configuration.java b/code/api/src/main/java/org/apache/tamaya/Configuration.java
index b891d43..b00eebd 100644
--- a/code/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/code/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -25,13 +25,13 @@ import java.util.Map;
/**
- * <p>A configuration models a aggregated set current properties, identified by
+ * <p>A configuration models an aggregated set of current properties, identified by
* a unique key, but adds higher level access functions to
* a {@link org.apache.tamaya.spi.PropertySource}. Hereby in most
* cases a configuration is a wrapper around a composite
* {@link org.apache.tamaya.spi.PropertySource} instance, which may combine
- * multiple child config in well defined tree like structure,
- * where nodes define logically the rules current priority, filtering,
+ * multiple child configurations in a well defined tree like structure,
+ * where nodes define logically the rules' current priority, filtering,
* combination and overriding.
* </p>
* <h3>Implementation Requirements</h3>
@@ -43,7 +43,7 @@ import java.util.Map;
*
* <p>It is not recommended that implementations also are serializable, since the any configuration can be <i>frozen</i>
* by reading out its complete configuration map into a serializable and remotable structure. This helps significantly
- * simplifying the development current this interface, e.g. for being backed up by systems and stores that are not part current
+ * simplifying the development of this interface, e.g. for being backed up by systems and stores that are not part
* this library at all.</p>
*/
public interface Configuration {
@@ -70,12 +70,12 @@ public interface Configuration {
}
/**
- * Get the property keys as type T. This will implicitly require a corresponding {@link
- * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
- * fromMap the given String keys.
+ * Gets the property keys as type T. This will implicitly require a corresponding {@link
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable of providing type T
+ * fromMap for the given String keys.
*
* @param <T> the type of the class modeled by the type parameter
- * @param key the property's absolute, or relative path, e.g. @code
+ * @param key the property's absolute, or relative path, e.g. {@code
* a/b/c/d.myProperty}, not {@code null}.
* @param type The target type required, not {@code null}.
* @param defaultValue value to be used, if no value is present, not {@code null}
@@ -87,9 +87,9 @@ public interface Configuration {
}
/**
- * Get the property keys as type T. This will implicitly require a corresponding {@link
- * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
- * fromMap the given String keys.
+ * Gets the property keys as type T. This will implicitly require a corresponding {@link
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable of providing type T
+ * fromMap for the given String keys.
*
* @param <T> the type of the class modeled by the type parameter
* @param key the property's absolute, or relative path, e.g. @code
@@ -104,8 +104,8 @@ public interface Configuration {
/**
* Get the property keys as type T. This will implicitly require a corresponding {@link
- * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
- * fromMap the given String keys.
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable of providing type T
+ * literals for the given key.
*
* @param <T> the type of the type literal
* @param key the property's absolute, or relative path, e.g. @code
@@ -118,8 +118,8 @@ public interface Configuration {
/**
* Get the property keys as type T. This will implicitly require a corresponding {@link
- * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
- * fromMap the given String keys.
+ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable of providing type T
+ * literals for the given key.
*
* @param <T> the type of the type literal
* @param key the property's absolute, or relative path, e.g.
@@ -134,7 +134,7 @@ public interface Configuration {
/**
* Access all currently known configuration properties as a full {@code Map<String,String>}.
* Be aware that entries from non scannable parts of the registered {@link org.apache.tamaya.spi.PropertySource}
- * instances may not be contained in the result, but nevertheless be accessible calling one of the
+ * instances may not be contained in the result, but nevertheless be accessible by calling one of the
* {@code get(...)} methods.
* @return all currently known configuration properties.
*/
[06/12] incubator-tamaya git commit: Show Travis baadge on github.
Posted by po...@apache.org.
Show Travis baadge on github.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/0af44807
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/0af44807
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/0af44807
Branch: refs/heads/configjsr
Commit: 0af44807200ea61f4891e516fb59cbcbab7f75b3
Parents: 30506a4
Author: Phil Ottlinger <po...@apache.org>
Authored: Thu Jan 4 23:18:44 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Thu Jan 4 23:18:44 2018 +0100
----------------------------------------------------------------------
README.md | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0af44807/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 22bb2e6..6802567 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,16 @@ More information on Tamaya can be found on the [homepage of Apache Tamaya](https
The Apache Tamaya project is built with [Maven 3](https://maven.apache.org/) and [Java 8](https://java.sun.com/), so you need JDK >=1.8 and a reasonable version of maven
installed on your computer.
+## Local builds
Then you can build Tamaya via:
```
$ export MAVEN_OPTS="-Xmx512m -XX:PermGenSpace=200m"
$ mvn
```
+
+### Travis / CI
+
+Apart from integration into ASF CI there's a travis build:
+
+[](https://travis-ci.org/apache/incubator-tamaya/branches)
[10/12] incubator-tamaya git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-tamaya
Posted by po...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tamaya
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/3f525044
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/3f525044
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/3f525044
Branch: refs/heads/configjsr
Commit: 3f52504407ad4f3d1806fb1e684475069da7962f
Parents: 3f6b34a 014001b
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Jan 8 20:33:25 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Jan 8 20:33:25 2018 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/12] incubator-tamaya git commit: TAMAYA-258: Downgrade to pitest
1.2
Posted by po...@apache.org.
TAMAYA-258: Downgrade to pitest 1.2
v1.3 gives strange test errors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/3f6b34a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/3f6b34a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/3f6b34a0
Branch: refs/heads/configjsr
Commit: 3f6b34a0246b752a443f576c1ac94db4a2614350
Parents: adc1096
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Jan 8 20:24:59 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Jan 8 20:33:12 2018 +0100
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3f6b34a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 18adb6a..8169ba5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,8 @@
<asciidoctor-diagramm.version>1.2.1</asciidoctor-diagramm.version>
<asciidoctorj.version>1.5.2</asciidoctorj.version>
<checkstyle.version>2.15</checkstyle.version>
- <pitest-plugin.version>1.3.1</pitest-plugin.version>
+ <!-- 201801: v1.3.x gives strange test errors -->
+ <pitest-plugin.version>1.2.5</pitest-plugin.version>
<enforcer.version>1.4.1</enforcer.version>
<gem.plugin>1.0.7</gem.plugin>
<sources.plugin>3.0.1</sources.plugin>
[08/12] incubator-tamaya git commit: TAMAYA-258: Downgrad to pitest
1.2
Posted by po...@apache.org.
TAMAYA-258: Downgrad to pitest 1.2
v1.3 gives strange test errors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/014001b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/014001b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/014001b5
Branch: refs/heads/configjsr
Commit: 014001b52fbd915dd4d2b76fa11f247cb4098e0c
Parents: adc1096
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Jan 8 20:24:59 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Jan 8 20:24:59 2018 +0100
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/014001b5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 18adb6a..8169ba5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,8 @@
<asciidoctor-diagramm.version>1.2.1</asciidoctor-diagramm.version>
<asciidoctorj.version>1.5.2</asciidoctorj.version>
<checkstyle.version>2.15</checkstyle.version>
- <pitest-plugin.version>1.3.1</pitest-plugin.version>
+ <!-- 201801: v1.3.x gives strange test errors -->
+ <pitest-plugin.version>1.2.5</pitest-plugin.version>
<enforcer.version>1.4.1</enforcer.version>
<gem.plugin>1.0.7</gem.plugin>
<sources.plugin>3.0.1</sources.plugin>
[04/12] incubator-tamaya git commit: TAMAYA-321: Adapt threshold to
current state.
Posted by po...@apache.org.
TAMAYA-321: Adapt threshold to current state.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/502444fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/502444fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/502444fa
Branch: refs/heads/configjsr
Commit: 502444fa18e2ab6ea61db34b7f2b900a327d3cb0
Parents: a2bdb02
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Nov 27 21:48:59 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Nov 27 21:48:59 2017 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/502444fa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6865c09..76ba4cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -325,7 +325,7 @@
<artifactId>pitest-maven</artifactId>
<version>${pitest-plugin.version}</version>
<configuration>
- <mutationThreshold>42</mutationThreshold>
+ <mutationThreshold>38</mutationThreshold>
<timestampedReports>false</timestampedReports>
<targetClasses>
<param>org.apache.tamaya.*</param>
[12/12] incubator-tamaya git commit: Merge remote-tracking branch
'origin/master' into configjsr
Posted by po...@apache.org.
Merge remote-tracking branch 'origin/master' into configjsr
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/cd37ae9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/cd37ae9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/cd37ae9c
Branch: refs/heads/configjsr
Commit: cd37ae9c4aae265a5dd2435240b8ca93759c4fd6
Parents: 97bd06a d6229de
Author: Phil Ottlinger <po...@apache.org>
Authored: Thu Jan 25 23:04:16 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Thu Jan 25 23:04:16 2018 +0100
----------------------------------------------------------------------
README.md | 7 +++++
.../apache/tamaya/ConfigurationProvider.java | 4 +--
.../java/org/apache/tamaya/Configuration.java | 32 ++++++++++----------
.../apache/tamaya/spi/ConfigurationBuilder.java | 9 +++---
pom.xml | 18 +++++------
5 files changed, 38 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cd37ae9c/code/compat/src/main/java/org/apache/tamaya/ConfigurationProvider.java
----------------------------------------------------------------------
diff --cc code/compat/src/main/java/org/apache/tamaya/ConfigurationProvider.java
index bacb944,0000000..9eae5af
mode 100644,000000..100644
--- a/code/compat/src/main/java/org/apache/tamaya/ConfigurationProvider.java
+++ b/code/compat/src/main/java/org/apache/tamaya/ConfigurationProvider.java
@@@ -1,138 -1,0 +1,138 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tamaya;
+
+import org.apache.tamaya.spi.*;
+
+import java.util.logging.Logger;
+
+/**
- * Static access to the {@link Configuration} for the very application.
++ * Static access to the {@link Configuration} of the whole application.
+ */
+public final class ConfigurationProvider {
+
+ private static final Logger LOG = Logger.getLogger(ConfigurationProvider.class.getName());
+
+ private static ConfigurationProviderSpi spi() {
+ ConfigurationProviderSpi spi = ServiceContextManager.getServiceContext()
+ .getService(ConfigurationProviderSpi.class);
+ if(spi==null){
+ throw new IllegalStateException("ConfigurationProviderSpi not available.");
+ }
+ return spi;
+ }
+
+ private ConfigurationProvider() {
+ // just to prevent initialisation
+ }
+
+ /**
+ * Access the current configuration.
+ *
+ * @return the corresponding Configuration instance, never {@code null}.
+ */
+ public static Configuration getConfiguration() {
+ return spi().getConfiguration();
+ }
+
+ /**
+ * Creates a new configuration instance based on the given context.
+ *
+ * @param context the configuration context, not {@code null}.
+ * @return a new Configuration instance, never {@code null}.
+ */
+ public static Configuration createConfiguration(ConfigurationContext context) {
+ return spi().createConfiguration(context);
+ }
+
+ /**
+ * Get access to the current ConfigurationContext.
+ *
+ * @return the current ConfigurationContext, never null.
- * @deprecated Use {@link Configuration#getContext()} instead of.
++ * @deprecated Use {@link Configuration#getContext()} instead.
+ */
+ @Deprecated
+ public static ConfigurationContext getConfigurationContext() {
+ return spi().getConfigurationContext();
+ }
+
+ /**
+ * This method allows to replace the current {@link org.apache.tamaya.spi.ConfigurationContext} with a new
+ * instance. This can be used to update the context with a new one, e.g. because some of the configuration
+ * data has changed and should be updated. It is the responsibility of the ConfigurationProvider to trigger
+ * corresponding update events for the current {@link org.apache.tamaya.Configuration}, so observing
+ * listeners can do whatever is appropriate to react to any given configuration changes.
+ *
+ * @param context the new ConfigurationContext to be applied.
+ * @throws java.lang.UnsupportedOperationException if the current provider is read-only and does not support
+ * applying a new ConfigurationContext.
+ * @deprecated Use #setConfiguration(Configuration) instead of.
+ */
+ @Deprecated
+ public static void setConfigurationContext(ConfigurationContext context) {
+ spi().setConfigurationContext(context);
+ }
+
+ /**
+ * This method allows to replace the current default {@link org.apache.tamaya.Configuration} with a new
+ * instance. It is the responsibility of the ConfigurationProvider to trigger
+ * corresponding update events for the current {@link org.apache.tamaya.Configuration}, so observing
+ * listeners can do whatever is appropriate to react to any given configuration change.
+ *
+ * @param config the new Configuration to be applied, not {@code null}
+ * @throws java.lang.UnsupportedOperationException if the current provider is read-only and
+ * does not support
+ * applying a new Configuration.
+ */
+ public static void setConfiguration(Configuration config) {
+ LOG.info("TAMAYA Applying new Configuration: " + config);
+ spi().setConfiguration(config);
+ }
+
+ /**
+ * Create a new {@link ConfigurationBuilder} instance. This method creates
+ * a new builder instance that is not related to any concrete {@link org.apache.tamaya.spi.ConfigurationContext}.
+ * You can use {@link #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)} to change the
+ * current configuration context.
+ *
+ * @return a new, empty {@link ConfigurationBuilder}, never null.
+ * @see #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)
+ * @see org.apache.tamaya.spi.ConfigurationContext
+ * @deprecated Will be removed.
+ */
+ @Deprecated
+ public static ConfigurationContextBuilder getConfigurationContextBuilder() {
+ return spi().getConfigurationContextBuilder();
+ }
+
+ /**
+ * Create a new {@link ConfigurationBuilder} instance. This method creates
+ * a new builder instance that is not related to any concrete {@link org.apache.tamaya.spi.ConfigurationContext}.
+ * You can use {@link #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)} to change the
+ * current configuration context.
+ *
+ * @return a new, empty {@link ConfigurationBuilder}, never null.
+ * @see #setConfigurationContext(org.apache.tamaya.spi.ConfigurationContext)
+ * @see org.apache.tamaya.spi.ConfigurationContext
+ */
+ public static ConfigurationBuilder getConfigurationBuilder() {
+ return spi().getConfigurationBuilder();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cd37ae9c/code/old/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --cc code/old/api/src/main/java/org/apache/tamaya/Configuration.java
index b891d43,0000000..b00eebd
mode 100644,000000..100644
--- a/code/old/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/code/old/api/src/main/java/org/apache/tamaya/Configuration.java
@@@ -1,179 -1,0 +1,179 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tamaya;
+
+import org.apache.tamaya.spi.ConfigurationBuilder;
+import org.apache.tamaya.spi.ConfigurationContext;
+
+import java.util.Map;
+
+
+/**
- * <p>A configuration models a aggregated set current properties, identified by
++ * <p>A configuration models an aggregated set of current properties, identified by
+ * a unique key, but adds higher level access functions to
+ * a {@link org.apache.tamaya.spi.PropertySource}. Hereby in most
+ * cases a configuration is a wrapper around a composite
+ * {@link org.apache.tamaya.spi.PropertySource} instance, which may combine
- * multiple child config in well defined tree like structure,
- * where nodes define logically the rules current priority, filtering,
++ * multiple child configurations in a well defined tree like structure,
++ * where nodes define logically the rules' current priority, filtering,
+ * combination and overriding.
+ * </p>
+ * <h3>Implementation Requirements</h3>
+ * Implementations current this interface must be
+ * <ul>
+ * <li>Thread safe</li>
+ * <li>Immutable</li>
+ * </ul>
+ *
+ * <p>It is not recommended that implementations also are serializable, since the any configuration can be <i>frozen</i>
+ * by reading out its complete configuration map into a serializable and remotable structure. This helps significantly
- * simplifying the development current this interface, e.g. for being backed up by systems and stores that are not part current
++ * simplifying the development of this interface, e.g. for being backed up by systems and stores that are not part
+ * this library at all.</p>
+ */
+public interface Configuration {
+
+ /**
+ * Access a property.
+ *
+ * @param key the property's key, not {@code null}.
+ * @return the property's value.
+ */
+ default String get(String key){
+ return get(key, TypeLiteral.of(String.class));
+ }
+
+ /**
+ * Access a property.
+ *
+ * @param key the property's key, not {@code null}.
+ * @param defaultValue value to be returned, if no value is present, not {@code null}
+ * @return the property's keys.
+ */
+ default String getOrDefault(String key, String defaultValue){
+ return getOrDefault(key, TypeLiteral.of(String.class), defaultValue);
+ }
+
+ /**
- * Get the property keys as type T. This will implicitly require a corresponding {@link
- * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
- * fromMap the given String keys.
++ * Gets the property keys as type T. This will implicitly require a corresponding {@link
++ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable of providing type T
++ * fromMap for the given String keys.
+ *
+ * @param <T> the type of the class modeled by the type parameter
- * @param key the property's absolute, or relative path, e.g. @code
++ * @param key the property's absolute, or relative path, e.g. {@code
+ * a/b/c/d.myProperty}, not {@code null}.
+ * @param type The target type required, not {@code null}.
+ * @param defaultValue value to be used, if no value is present, not {@code null}
+ * @return the property value, never {@code null}.
+ * @throws ConfigException if the keys could not be converted to the required target type.
+ */
+ default <T> T getOrDefault(String key, Class<T> type, T defaultValue){
+ return getOrDefault(key, TypeLiteral.of(type), defaultValue);
+ }
+
+ /**
- * Get the property keys as type T. This will implicitly require a corresponding {@link
- * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
- * fromMap the given String keys.
++ * Gets the property keys as type T. This will implicitly require a corresponding {@link
++ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable of providing type T
++ * fromMap for the given String keys.
+ *
+ * @param <T> the type of the class modeled by the type parameter
+ * @param key the property's absolute, or relative path, e.g. @code
+ * a/b/c/d.myProperty}.
+ * @param type The target type required, not {@code null}.
+ * @return the property value, never {@code null}.
+ * @throws ConfigException if the keys could not be converted to the required target type.
+ */
+ default <T> T get(String key, Class<T> type){
+ return get(key, TypeLiteral.of(type));
+ }
+
+ /**
+ * Get the property keys as type T. This will implicitly require a corresponding {@link
- * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
- * fromMap the given String keys.
++ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable of providing type T
++ * literals for the given key.
+ *
+ * @param <T> the type of the type literal
+ * @param key the property's absolute, or relative path, e.g. @code
+ * a/b/c/d.myProperty}, not {@code null}.
+ * @param type The target type required, not {@code null}.
+ * @return the property value, never {@code null}.
+ * @throws ConfigException if the keys could not be converted to the required target type.
+ */
+ <T> T get(String key, TypeLiteral<T> type);
+
+ /**
+ * Get the property keys as type T. This will implicitly require a corresponding {@link
- * org.apache.tamaya.spi.PropertyConverter} to be available that is capable current providing type T
- * fromMap the given String keys.
++ * org.apache.tamaya.spi.PropertyConverter} to be available that is capable of providing type T
++ * literals for the given key.
+ *
+ * @param <T> the type of the type literal
+ * @param key the property's absolute, or relative path, e.g.
+ * {@code a/b/c/d.myProperty}, not {@code null}.
+ * @param type The target type required, not {@code null}.
+ * @param defaultValue default value to be used, if no value is present.
+ * @return the property value, never null.
+ * @throws ConfigException if the keys could not be converted to the required target type.
+ */
+ <T> T getOrDefault(String key, TypeLiteral<T> type, T defaultValue);
+
+ /**
+ * Access all currently known configuration properties as a full {@code Map<String,String>}.
+ * Be aware that entries from non scannable parts of the registered {@link org.apache.tamaya.spi.PropertySource}
- * instances may not be contained in the result, but nevertheless be accessible calling one of the
++ * instances may not be contained in the result, but nevertheless be accessible by calling one of the
+ * {@code get(...)} methods.
+ * @return all currently known configuration properties.
+ */
+ Map<String,String> getProperties();
+
+ /**
+ * Extension point for adjusting configuration.
+ *
+ * @param operator A configuration operator, e.g. a filter, or an adjuster
+ * combining configurations, never {@code null}.
+ * @return the new adjusted configuration returned by the {@code operator}, never {@code null}.
+ */
+ default Configuration with(ConfigOperator operator){
+ return operator.operate(this);
+ }
+
+ /**
+ * Query a configuration.
+ *
+ * @param <T> the type of the configuration.
+ * @param query the query, not {@code null}.
+ * @return the result returned by the {@code query}.
+ */
+ default <T> T query(ConfigQuery<T> query){
+ return query.query(this);
+ }
+
+ /**
+ * Access a configuration's context.
+ * @return the configuration context, never null.
+ */
+ ConfigurationContext getContext();
+
+ /**
+ * Create a new builder using this instance as it's base.
+ * @return a new builder, never null.
+ */
+ default ConfigurationBuilder toBuilder() {
+ return ConfigurationProvider.getConfigurationBuilder().setConfiguration(this);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cd37ae9c/code/old/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --cc code/old/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java
index a2b3257,0000000..3511abe
mode 100644,000000..100644
--- a/code/old/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java
+++ b/code/old/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java
@@@ -1,348 -1,0 +1,347 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tamaya.spi;
+
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.TypeLiteral;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+/**
- * A builder for creating new instance of {@link Configuration}.
++ * A builder for creating new instances of {@link Configuration}.
+ * Builders can be obtained in exactly two ways:
+ * <ol>
+ * <li>By accessing a preinitialized builder from an existing {@link Configuration},
+ * by calling {@link org.apache.tamaya.spi.Configuration#toBuilder()}.</li>
+ * <li>By accessing an empty builder instance from
+ * {@link org.apache.tamaya.ConfigurationProvider#getConfigurationBuilder()}.</li>
+ * </ol>
+ * After all changes are applied to a builder a new {@link Configuration} instance can
+ * be created and can be applied by calling
+ * {@link #build()}}.
+ *
+ */
+public interface ConfigurationBuilder {
+
+ /**
+ * Init this builder instance with the given {@link Configuration} instance. This
+ * method will use any existing property sources, filters, converters and the combination
+ * policy of the given {@link Configuration} and initialize the current builder
+ * with them. All previous property sources, filters, converters and the combination
+ * policy of this instance will be replaced.
+ *
+ * @param config the {@link Configuration} instance to be used, not {@code null}.
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder setConfiguration(Configuration config);
+
+ /**
+ * Init this builder instance with the given {@link ConfigurationContext} instance. This
+ * method will use any existing property sources, filters, converters and the combination
+ * policy of the given {@link ConfigurationContext} and initialize the current builder
+ * with them. All previous property sources, filters, converters and the combination
+ * policy of this instance will be replaced.
+ *
+ * @param context the {@link ConfigurationContext} instance to be used, not {@code null}.
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder setContext(ConfigurationContext context);
+
+ /**
+ * This method can be used for adding {@link PropertySource}s.
+ * Hereby the property source is added to the tail of property sources with
+ * lowest priority regardless of its current ordinal value. To sort the property
+ * sources based on their ordinals call {@link #sortPropertySources}.
+ *
+ * @param propertySources the PropertySources to add
+ * @return this builder, for chaining, never null.
+ * @throws IllegalArgumentException If a property source with a given name already
+ * exists.
+ */
+ ConfigurationBuilder addPropertySources(PropertySource... propertySources);
+
+ /**
+ * This method can be used for programmatically adding {@link PropertySource}s.
+ * Hereby the property source is added to the tail of property sources with
+ * lowest priority regardless of its current ordinal value. To sort the property
+ * sources based on their ordinals call {@link #sortPropertySources}.
+ *
+ * @param propertySources the PropertySources to add
+ * @return this builder, for chaining, never null.
+ * @throws IllegalArgumentException If a property source with a given name already
+ * exists.
+ */
+ ConfigurationBuilder addPropertySources(Collection<PropertySource> propertySources);
+
+ /**
- * Add all registered (default) property sources to the context built. The sources are ordered
++ * Adds all registered (default) property sources to the context built. The sources are ordered
+ * based on their ordinal values and added to the chain of property sources with
+ * higher priority.
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder addDefaultPropertySources();
+
+ /**
+ * Removes the given property sources, if existing. The existing order of property
+ * sources is preserved.
+ *
+ * @param propertySources the property sources to remove, not {@code null}.
+ * @return the builder for chaining.
+ */
+ ConfigurationBuilder removePropertySources(PropertySource... propertySources);
+
+ /**
+ * Removes the given property sources, if existing. The existing order of property
+ * sources is preserved.
+ *
+ * @param propertySources the property sources to remove, not {@code null}.
+ * @return the builder for chaining.
+ */
+ ConfigurationBuilder removePropertySources(Collection<PropertySource> propertySources);
+
+ /**
+ * Access the current chain of property sources. Items at the end of the list have
- * precedence/more significance.
++ * precedence/higher significance.
+ *
+ * @return the property source chain, never {@code null}.
+ */
+ List<PropertySource> getPropertySources();
+
+ /**
+ * Access the current chain of property filters. Items at the end of the list have
- * precedence/more significance.
++ * precedence/higher significance.
+ *
+ * @return the property filter chain, never {@code null}.
+ */
+ List<PropertyFilter> getPropertyFilters();
+
+ /**
+ * Access the current registered property converters.
+ *
+ * @return the current registered property converters.
+ */
+ Map<TypeLiteral<?>, Collection<PropertyConverter<?>>> getPropertyConverter();
+
+ /**
+ * Increases the priority of the given property source, by moving it towards the end
+ * of the chain of property sources. If the property source given is already at the end
+ * this method has no effect. This operation does not change any ordinal values.
+ *
+ * @param propertySource the property source to be incresed regarding its significance.
+ * @return the builder for chaining.
+ * @throws IllegalArgumentException If no such property source exists in the current
+ * chain.
+ */
+ ConfigurationBuilder increasePriority(PropertySource propertySource);
+
+ /**
+ * Decreases the priority of the given property source, by moving it towards the start
+ * of the chain of property sources. If the property source given is already the first
+ * this method has no effect. This operation does not change any ordinal values.
+ *
+ * @param propertySource the property source to be decresed regarding its significance.
+ * @return the builder for chaining.
+ * @throws IllegalArgumentException If no such property source exists in the current
+ * chain.
+ */
+ ConfigurationBuilder decreasePriority(PropertySource propertySource);
+
+ /**
+ * Increases the priority of the given property source to be maximal, by moving it to
+ * the tail of the of property source chain. If the property source given is
+ * already the last item this method has no effect. This operation does not change
+ * any ordinal values.
+ *
+ * @param propertySource the property source to be maximized regarding its significance.
+ * @return the builder for chaining.
+ * @throws IllegalArgumentException If no such property source exists in the current
+ * chain.
+ */
+ ConfigurationBuilder highestPriority(PropertySource propertySource);
+
+ /**
+ * Decreases the priority of the given property source to be minimal, by moving it to
+ * the start of the chain of property source chain. If the property source given is
+ * already the first item this method has no effect. This operation does not change
+ * any ordinal values.
+ *
+ * @param propertySource the property source to be minimized regarding its significance.
+ * @return the builder for chaining.
+ * @throws IllegalArgumentException If no such property source exists in the current
+ * chain.
+ */
+ ConfigurationBuilder lowestPriority(PropertySource propertySource);
+
+ /**
+ * Adds the given PropertyFilter instances, hereby the instances are added
+ * to the end of the list with highest priority. The ordering of existing
+ * property filters remains unchanged. To sort the property
+ * filters call {@link #sortPropertyFilter}.
+ *
+ * @param filters the filters to add
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder addPropertyFilters(PropertyFilter... filters);
+
+ /**
+ * Adds the given PropertyFilter instances, hereby the instances are added
+ * to the end of the list with highest priority. The ordering of existing
+ * property filters remains unchanged. To sort the property
+ * filters call {@link #sortPropertyFilter}.
+ *
+ * @param filters the filters to add
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder addPropertyFilters(Collection<PropertyFilter> filters);
+
+ /**
+ * Add all auto-discoverable property filters to the context built.
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder addDefaultPropertyFilters();
+
-
+ /**
+ * Removes the given PropertyFilter instances, if existing. The order of the remaining
+ * filters is preserved.
+ *
+ * @param filters the filter to remove
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder removePropertyFilters(PropertyFilter... filters);
+
+ /**
+ * Removes the given PropertyFilter instances, if existing. The order of the remaining
+ * filters is preserved.
+ *
+ * @param filters the filter to remove
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder removePropertyFilters(Collection<PropertyFilter> filters);
+
+ /**
+ * This method can be used for adding {@link PropertyConverter}s.
+ * Converters are added at the end after any existing converters.
+ * For converters already registered for the current target type the
+ * method has no effect.
+ *
+ * @param typeToConvert the type for which the converter is for
+ * @param propertyConverters the PropertyConverters to add for this type
+ * @param <T> the target type.
+ * @return this builder, for chaining, never null.
+ */
+ <T> ConfigurationBuilder addPropertyConverters(TypeLiteral<T> typeToConvert,
+ @SuppressWarnings("unchecked") PropertyConverter<T>... propertyConverters);
+
+ /**
+ * This method can be used for adding {@link PropertyConverter}s.
+ * Converters are added at the end after any existing converters.
+ * For converters already registered for the current target type the
+ * method has no effect.
+ *
+ * @param typeToConvert the type for which the converter is for
+ * @param propertyConverters the PropertyConverters to add for this type
+ * @param <T> the target type.
+ * @return this builder, for chaining, never null.
+ */
+ <T> ConfigurationBuilder addPropertyConverters(TypeLiteral<T> typeToConvert,
+ Collection<PropertyConverter<T>> propertyConverters);
+
+ /**
+ * Add all auto-discoverable property converters to the context built.
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder addDefaultPropertyConverters();
+
+ /**
+ * Removes the given PropertyConverter instances for the given type,
+ * if existing.
+ *
+ * @param typeToConvert the type which the converter is for
+ * @param propertyConverters the converter to remove
+ * @param <T> the target type.
+ * @return this builder, for chaining, never null.
+ */
+ <T> ConfigurationBuilder removePropertyConverters(TypeLiteral<T> typeToConvert,
+ @SuppressWarnings("unchecked") PropertyConverter<T>... propertyConverters);
+
+ /**
+ * Removes the given PropertyConverter instances for the given type,
+ * if existing.
+ *
+ * @param typeToConvert the type which the converter is for
+ * @param propertyConverters the converter to remove
+ * @param <T> the target type.
+ * @return this builder, for chaining, never null.
+ */
+ <T> ConfigurationBuilder removePropertyConverters(TypeLiteral<T> typeToConvert,
+ Collection<PropertyConverter<T>> propertyConverters);
+
+ /**
+ * Removes all converters for the given type, which actually renders a given type
+ * unsupported for type conversion.
+ *
+ * @param typeToConvert the type which the converter is for
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder removePropertyConverters(TypeLiteral<?> typeToConvert);
+
+ /**
+ * Sorts the current registered property sources using the given comparator.
+ *
+ * NOTE: property sources at the beginning have minimal significance.
+ *
+ * @param comparator the comparator to be used, not {@code null}.
+ * @return this instance for chaining.
+ */
+ ConfigurationBuilder sortPropertySources(Comparator<PropertySource> comparator);
+
+ /**
+ * Sorts the current registered property filters using the given comparator.
+ *
+ * NOTE: property filters at the beginning have minimal significance.
+ *
+ * @param comparator the comparator to be used, not {@code null}.
+ * @return this instance for chaining.
+ */
+ ConfigurationBuilder sortPropertyFilter(Comparator<PropertyFilter> comparator);
+
+ /**
+ * Sets the {@link PropertyValueCombinationPolicy} used to evaluate the final
+ * property values.
+ *
+ * @param policy the {@link PropertyValueCombinationPolicy} used, not {@code null}.
+ * @return this builder, for chaining, never null.
+ */
+ ConfigurationBuilder setPropertyValueCombinationPolicy(PropertyValueCombinationPolicy policy);
+
+ /**
+ * Builds a new {@link Configuration} based on the data in this builder. The ordering of property
+ * sources and property filters is not changed, regardless of their ordinals. For ensure a certain
+ * ordering/significance use {@link #sortPropertyFilter(Comparator)} and/or {@link #sortPropertySources(Comparator)}
+ * before building the context.
+ *
+ * @return the final configuration, never null.
+ */
+ Configuration build();
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/cd37ae9c/pom.xml
----------------------------------------------------------------------
[07/12] incubator-tamaya git commit: Try to change pitest config
Posted by po...@apache.org.
Try to change pitest config
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/adc10963
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/adc10963
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/adc10963
Branch: refs/heads/configjsr
Commit: adc10963ebceb0e7cc6cc3187eeac3f1a8cb4c9b
Parents: 0af4480
Author: Phil Ottlinger <po...@apache.org>
Authored: Thu Jan 4 23:20:24 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Thu Jan 4 23:20:24 2018 +0100
----------------------------------------------------------------------
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/adc10963/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2932c9b..18adb6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,10 +331,11 @@
<param>org.apache.tamaya.*</param>
</targetClasses>
<excludedClasses>
+ <param>org.apache.tamaya.core.internal.BannerManager</param>
<param>org.apache.tamaya.core.internal.BannerManagerTest</param>
</excludedClasses>
<excludedMethods>
- <param>toString</param>
+ <param>toString</param>
</excludedMethods>
<verbose>true</verbose>
</configuration>
[05/12] incubator-tamaya git commit: Update to latest pitest.
Posted by po...@apache.org.
Update to latest pitest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/30506a48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/30506a48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/30506a48
Branch: refs/heads/configjsr
Commit: 30506a4874b103e4e867f00ac395e274c487cc15
Parents: 502444f
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Dec 27 22:13:08 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Dec 27 22:13:08 2017 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/30506a48/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 76ba4cb..2932c9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<asciidoctor-diagramm.version>1.2.1</asciidoctor-diagramm.version>
<asciidoctorj.version>1.5.2</asciidoctorj.version>
<checkstyle.version>2.15</checkstyle.version>
- <pitest-plugin.version>1.2.4</pitest-plugin.version>
+ <pitest-plugin.version>1.3.1</pitest-plugin.version>
<enforcer.version>1.4.1</enforcer.version>
<gem.plugin>1.0.7</gem.plugin>
<sources.plugin>3.0.1</sources.plugin>
[02/12] incubator-tamaya git commit: TAMAYA-321: Fix javadocs.
Posted by po...@apache.org.
TAMAYA-321: Fix javadocs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/24e09135
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/24e09135
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/24e09135
Branch: refs/heads/configjsr
Commit: 24e091355c04c2e5532d49c1695014be26d2045c
Parents: 6184503
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Nov 27 21:43:01 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Nov 27 21:43:01 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/tamaya/ConfigurationProvider.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/24e09135/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java b/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
index bacb944..9eae5af 100644
--- a/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
+++ b/code/api/src/main/java/org/apache/tamaya/ConfigurationProvider.java
@@ -23,7 +23,7 @@ import org.apache.tamaya.spi.*;
import java.util.logging.Logger;
/**
- * Static access to the {@link Configuration} for the very application.
+ * Static access to the {@link Configuration} of the whole application.
*/
public final class ConfigurationProvider {
@@ -65,7 +65,7 @@ public final class ConfigurationProvider {
* Get access to the current ConfigurationContext.
*
* @return the current ConfigurationContext, never null.
- * @deprecated Use {@link Configuration#getContext()} instead of.
+ * @deprecated Use {@link Configuration#getContext()} instead.
*/
@Deprecated
public static ConfigurationContext getConfigurationContext() {
[03/12] incubator-tamaya git commit: TAMAYA-321: Fix javadocs
Posted by po...@apache.org.
TAMAYA-321: Fix javadocs
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/a2bdb02a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/a2bdb02a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/a2bdb02a
Branch: refs/heads/configjsr
Commit: a2bdb02a8c699ab8a2c03e75122280bfeeddd6a4
Parents: 24e0913
Author: Phil Ottlinger <po...@apache.org>
Authored: Mon Nov 27 21:47:05 2017 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Mon Nov 27 21:47:05 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/tamaya/spi/ConfigurationBuilder.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a2bdb02a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java b/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java
index a2b3257..3511abe 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationBuilder.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
/**
- * A builder for creating new instance of {@link Configuration}.
+ * A builder for creating new instances of {@link Configuration}.
* Builders can be obtained in exactly two ways:
* <ol>
* <li>By accessing a preinitialized builder from an existing {@link Configuration},
@@ -93,7 +93,7 @@ public interface ConfigurationBuilder {
ConfigurationBuilder addPropertySources(Collection<PropertySource> propertySources);
/**
- * Add all registered (default) property sources to the context built. The sources are ordered
+ * Adds all registered (default) property sources to the context built. The sources are ordered
* based on their ordinal values and added to the chain of property sources with
* higher priority.
* @return this builder, for chaining, never null.
@@ -120,7 +120,7 @@ public interface ConfigurationBuilder {
/**
* Access the current chain of property sources. Items at the end of the list have
- * precedence/more significance.
+ * precedence/higher significance.
*
* @return the property source chain, never {@code null}.
*/
@@ -128,7 +128,7 @@ public interface ConfigurationBuilder {
/**
* Access the current chain of property filters. Items at the end of the list have
- * precedence/more significance.
+ * precedence/higher significance.
*
* @return the property filter chain, never {@code null}.
*/
@@ -219,7 +219,6 @@ public interface ConfigurationBuilder {
*/
ConfigurationBuilder addDefaultPropertyFilters();
-
/**
* Removes the given PropertyFilter instances, if existing. The order of the remaining
* filters is preserved.
[11/12] incubator-tamaya git commit: TAMAYA-296: Update dependencies
Posted by po...@apache.org.
TAMAYA-296: Update dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/d6229de3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/d6229de3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/d6229de3
Branch: refs/heads/configjsr
Commit: d6229de3594538bd30727dfdaabeb4444e11b83f
Parents: 3f52504
Author: Phil Ottlinger <po...@apache.org>
Authored: Wed Jan 24 22:52:25 2018 +0100
Committer: Phil Ottlinger <po...@apache.org>
Committed: Wed Jan 24 22:52:25 2018 +0100
----------------------------------------------------------------------
pom.xml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/d6229de3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8169ba5..2844479 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,9 +51,9 @@
<!-- Keep the JRuby version in sync with the one used by Asciidoctor -->
<assembly.version>3.1.0</assembly.version>
- <asciidoctor.version>1.5.2</asciidoctor.version>
+ <asciidoctor.version>1.5.6</asciidoctor.version>
<asciidoctor-diagramm.version>1.2.1</asciidoctor-diagramm.version>
- <asciidoctorj.version>1.5.2</asciidoctorj.version>
+ <asciidoctorj.version>1.5.6</asciidoctorj.version>
<checkstyle.version>2.15</checkstyle.version>
<!-- 201801: v1.3.x gives strange test errors -->
<pitest-plugin.version>1.2.5</pitest-plugin.version>
@@ -63,7 +63,7 @@
<hamcrest.version>2.0.0.0</hamcrest.version>
<javadoc.version>2.10.4</javadoc.version>
<!-- Must/should match the JRuby version used by AsciidoctorJ -->
- <jruby.version>1.7.20</jruby.version>
+ <jruby.version>1.7.26</jruby.version>
<findbugs.version>3.0.4</findbugs.version>
<mockito.version>1.10.19</mockito.version>
<rat.version>0.12</rat.version>
@@ -534,9 +534,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <!-- 20160816: 3.5.1 generates a broken site, maybe due
- to old asciidoc version?! -->
- <version>3.4</version>
+ <version>3.7</version>
<inherited>true</inherited>
<dependencies>
<dependency><!-- add support for ssh/scp -->