Jenkins build became unstable: Tamaya-Master-branch #489

2016-02-14 Thread Apache Jenkins Server 
See

[2/2] incubator-tamaya git commit: Added test and fixes for collection support.

2016-02-14 Thread anatole 
Added test and fixes for collection support.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/609b4764
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/609b4764
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/609b4764

Branch: refs/heads/master
Commit: 609b476485fc75aafbc099c2a6678004b7e76f67
Parents: 30ad130
Author: anatole 
Authored: Mon Feb 15 01:51:23 2016 +0100
Committer: anatole 
Committed: Mon Feb 15 01:51:23 2016 +0100

--
 .../java/org/apache/tamaya/TypeLiteral.java | 10 
 .../core/internal/PropertyConverterManager.java | 13 ++
 .../internal/AdaptiveCombinationPolicy.java |  7 +
 .../collections/internal/HashMapConverter.java  | 27 
 .../internal/LinkedListConverter.java   |  2 +-
 .../collections/internal/SetConverter.java  |  2 +-
 .../collections/internal/TreeMapConverter.java  |  6 ++---
 .../collections/internal/TreeSetConverter.java  |  4 +--
 8 files changed, 54 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/609b4764/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
--
diff --git a/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java 
b/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
index 597c27c..729f2b6 100644
--- a/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
+++ b/code/api/src/main/java/org/apache/tamaya/TypeLiteral.java
@@ -48,14 +48,14 @@ public class TypeLiteral implements Serializable {
  * Constructor.
  * @param definedType the defined type.
  */
-protected TypeLiteral(Type definedType) {
+public TypeLiteral(Type definedType) {
 this.definedType = definedType;
 }
 
 /**
  * Constructor only for directly implemeting a TypeLiteral hereby 
dynamically implementing a generic interface.
  */
-protected TypeLiteral() {
+public TypeLiteral() {
 this.definedType = getDefinedType(this.getClass());
 }
 
@@ -140,9 +140,7 @@ public class TypeLiteral implements Serializable {
 
 Type superClazz = clazz.getGenericSuperclass();
 
-if (superClazz.equals(Object.class)) {
-throw new RuntimeException("Super class must be parametrized 
type");
-} else if (superClazz instanceof ParameterizedType) {
+if (superClazz instanceof ParameterizedType) {
 ParameterizedType pt = (ParameterizedType) superClazz;
 Type[] actualArgs = pt.getActualTypeArguments();
 
@@ -153,6 +151,8 @@ public class TypeLiteral implements Serializable {
 throw new RuntimeException("More than one parametric type");
 }
 
+} else if (superClazz.equals(Object.class)) {
+throw new RuntimeException("Super class must be parametrized 
type");
 } else {
 type = getDefinedType((Class) superClazz);
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/609b4764/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
--
diff --git 
a/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
 
b/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
index eb18cfb..72facc4 100644
--- 
a/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
+++ 
b/code/core/src/main/java/org/apache/tamaya/core/internal/PropertyConverterManager.java
@@ -273,6 +273,19 @@ public class PropertyConverterManager {
 converterList.addAll(converters);
 }
 }
+// check for parametrized types, ignoring param type
+// direct mapped converters
+if(targetType.getType()!=null) {
+try {
+readLock.lock();
+converters = 
List.class.cast(this.converters.get(TypeLiteral.of(targetType.getRawType(;
+} finally {
+readLock.unlock();
+}
+if (converters != null) {
+converterList.addAll(converters);
+}
+}
 return converterList;
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/609b4764/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java
--
diff --git 
a/sandbox/collections/src/main/java/org/apache/tamaya/collections/internal/AdaptiveCombinationPolicy.java

[1/2] incubator-tamaya git commit: Minor issues fixed.

2016-02-14 Thread anatole 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master a9c15f82d -> 609b47648


Minor issues fixed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/30ad1309
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/30ad1309
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/30ad1309

Branch: refs/heads/master
Commit: 30ad1309d3355983523cb38aaeea2ec722fe1a69
Parents: a9c15f8
Author: anatole 
Authored: Mon Feb 15 01:46:39 2016 +0100
Committer: anatole 
Committed: Mon Feb 15 01:46:39 2016 +0100

--
 .../main/java/org/apache/tamaya/format/ConfigurationFormats.java | 2 +-
 .../java/org/apache/tamaya/optional/OptionalConfiguration.java   | 4 +++-
 .../java/org/apache/tamaya/server/ConfigurationResource.java | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/30ad1309/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
--
diff --git 
a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
 
b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
index df9aa84..bc8aabd 100644
--- 
a/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
+++ 
b/modules/formats/src/main/java/org/apache/tamaya/format/ConfigurationFormats.java
@@ -167,7 +167,7 @@ public final class ConfigurationFormats {
   
ConfigurationFormat... formats) throws IOException {
 Objects.requireNonNull(inputStream);
 Objects.requireNonNull(resource);
-try (InputStreamFactory isFactory = new 
InputStreamFactory(inputStream)) {
+try(InputStreamFactory isFactory = new 
InputStreamFactory(inputStream)) {
 for (final ConfigurationFormat format : formats) {
 try (InputStream is = isFactory.createInputStream()) {
 final ConfigurationData data = 
format.readConfiguration(resource, is);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/30ad1309/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
--
diff --git 
a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
 
b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
index 4868bc1..fe5c15d 100644
--- 
a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
+++ 
b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
@@ -105,6 +105,8 @@ public final class OptionalConfiguration {
 
 /**
  * Returns an instance of OptionalConfiguration, which uses the given 
provider and policy for evaluating the values.
+ * @param policy the policy how a value should be evaluated depending if 
Tamaya is available or not.
+ * @param provider the non Tamaya-based provider to be used to evaluate 
values.
  *
  * @param policy   the policy how a value should be evaluated depending if 
Tamaya is available or not.
  * @param provider the non Tamaya-based provider to be used to evaluate 
values.
@@ -117,7 +119,7 @@ public final class OptionalConfiguration {
 /**
  * Returns a default instance, which uses a default provider returning 
values from system properties and environment
  * only.
- *
+ * @param policy the policy how a value should be evaluated depending if 
Tamaya is available or not.
  * @param policy the policy how a value should be evaluated depending if 
Tamaya is available or not.
  * @return a default OptionalConfiguration instance, never null.
  */

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/30ad1309/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
--
diff --git 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
index f239e5c..0dc99f2 100644
--- 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
+++ 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
@@ -189,7 +189,10 @@ public class ConfigurationResource {
  * 
  *
  * @param key   name of the key to show
+ * @param key name of the key to show
  * @param value configuration value for the given key
+ * @param ttl time to live
+ * @return written configuration value.

incubator-tamaya git commit: Update Hamcrest (1.3 -> 2.0.0.0)

2016-02-14 Thread plexus 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master ea94e011a -> 0148fda48


Update Hamcrest (1.3 -> 2.0.0.0)


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/0148fda4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/0148fda4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/0148fda4

Branch: refs/heads/master
Commit: 0148fda485e27ccebc5830d395a2fabb28944707
Parents: ea94e01
Author: Oliver B. Fischer 
Authored: Sun Feb 14 21:12:56 2016 +0100
Committer: Oliver B. Fischer 
Committed: Sun Feb 14 21:12:56 2016 +0100

--
 code/core/pom.xml  |  6 +-
 modules/builder/pom.xml|  9 ++---
 modules/integration/camel/pom.xml  |  7 +--
 modules/integration/cdi-se/pom.xml |  7 +--
 modules/integration/cdi/pom.xml|  7 +--
 modules/integration/etcd/pom.xml   |  7 +--
 modules/integration/spring/pom.xml |  7 +--
 modules/json/pom.xml   |  6 +-
 modules/server/pom.xml | 10 +-
 pom.xml| 11 ++-
 sandbox/jodatime/pom.xml   |  4 ++--
 sandbox/ui/jsf/pom.xml |  7 +--
 12 files changed, 15 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/code/core/pom.xml
--
diff --git a/code/core/pom.xml b/code/core/pom.xml
index 4a496db..c93a72d 100644
--- a/code/core/pom.xml
+++ b/code/core/pom.xml
@@ -46,11 +46,7 @@ under the License.
 
 
 org.hamcrest
-hamcrest-library
-
-
-org.hamcrest
-hamcrest-core
+java-hamcrest
 
 
 org.osgi

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/builder/pom.xml
--
diff --git a/modules/builder/pom.xml b/modules/builder/pom.xml
index c7da3f8..32dc6b5 100644
--- a/modules/builder/pom.xml
+++ b/modules/builder/pom.xml
@@ -66,14 +66,9 @@ under the License.
 test
 
 
-
-
-org.hamcrest
-hamcrest-library
-
 
 org.hamcrest
-hamcrest-core
+java-hamcrest
 
 
 
@@ -106,4 +101,4 @@ under the License.
 
 
 
-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/camel/pom.xml
--
diff --git a/modules/integration/camel/pom.xml 
b/modules/integration/camel/pom.xml
index c1968d2..a57e0e9 100644
--- a/modules/integration/camel/pom.xml
+++ b/modules/integration/camel/pom.xml
@@ -70,12 +70,7 @@ under the License.
 
 
 org.hamcrest
-hamcrest-library
-test
-
-
-org.hamcrest
-hamcrest-core
+java-hamcrest
 test
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/cdi-se/pom.xml
--
diff --git a/modules/integration/cdi-se/pom.xml 
b/modules/integration/cdi-se/pom.xml
index cd80e97..231e619 100644
--- a/modules/integration/cdi-se/pom.xml
+++ b/modules/integration/cdi-se/pom.xml
@@ -80,12 +80,7 @@ under the License.
 
 
 org.hamcrest
-hamcrest-library
-test
-
-
-org.hamcrest
-hamcrest-core
+java-hamcrest
 test
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/cdi/pom.xml
--
diff --git a/modules/integration/cdi/pom.xml b/modules/integration/cdi/pom.xml
index 0ec0d39..147ac9d 100644
--- a/modules/integration/cdi/pom.xml
+++ b/modules/integration/cdi/pom.xml
@@ -84,12 +84,7 @@ under the License.
 
 
 org.hamcrest
-hamcrest-library
-test
-
-
-org.hamcrest
-hamcrest-core
+java-hamcrest
 test
 
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/0148fda4/modules/integration/etcd/pom.xml
--
diff --git a/modules/integration/etcd/pom.xml b/modules/integration/etcd/pom.xml
index 041d98e..c4bf750 100644
--- a/modules/integration/etcd/pom.xml
+++ b/modules/integration/etcd/pom.xml
@@ -70,12 +70,7 @@ under the License.

[3/3] incubator-tamaya git commit: Minor typo in config resource.

2016-02-14 Thread johndament 
Minor typo in config resource.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/c8ff387e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/c8ff387e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/c8ff387e

Branch: refs/heads/master
Commit: c8ff387e2a8b2db172afcdcc24bee7fa031691e3
Parents: 675e377
Author: John D. Ament 
Authored: Sun Feb 14 15:15:42 2016 -0500
Committer: John D. Ament 
Committed: Sun Feb 14 15:15:42 2016 -0500

--
 .../main/java/org/apache/tamaya/server/ConfigurationResource.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c8ff387e/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
--
diff --git 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
index 593a119..0a279fb 100644
--- 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
+++ 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
@@ -45,7 +45,7 @@ import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.functions.ConfigurationFunctions;
 
 /**
- * Configuration resource with a etcd compatible REST API
+ * Configuration resource with an etcd compatible REST API
  * (excluding the blocking API calls).
  */
 @Path("/")

[1/3] incubator-tamaya git commit: TAMAYA-142 etcd module - export proper package name and depend on httpclient's OSGi version.

2016-02-14 Thread johndament 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 0148fda48 -> c8ff387e2


TAMAYA-142 etcd module - export proper package name and depend on httpclient's 
OSGi version.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/675e377b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/675e377b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/675e377b

Branch: refs/heads/master
Commit: 675e377b38e05fbaafebb3e8deb4c8ceb2c4efcb
Parents: 0adb68e
Author: John D. Ament 
Authored: Sun Feb 14 15:14:29 2016 -0500
Committer: John D. Ament 
Committed: Sun Feb 14 15:14:44 2016 -0500

--
 modules/integration/etcd/pom.xml | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/675e377b/modules/integration/etcd/pom.xml
--
diff --git a/modules/integration/etcd/pom.xml b/modules/integration/etcd/pom.xml
index c4bf750..d1d35d3 100644
--- a/modules/integration/etcd/pom.xml
+++ b/modules/integration/etcd/pom.xml
@@ -30,10 +30,6 @@ under the License.
 Apache Tamaya Integration - etcd
 bundle
 
-
-2.16.0
-
-
 
 
 
@@ -55,7 +51,7 @@ under the License.
 
 
 
-org.apache.tamaya.integration.camel
+org.apache.tamaya.etcd
 
 
 
@@ -92,7 +88,7 @@ under the License.
 
 
 org.apache.httpcomponents
-httpclient
+httpclient-osgi
 4.5.1

incubator-tamaya git commit: TAMAYA-139 Renamed properties file with version information.

2016-02-14 Thread plexus 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master c8ff387e2 -> a147301bb


TAMAYA-139 Renamed properties file with version information.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/a147301b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/a147301b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/a147301b

Branch: refs/heads/master
Commit: a147301bb55735ae01a02f0c9aa088b13e6e287a
Parents: c8ff387
Author: Oliver B. Fischer 
Authored: Sun Feb 14 21:43:13 2016 +0100
Committer: Oliver B. Fischer 
Committed: Sun Feb 14 21:43:43 2016 +0100

--
 .../tamaya/server/ConfigurationResource.java|  1 -
 .../apache/tamaya/server/VersionProperties.java |  2 +-
 .../META-INF/server-version.properties  | 22 
 .../META-INF/tamaya-server-version.properties   | 22 
 .../main/resources/server-version.properties| 22 
 .../tamaya/server/VersionPropertiesTest.java|  2 +-
 6 files changed, 24 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
--
diff --git 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
index 0a279fb..f239e5c 100644
--- 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
+++ 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
@@ -64,7 +64,6 @@ public class ConfigurationResource {
 @Path("/version")
 @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN})
 public String version() {
-// TODO TAMAYA-139: make version string dynamically calculated based 
on mvn settings
 String product = VersionProperties.getProduct().replace("\"", "\\\"");
 String version = VersionProperties.getVersion().replace("\"", "\\\"");
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
--
diff --git 
a/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java 
b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
index 1e04e8b..e6136fb 100644
--- 
a/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
+++ 
b/modules/server/src/main/java/org/apache/tamaya/server/VersionProperties.java
@@ -30,7 +30,7 @@ import java.util.Properties;
  * {@value #VERSION_PROPERTY_FILE}.
  */
 public class VersionProperties {
-private static final String VERSION_PROPERTY_FILE = 
"/META-INF/server-version.properties";
+private static final String VERSION_PROPERTY_FILE = 
"/META-INF/tamaya-server-version.properties";
 
 static {
 try (InputStream resource = 
VersionProperties.class.getResourceAsStream(VERSION_PROPERTY_FILE)) {

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/resources/META-INF/server-version.properties
--
diff --git 
a/modules/server/src/main/resources/META-INF/server-version.properties 
b/modules/server/src/main/resources/META-INF/server-version.properties
deleted file mode 100644
index ef0ca70..000
--- a/modules/server/src/main/resources/META-INF/server-version.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy 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.
-#
-
-server.product=Apache Tamaya
-server.version=${project.version}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a147301b/modules/server/src/main/resources/META-INF/tamaya-server-version.properties

incubator-tamaya git commit: It's resource and not based on SpringBoot.

2016-02-14 Thread plexus 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 5701c27e7 -> ea94e011a


It's resource and not based on SpringBoot.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/ea94e011
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/ea94e011
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/ea94e011

Branch: refs/heads/master
Commit: ea94e011a7093c59f0187a272fe666db3cbf5ab6
Parents: 5701c27
Author: Oliver B. Fischer 
Authored: Sun Feb 14 20:47:24 2016 +0100
Committer: Oliver B. Fischer 
Committed: Sun Feb 14 20:47:24 2016 +0100

--
 .../main/java/org/apache/tamaya/server/ConfigurationResource.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/ea94e011/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
--
diff --git 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
index f38184e..593a119 100644
--- 
a/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
+++ 
b/modules/server/src/main/java/org/apache/tamaya/server/ConfigurationResource.java
@@ -45,7 +45,7 @@ import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.functions.ConfigurationFunctions;
 
 /**
- * Spring boot based configuration service that is compatible with etcd REST 
API
+ * Configuration resource with a etcd compatible REST API
  * (excluding the blocking API calls).
  */
 @Path("/")

[1/2] incubator-tamaya git commit: TAMAYA-134 Patch from Philipp Ottlinger to fix a number of javadocs.

2016-02-14 Thread johndament 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 9fd1cee1f -> 5701c27e7


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5701c27e/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
--
diff --git 
a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
 
b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
index 8cc5d4f..4868bc1 100644
--- 
a/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
+++ 
b/modules/optional/src/main/java/org/apache/tamaya/optional/OptionalConfiguration.java
@@ -19,12 +19,12 @@
 package org.apache.tamaya.optional;
 
 
-import org.apache.tamaya.ConfigurationProvider;
-
 import java.util.Objects;
 
+import org.apache.tamaya.ConfigurationProvider;
+
 /**
- * Simplified configuration API, that can be used by code that only want 
Tamaya to optionally enhance its configuration
+ * Simplified configuration API, that can be used by code that only wants 
Tamaya to optionally enhance its configuration
  * mechanism, but by default uses its own configuration by default.
  */
 public final class OptionalConfiguration {
@@ -48,7 +48,7 @@ public final class OptionalConfiguration {
 try {
 Class.forName(TAMAYA_CONFIGURATION);
 return true;
-} catch (Exception e) {
+} catch (final Exception e) {
 return false;
 }
 }
@@ -58,6 +58,7 @@ public final class OptionalConfiguration {
  * In all other cases {@code null} is returned.
  */
 public static final ValueProvider DEFAULT_PROVIDER = new ValueProvider() {
+@SuppressWarnings("unchecked")
 @Override
 public  T get(String key, Class type) {
 if (String.class == type) {
@@ -93,7 +94,8 @@ public final class OptionalConfiguration {
 
 /**
  * Creates a new instance.
- * @param policy the policy how a value should be evaluated depending ig 
Tamaya is availalbe or not.
+ *
+ * @param policy   the policy how a value should be evaluated depending if 
Tamaya is available or not.
  * @param provider the non Tamaya-based provider to be used to evaluate 
values.
  */
 private OptionalConfiguration(EvaluationPolicy policy, ValueProvider 
provider) {
@@ -104,6 +106,8 @@ public final class OptionalConfiguration {
 /**
  * Returns an instance of OptionalConfiguration, which uses the given 
provider and policy for evaluating the values.
  *
+ * @param policy   the policy how a value should be evaluated depending if 
Tamaya is available or not.
+ * @param provider the non Tamaya-based provider to be used to evaluate 
values.
  * @return a default OptionalConfiguration instance, never null.
  */
 public static OptionalConfiguration of(EvaluationPolicy policy, 
ValueProvider provider) {
@@ -114,6 +118,7 @@ public final class OptionalConfiguration {
  * Returns a default instance, which uses a default provider returning 
values from system properties and environment
  * only.
  *
+ * @param policy the policy how a value should be evaluated depending if 
Tamaya is available or not.
  * @return a default OptionalConfiguration instance, never null.
  */
 public static OptionalConfiguration of(EvaluationPolicy policy) {
@@ -133,13 +138,13 @@ public final class OptionalConfiguration {
 /**
  * Access a String value.
  *
- * @param key the key, not null.
+ * @param key  the key, not null.
  * @param defaultValue the default value, returned if no such key is found 
in the configuration.
  * @return the value found, or null.
  */
 public String getOrDefault(String key, String defaultValue) {
-String value = get(key, String.class);
-if(value==null){
+final String value = get(key, String.class);
+if (value == null) {
 return defaultValue;
 }
 return value;
@@ -155,8 +160,8 @@ public final class OptionalConfiguration {
  * @return the value, or null.
  */
 public  T get(String key, Class type) {
-T value = provider.get(key, type);
-T tamayaValue = getTamaya(key, type);
+final T value = provider.get(key, type);
+final T tamayaValue = getTamaya(key, type);
 switch (policy) {
 case OTHER_OVERRIDES_TAMAYA:
 return value != null ? value : tamayaValue;
@@ -178,15 +183,15 @@ public final class OptionalConfiguration {
 /**
  * Access a String value.
  *
- * @param key the key, not null.
- * @param type the target type, not null.
- * @param   the type param.
+ * @param key  the key, not null.
+ * @param type the target type, not null.
+ * @param   the type param.
  * @param defaultValue the default value,