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 2015/08/28 18:16:58 UTC
[1/3] incubator-tamaya git commit: Updated snapshot version.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 0c97691b9 -> a0fa25c75
Updated snapshot 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/914b5f0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/914b5f0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/914b5f0e
Branch: refs/heads/master
Commit: 914b5f0e047b148bb0cd0a10517ad6bb0e09d911
Parents: 0c97691
Author: anatole <an...@apache.org>
Authored: Fri Aug 28 18:12:04 2015 +0200
Committer: anatole <an...@apache.org>
Committed: Fri Aug 28 18:12:04 2015 +0200
----------------------------------------------------------------------
buildconfigurations/pom.xml | 2 +-
distribution/pom.xml | 2 +-
docs/pom.xml | 2 +-
examples/1-minimal-example/pom.xml | 4 ++--
examples/2-simple-propertysource-example/pom.xml | 4 ++--
examples/3-resources-example/pom.xml | 6 +++---
examples/4-resolver-example/pom.xml | 6 +++---
examples/5-injection-example/pom.xml | 6 +++---
examples/6-fileobserver-example/pom.xml | 6 +++---
examples/7-builder-example/pom.xml | 8 ++++----
examples/pom.xml | 2 +-
java7/api/pom.xml | 2 +-
java7/core/pom.xml | 2 +-
java7/pom.xml | 2 +-
java8/api/pom.xml | 2 +-
java8/core/pom.xml | 2 +-
java8/pom.xml | 2 +-
modules/builder/pom.xml | 2 +-
modules/events/pom.xml | 2 +-
modules/formats/pom.xml | 2 +-
modules/functions/pom.xml | 2 +-
modules/injection/pom.xml | 4 ++--
modules/json/pom.xml | 2 +-
modules/management/pom.xml | 6 +++---
modules/model/pom.xml | 10 +++++-----
modules/pom.xml | 2 +-
modules/resolver/pom.xml | 2 +-
modules/resources/pom.xml | 2 +-
pom.xml | 2 +-
sandbox/environment/pom.xml | 2 +-
sandbox/integration/cdi/pom.xml | 2 +-
sandbox/integration/commons/pom.xml | 2 +-
sandbox/integration/pom.xml | 2 +-
sandbox/jodatime/pom.xml | 2 +-
sandbox/metamodels/pom.xml | 2 +-
sandbox/metamodels/simple/pom.xml | 2 +-
sandbox/pom.xml | 2 +-
sandbox/remote/pom.xml | 2 +-
sandbox/server/pom.xml | 2 +-
sandbox/sysprops/pom.xml | 2 +-
40 files changed, 60 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/buildconfigurations/pom.xml
----------------------------------------------------------------------
diff --git a/buildconfigurations/pom.xml b/buildconfigurations/pom.xml
index 8d620e0..3107556 100644
--- a/buildconfigurations/pom.xml
+++ b/buildconfigurations/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>buildconfigurations</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 850d98c..1e2fae7 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-distribution</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 00d5a2d..b3e5957 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/examples/1-minimal-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/1-minimal-example/pom.xml b/examples/1-minimal-example/pom.xml
index 0553ccd..f4f631d 100644
--- a/examples/1-minimal-example/pom.xml
+++ b/examples/1-minimal-example/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-examples</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-example-minimal</artifactId>
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/examples/2-simple-propertysource-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/2-simple-propertysource-example/pom.xml b/examples/2-simple-propertysource-example/pom.xml
index 0b670df..d139869 100644
--- a/examples/2-simple-propertysource-example/pom.xml
+++ b/examples/2-simple-propertysource-example/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-examples</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-example-simple-propertysource</artifactId>
@@ -34,7 +34,7 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/examples/3-resources-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/3-resources-example/pom.xml b/examples/3-resources-example/pom.xml
index 9cc0d41..80625a1 100644
--- a/examples/3-resources-example/pom.xml
+++ b/examples/3-resources-example/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-examples</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-example-resources</artifactId>
@@ -35,12 +35,12 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-resources</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/examples/4-resolver-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/4-resolver-example/pom.xml b/examples/4-resolver-example/pom.xml
index 315fe31..e724219 100644
--- a/examples/4-resolver-example/pom.xml
+++ b/examples/4-resolver-example/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-examples</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-example-resolver</artifactId>
@@ -34,12 +34,12 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-resolver</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/examples/5-injection-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/5-injection-example/pom.xml b/examples/5-injection-example/pom.xml
index a72821d..94df7f5 100644
--- a/examples/5-injection-example/pom.xml
+++ b/examples/5-injection-example/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-examples</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-example-injection</artifactId>
@@ -35,12 +35,12 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-injection</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/examples/6-fileobserver-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/pom.xml b/examples/6-fileobserver-example/pom.xml
index 2e6f474..bd805fe 100644
--- a/examples/6-fileobserver-example/pom.xml
+++ b/examples/6-fileobserver-example/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-examples</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-example-fileobserver</artifactId>
@@ -36,12 +36,12 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java7-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-events</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/examples/7-builder-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/7-builder-example/pom.xml b/examples/7-builder-example/pom.xml
index d590d0a..ca2d58a 100644
--- a/examples/7-builder-example/pom.xml
+++ b/examples/7-builder-example/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-examples</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-example-builder</artifactId>
@@ -35,17 +35,17 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-builder</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-events</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index acc4347..c1fb5e1 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/java7/api/pom.xml
----------------------------------------------------------------------
diff --git a/java7/api/pom.xml b/java7/api/pom.xml
index 41fc980..2defbd2 100644
--- a/java7/api/pom.xml
+++ b/java7/api/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java7</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/java7/core/pom.xml
----------------------------------------------------------------------
diff --git a/java7/core/pom.xml b/java7/core/pom.xml
index b10dc43..9ad702b 100644
--- a/java7/core/pom.xml
+++ b/java7/core/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java7</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/java7/pom.xml
----------------------------------------------------------------------
diff --git a/java7/pom.xml b/java7/pom.xml
index 35e620c..8814624 100644
--- a/java7/pom.xml
+++ b/java7/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/java8/api/pom.xml
----------------------------------------------------------------------
diff --git a/java8/api/pom.xml b/java8/api/pom.xml
index 4382d1b..0d4e8a5 100644
--- a/java8/api/pom.xml
+++ b/java8/api/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java8</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/java8/core/pom.xml
----------------------------------------------------------------------
diff --git a/java8/core/pom.xml b/java8/core/pom.xml
index 89acc4b..5e88203 100644
--- a/java8/core/pom.xml
+++ b/java8/core/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java8</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/java8/pom.xml
----------------------------------------------------------------------
diff --git a/java8/pom.xml b/java8/pom.xml
index 8666013..e27f07d 100644
--- a/java8/pom.xml
+++ b/java8/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/builder/pom.xml
----------------------------------------------------------------------
diff --git a/modules/builder/pom.xml b/modules/builder/pom.xml
index 54d1ba0..5912c2c 100644
--- a/modules/builder/pom.xml
+++ b/modules/builder/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-builder</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/events/pom.xml
----------------------------------------------------------------------
diff --git a/modules/events/pom.xml b/modules/events/pom.xml
index dc76200..74c9b22 100644
--- a/modules/events/pom.xml
+++ b/modules/events/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-events</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/formats/pom.xml
----------------------------------------------------------------------
diff --git a/modules/formats/pom.xml b/modules/formats/pom.xml
index b88f247..ff87a28 100644
--- a/modules/formats/pom.xml
+++ b/modules/formats/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-formats</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/functions/pom.xml
----------------------------------------------------------------------
diff --git a/modules/functions/pom.xml b/modules/functions/pom.xml
index 631b2c9..2037150 100644
--- a/modules/functions/pom.xml
+++ b/modules/functions/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/injection/pom.xml
----------------------------------------------------------------------
diff --git a/modules/injection/pom.xml b/modules/injection/pom.xml
index 9857727..fe2519e 100644
--- a/modules/injection/pom.xml
+++ b/modules/injection/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-injection</artifactId>
@@ -61,7 +61,7 @@ under the License.
<dependency>
<groupId>org.apache.tamaya.ext.model</groupId>
<artifactId>tamaya-model</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/json/pom.xml
----------------------------------------------------------------------
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index c79f389..1ed1874 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<artifactId>tamaya-extensions</artifactId>
<groupId>org.apache.tamaya.ext</groupId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-json</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/management/pom.xml
----------------------------------------------------------------------
diff --git a/modules/management/pom.xml b/modules/management/pom.xml
index ba11a28..a374e75 100644
--- a/modules/management/pom.xml
+++ b/modules/management/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -44,12 +44,12 @@ under the License.
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-functions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java7-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/model/pom.xml
----------------------------------------------------------------------
diff --git a/modules/model/pom.xml b/modules/model/pom.xml
index c30e97d..25295c8 100644
--- a/modules/model/pom.xml
+++ b/modules/model/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -43,25 +43,25 @@ under the License.
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java7-api</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java7-core</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<scope>Test</scope>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-formats</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-json</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/pom.xml
----------------------------------------------------------------------
diff --git a/modules/pom.xml b/modules/pom.xml
index 638fc88..08863c3 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/resolver/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resolver/pom.xml b/modules/resolver/pom.xml
index 5ac0e92..ca70eb3 100644
--- a/modules/resolver/pom.xml
+++ b/modules/resolver/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-resolver</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/modules/resources/pom.xml
----------------------------------------------------------------------
diff --git a/modules/resources/pom.xml b/modules/resources/pom.xml
index 2256e40..9aabef0 100644
--- a/modules/resources/pom.xml
+++ b/modules/resources/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-extensions</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-resources</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e627843..a31b72c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
</parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Tamaya</name>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/environment/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/environment/pom.xml b/sandbox/environment/pom.xml
index 666140d..bd5ab5c 100644
--- a/sandbox/environment/pom.xml
+++ b/sandbox/environment/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-sandbox</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/cdi/pom.xml b/sandbox/integration/cdi/pom.xml
index fcecae3..8a1485b 100644
--- a/sandbox/integration/cdi/pom.xml
+++ b/sandbox/integration/cdi/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-integrations</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-cdi</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/integration/commons/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/commons/pom.xml b/sandbox/integration/commons/pom.xml
index c2be1fe..d3d1b85 100644
--- a/sandbox/integration/commons/pom.xml
+++ b/sandbox/integration/commons/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-integrations</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>commons</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/integration/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/integration/pom.xml b/sandbox/integration/pom.xml
index 3ffb277..3d50784 100644
--- a/sandbox/integration/pom.xml
+++ b/sandbox/integration/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-sandbox</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/jodatime/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/jodatime/pom.xml b/sandbox/jodatime/pom.xml
index 08448ab..268939f 100644
--- a/sandbox/jodatime/pom.xml
+++ b/sandbox/jodatime/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-sandbox</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/metamodels/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/pom.xml b/sandbox/metamodels/pom.xml
index 9843d37..fcc37ae 100644
--- a/sandbox/metamodels/pom.xml
+++ b/sandbox/metamodels/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-sandbox</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/metamodels/simple/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/pom.xml b/sandbox/metamodels/simple/pom.xml
index 14ee897..a5c0a62 100644
--- a/sandbox/metamodels/simple/pom.xml
+++ b/sandbox/metamodels/simple/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext.metamodels</groupId>
<artifactId>tamaya-metamodels</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-metamodels-simple</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index d503a50..9012c97 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-all</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<artifactId>tamaya-sandbox</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/remote/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/remote/pom.xml b/sandbox/remote/pom.xml
index 3953ccf..ebc09be 100644
--- a/sandbox/remote/pom.xml
+++ b/sandbox/remote/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-sandbox</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/server/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/server/pom.xml b/sandbox/server/pom.xml
index cdd2a24..4ae4ea1 100644
--- a/sandbox/server/pom.xml
+++ b/sandbox/server/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-sandbox</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/914b5f0e/sandbox/sysprops/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/sysprops/pom.xml b/sandbox/sysprops/pom.xml
index dc80e43..fba1d69 100644
--- a/sandbox/sysprops/pom.xml
+++ b/sandbox/sysprops/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.tamaya.ext</groupId>
<artifactId>tamaya-sandbox</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>tamaya-sysprops</artifactId>
[3/3] incubator-tamaya git commit: Added filter for extracting data
section as delivered by the tamaya-server module.
Posted by an...@apache.org.
Added filter for extracting data section as delivered by the tamaya-server module.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/a0fa25c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/a0fa25c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/a0fa25c7
Branch: refs/heads/master
Commit: a0fa25c755dfb041eb96ab320ced8e7b48b54df4
Parents: 80c8fa6
Author: anatole <an...@apache.org>
Authored: Fri Aug 28 18:16:12 2015 +0200
Committer: anatole <an...@apache.org>
Committed: Fri Aug 28 18:16:12 2015 +0200
----------------------------------------------------------------------
.../apache/tamaya/jodatime/PeriodConverter.java | 2 --
.../tamaya/jodatime/DateTimeConverterIT.java | 2 +-
.../jodatime/DateTimeZoneConverterIT.java | 2 +-
.../org/apache/tamaya/jodatime/FullStackIT.java | 3 ---
.../ConfigDirPropertySourceProvider.java | 1 -
.../MetainfConfigPropertySourceProvider.java | 1 -
.../tamaya/remote/BaseRemotePropertySource.java | 23 ++++++++++++++++----
7 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a0fa25c7/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/PeriodConverter.java
----------------------------------------------------------------------
diff --git a/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/PeriodConverter.java b/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/PeriodConverter.java
index 6950606..f6ad67b 100644
--- a/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/PeriodConverter.java
+++ b/sandbox/jodatime/src/main/java/org/apache/tamaya/jodatime/PeriodConverter.java
@@ -21,13 +21,11 @@ package org.apache.tamaya.jodatime;
import org.apache.tamaya.spi.PropertyConverter;
import org.joda.time.MutablePeriod;
import org.joda.time.Period;
-import org.joda.time.ReadWritablePeriod;
import org.joda.time.format.ISOPeriodFormat;
import org.joda.time.format.PeriodParser;
import java.util.Locale;
import java.util.Objects;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a0fa25c7/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java
----------------------------------------------------------------------
diff --git a/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java b/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java
index 4681449..2c4130e 100644
--- a/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java
+++ b/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeConverterIT.java
@@ -35,7 +35,7 @@ public class DateTimeConverterIT {
List<PropertyConverter> formats = ServiceContext.getInstance()
.getServices(PropertyConverter.class);
- PropertyConverter converter = formats.stream()
+ PropertyConverter<?> converter = formats.stream()
.filter(s -> s instanceof DateTimeConverter)
.findFirst().get();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a0fa25c7/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java
----------------------------------------------------------------------
diff --git a/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java b/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java
index eef0ecc..a72d84e 100644
--- a/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java
+++ b/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/DateTimeZoneConverterIT.java
@@ -35,7 +35,7 @@ public class DateTimeZoneConverterIT {
List<PropertyConverter> formats = ServiceContext.getInstance()
.getServices(PropertyConverter.class);
- PropertyConverter converter = formats.stream()
+ PropertyConverter<?> converter = formats.stream()
.filter(s -> s instanceof DateTimeZoneConverter)
.findFirst().get();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a0fa25c7/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java
----------------------------------------------------------------------
diff --git a/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java b/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java
index fcba5d6..e6c3a9c 100644
--- a/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java
+++ b/sandbox/jodatime/src/test/java/org/apache/tamaya/jodatime/FullStackIT.java
@@ -18,18 +18,15 @@
*/
package org.apache.tamaya.jodatime;
-import jdk.nashorn.internal.runtime.regexp.joni.Config;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;
-import org.joda.time.format.ISODateTimeFormat;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.joda.time.format.ISODateTimeFormat.basicDateTime;
import static org.joda.time.format.ISODateTimeFormat.dateTime;
public class FullStackIT {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a0fa25c7/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java b/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java
index 83784a8..e3c9cbf 100644
--- a/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java
+++ b/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/ConfigDirPropertySourceProvider.java
@@ -27,7 +27,6 @@ import org.apache.tamaya.spi.PropertySource;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a0fa25c7/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java b/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java
index 55f27f9..0edbbc7 100644
--- a/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java
+++ b/sandbox/metamodels/simple/src/main/java/org/apache/tamaya/metamodel/simple/internal/MetainfConfigPropertySourceProvider.java
@@ -27,7 +27,6 @@ import org.apache.tamaya.spi.PropertySource;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/a0fa25c7/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
----------------------------------------------------------------------
diff --git a/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java b/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
index 7cd4572..fd1bd7c 100644
--- a/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
+++ b/sandbox/remote/src/main/java/org/apache/tamaya/remote/BaseRemotePropertySource.java
@@ -60,16 +60,31 @@ public abstract class BaseRemotePropertySource implements PropertySource{
* stay untouched.
*/
public void reload(){
- Map newProperties;
+ Map readProperties;
ConfigurationFormat format = getConfigurationFormat();
for(URL url:getAccessURLs()) {
try(InputStream is = url.openStream()) {
ConfigurationData data = format.readConfiguration(url.toExternalForm(), is);
if(data!=null){
- newProperties = data.getDefaultSection();
- if(newProperties!=null){
+ readProperties = data.getDefaultSection();
+ if(readProperties!=null){
+ Map<String,String> newProperties = new HashMap<>();
+ for(Map.Entry<String,String> en:readProperties.entrySet()){
+ // filter data entries
+ if(en.getKey().startsWith("data.")) {
+ newProperties.put(en.getKey().substring(5), en.getValue());
+ }
+ }
+ // the configs served by the tamaya server module has a 'data' root section containing the
+ // config entries. if not present, we assume an alternate format, which is sued as is...
+ if(newProperties.isEmpty()){
+ Logger.getLogger(getClass().getName()).info(
+ "Loaded remote config from: " + url + ", does not have a data section, using as is...");
+ newProperties = readProperties;
+ }
this.properties = newProperties;
- Logger.getLogger(getClass().getName()).info("Reloaded remote config from: " + url);
+ Logger.getLogger(getClass().getName()).info(
+ "Reloaded remote config from: " + url + ", entriea read: " + this.properties.size());
}
}
}
[2/3] incubator-tamaya git commit: Applied compiler patches done
during Hackergarten...
Posted by an...@apache.org.
Applied compiler patches done during Hackergarten...
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/80c8fa65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/80c8fa65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/80c8fa65
Branch: refs/heads/master
Commit: 80c8fa65f3497b07667208fc1ee8ebef4d4e0127
Parents: 914b5f0
Author: anatole <an...@apache.org>
Authored: Fri Aug 28 18:13:06 2015 +0200
Committer: anatole <an...@apache.org>
Committed: Fri Aug 28 18:13:06 2015 +0200
----------------------------------------------------------------------
.../fileobserver/ObservedConfigExampleTest.java | 9 ---------
.../examples/fileobserver/TestConfigView.java | 1 -
.../fileobserver/TestObservingProvider.java | 1 -
.../main/java/org/apache/tamaya/TypeLiteral.java | 19 +------------------
.../apache/tamaya/spi/ServiceContextTest.java | 13 ++++++++-----
.../apache/tamaya/spi/TestServiceContext.java | 10 +++++-----
.../internal/DefaultConfigurationProvider.java | 4 +---
.../core/internal/DefaultServiceContext.java | 6 +++---
.../propertysource/SystemPropertySource.java | 2 --
.../apache/tamaya/core/ConfigurationTest.java | 4 ----
.../converters/BooleanConverterTest.java | 8 +++++---
.../testdata/TestRemovingPropertyFilter.java | 1 -
.../main/java/org/apache/tamaya/TypeLiteral.java | 17 -----------------
.../org/apache/tamaya/ConfigExceptionTest.java | 9 +++++----
.../apache/tamaya/ConfigurationProviderTest.java | 5 +----
.../apache/tamaya/TestConfigurationProvider.java | 3 ---
.../java/org/apache/tamaya/TypeLiteralTest.java | 1 -
.../tamaya/spi/ServiceContextManagerTest.java | 1 -
.../apache/tamaya/spi/TestServiceContext.java | 8 ++++----
.../internal/DefaultConfigurationProvider.java | 4 +---
.../core/internal/DefaultServiceContext.java | 6 +++---
.../internal/converters/CharConverterTest.java | 13 +++++++------
.../tamaya/events/TestObservingProvider.java | 9 ---------
.../tamaya/format/InputStreamFactoryTest.java | 4 +---
.../tamaya/inject/internal/ConfiguredField.java | 5 -----
.../internal/DefaultConfigurationInjector.java | 8 ++++----
.../inject/internal/DefaultDynamicValue.java | 2 +-
.../org/apache/tamaya/json/JSONFormatIT.java | 2 --
.../apache/tamaya/management/ManagedConfig.java | 6 ------
.../org/apache/tamaya/model/ConfigValidator.java | 2 +-
.../model/spi/ConfigValidationsReader.java | 8 ++------
.../tamaya/model/spi/ParameterValidation.java | 6 +++---
.../AbstractPathPropertySourceProvider.java | 9 +++++----
.../resource/internal/ClasspathCollector.java | 4 ++--
.../internal/DefaultResourceResolverTest.java | 7 +++----
35 files changed, 66 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java
index 936d5ac..cc9408e 100644
--- a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java
+++ b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/ObservedConfigExampleTest.java
@@ -21,18 +21,14 @@ package org.aspache.tamaya.examples.fileobserver;
import org.apache.commons.io.FileUtils;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
-import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.Map;
-import java.util.TreeMap;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertNull;
@@ -137,9 +133,4 @@ public class ObservedConfigExampleTest {
assertThat(props.get("testValue2"), is("anotherValue"));
}
- private static String dump(Map<String, String> properties) {
- StringBuilder b = new StringBuilder();
- new TreeMap<>(properties).forEach((k,v)->b.append(" " + k + " = " + v + '\n'));
- return b.toString();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
index a0e5df3..0e483f2 100644
--- a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
+++ b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestConfigView.java
@@ -26,7 +26,6 @@ import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.spi.PropertyConverter;
-import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestObservingProvider.java
----------------------------------------------------------------------
diff --git a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestObservingProvider.java b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestObservingProvider.java
index 0588f13..a70d498 100644
--- a/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestObservingProvider.java
+++ b/examples/6-fileobserver-example/src/test/java/org/aspache/tamaya/examples/fileobserver/TestObservingProvider.java
@@ -22,7 +22,6 @@ import org.apache.tamaya.events.folderobserver.ObservingPropertySourceProvider;
import org.apache.tamaya.format.formats.PropertiesFormat;
import java.nio.file.Path;
-import java.nio.file.Paths;
/**
* Test configuration property source provider that observes a directory and updated the config if necessary.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
----------------------------------------------------------------------
diff --git a/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java b/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
index cb32bb8..be2d008 100644
--- a/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
+++ b/java7/api/src/main/java/org/apache/tamaya/TypeLiteral.java
@@ -71,23 +71,6 @@ public class TypeLiteral<T> implements Serializable {
}
/**
- * Evaluates the subclass of a TypeLiteral instance.
- *
- * @param clazz the typeliteral class (could be an anonymous class).
- * @return the subclass implemented by the TypeLiteral.
- */
- private static Class<?> getTypeLiteralSubclass(Class<?> clazz) {
- Class<?> superclass = clazz.getSuperclass();
- if (superclass.equals(TypeLiteral.class)) {
- return clazz;
- } else if (superclass.equals(Object.class)) {
- return null;
- } else {
- return (getTypeLiteralSubclass(superclass));
- }
- }
-
- /**
* Checks the current implemented generic interfaces and evaluates the given single type parameter.
*
* @param clazz the class to check, not null.
@@ -197,7 +180,7 @@ public class TypeLiteral<T> implements Serializable {
if (getClass() != obj.getClass()) {
return false;
}
- TypeLiteral other = (TypeLiteral) obj;
+ TypeLiteral<?> other = (TypeLiteral<?>) obj;
if (definedType == null) {
if (other.definedType != null) {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java
----------------------------------------------------------------------
diff --git a/java7/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java b/java7/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java
index 0269c4c..6c13731 100644
--- a/java7/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java
+++ b/java7/api/src/test/java/org/apache/tamaya/spi/ServiceContextTest.java
@@ -18,15 +18,18 @@
*/
package org.apache.tamaya.spi;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
public class ServiceContextTest {
@@ -52,7 +55,7 @@ public class ServiceContextTest {
list.add("ServiceContextTest");
return List.class.cast(list);
}
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
};
@@ -92,4 +95,4 @@ public class ServiceContextTest {
assertNotNull(ServiceContextManager.getServiceContext());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
----------------------------------------------------------------------
diff --git a/java7/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java b/java7/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
index 8790945..d28180f 100644
--- a/java7/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
+++ b/java7/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
@@ -33,9 +33,9 @@ import java.util.logging.Logger;
*/
public final class TestServiceContext implements ServiceContext {
/** List current services loaded, per class. */
- private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<Class<?>, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
- private final Map<Class, Object> singletons = new ConcurrentHashMap<>();
+ private final Map<Class<?>, Object> singletons = new ConcurrentHashMap<>();
@Override
public int ordinal() {
@@ -44,7 +44,7 @@ public final class TestServiceContext implements ServiceContext {
@Override
public <T> T getService(Class<T> serviceType) {
- T cached = (T) singletons.get(serviceType);
+ T cached = serviceType.cast(singletons.get(serviceType));
if(cached==null) {
List<? extends T> services = getServices(serviceType);
if (services.isEmpty()) {
@@ -82,8 +82,8 @@ public final class TestServiceContext implements ServiceContext {
} catch (Exception e) {
Logger.getLogger(TestServiceContext.class.getName()).log(Level.WARNING,
"Error loading services current type " + serviceType, e);
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
index 15e8d85..2dc15bd 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
@@ -54,10 +54,8 @@ public class DefaultConfigurationProvider implements ConfigurationProviderSpi {
@Override
public void setConfigurationContext(ConfigurationContext context){
- Configuration oldConfig = this.config;
- Configuration newConfig = new DefaultConfiguration(context);
// TODO think on a SPI or move event part into API...
- this.config = newConfig;
+ this.config = new DefaultConfiguration(context);
this.context = context;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
index 15bbcef..cda3c93 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
@@ -40,11 +40,11 @@ public final class DefaultServiceContext implements ServiceContext {
/**
* List current services loaded, per class.
*/
- private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<Class<?>, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
/**
* Singletons.
*/
- private final Map<Class, Object> singletons = new ConcurrentHashMap<>();
+ private final Map<Class<?>, Object> singletons = new ConcurrentHashMap<>();
@Override
public <T> T getService(Class<T> serviceType) {
@@ -60,7 +60,7 @@ public final class DefaultServiceContext implements ServiceContext {
singletons.put(serviceType, cached);
}
}
- return (T)cached;
+ return serviceType.cast(cached);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java
----------------------------------------------------------------------
diff --git a/java7/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java b/java7/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java
index f75e1eb..9093f25 100644
--- a/java7/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java
+++ b/java7/core/src/main/java/org/apache/tamaya/core/propertysource/SystemPropertySource.java
@@ -24,8 +24,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* This {@link org.apache.tamaya.spi.PropertySource} manages the system properties.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/java7/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java b/java7/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java
index f6012e7..98bb29c 100644
--- a/java7/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java
+++ b/java7/core/src/test/java/org/apache/tamaya/core/ConfigurationTest.java
@@ -20,9 +20,6 @@ package org.apache.tamaya.core;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
-import org.apache.tamaya.core.internal.DefaultConfiguration;
-import org.apache.tamaya.spi.ServiceContext;
-import org.apache.tamaya.spi.ServiceContextManager;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -30,7 +27,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java
----------------------------------------------------------------------
diff --git a/java7/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java b/java7/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java
index a1ac83c..c3b3f96 100644
--- a/java7/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java
+++ b/java7/core/src/test/java/org/apache/tamaya/core/internal/converters/BooleanConverterTest.java
@@ -18,13 +18,15 @@
*/
package org.apache.tamaya.core.internal.converters;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-
/**
* Tests the default converter for bytes.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
----------------------------------------------------------------------
diff --git a/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java b/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
index 2cc0b9e..5a57ad1 100644
--- a/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
+++ b/java7/core/src/test/java/org/apache/tamaya/core/testdata/TestRemovingPropertyFilter.java
@@ -18,7 +18,6 @@
*/
package org.apache.tamaya.core.testdata;
-import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.spi.PropertyFilter;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java
----------------------------------------------------------------------
diff --git a/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java b/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java
index b34ed6b..5aa4f4c 100644
--- a/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java
+++ b/java8/api/src/main/java/org/apache/tamaya/TypeLiteral.java
@@ -71,23 +71,6 @@ public class TypeLiteral<T> implements Serializable {
}
/**
- * Evaluates the subclass of a TypeLiteral instance.
- *
- * @param clazz the typeliteral class (could be an anonymous class).
- * @return the subclass implemented by the TypeLiteral.
- */
- private static Class<?> getTypeLiteralSubclass(Class<?> clazz) {
- Class<?> superclass = clazz.getSuperclass();
- if (superclass.equals(TypeLiteral.class)) {
- return clazz;
- } else if (superclass.equals(Object.class)) {
- return null;
- } else {
- return (getTypeLiteralSubclass(superclass));
- }
- }
-
- /**
* Checks the current implemented generic interfaces and evaluates the given single type parameter.
*
* @param clazz the class to check, not null.
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
----------------------------------------------------------------------
diff --git a/java8/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java b/java8/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
index 2a7da00..e5898cf 100644
--- a/java8/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
+++ b/java8/api/src/test/java/org/apache/tamaya/ConfigExceptionTest.java
@@ -18,10 +18,11 @@
*/
package org.apache.tamaya;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
/**
* Tests instantiating {@link org.apache.tamaya.ConfigException}.
@@ -43,4 +44,4 @@ public class ConfigExceptionTest {
assertEquals("test", ex.getMessage());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/api/src/test/java/org/apache/tamaya/ConfigurationProviderTest.java
----------------------------------------------------------------------
diff --git a/java8/api/src/test/java/org/apache/tamaya/ConfigurationProviderTest.java b/java8/api/src/test/java/org/apache/tamaya/ConfigurationProviderTest.java
index 2247f2f..8870d22 100644
--- a/java8/api/src/test/java/org/apache/tamaya/ConfigurationProviderTest.java
+++ b/java8/api/src/test/java/org/apache/tamaya/ConfigurationProviderTest.java
@@ -18,12 +18,9 @@
*/
package org.apache.tamaya;
-import org.apache.tamaya.spi.ConfigurationContext;
-import org.apache.tamaya.spi.ConfigurationContextBuilder;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
/**
* Simple tests for the }@link ConfigurationProvider} singleton class.
@@ -63,4 +60,4 @@ public class ConfigurationProviderTest {
// assertTrue(builder.build().getPropertySources().isEmpty());
//
// }
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/java8/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java b/java8/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java
index c84af21..98820ca 100644
--- a/java8/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java
+++ b/java8/api/src/test/java/org/apache/tamaya/TestConfigurationProvider.java
@@ -22,9 +22,6 @@ import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConfigurationContextBuilder;
import org.apache.tamaya.spi.ConfigurationProviderSpi;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Test Configuration class, that is used to testdata the default methods provided by the API.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
----------------------------------------------------------------------
diff --git a/java8/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java b/java8/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
index 783d6bf..79f6257 100644
--- a/java8/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
+++ b/java8/api/src/test/java/org/apache/tamaya/TypeLiteralTest.java
@@ -20,7 +20,6 @@ package org.apache.tamaya;
import org.junit.Test;
-import javax.annotation.Priority;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/api/src/test/java/org/apache/tamaya/spi/ServiceContextManagerTest.java
----------------------------------------------------------------------
diff --git a/java8/api/src/test/java/org/apache/tamaya/spi/ServiceContextManagerTest.java b/java8/api/src/test/java/org/apache/tamaya/spi/ServiceContextManagerTest.java
index 372d660..272f1c6 100644
--- a/java8/api/src/test/java/org/apache/tamaya/spi/ServiceContextManagerTest.java
+++ b/java8/api/src/test/java/org/apache/tamaya/spi/ServiceContextManagerTest.java
@@ -32,7 +32,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Optional;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class ServiceContextManagerTest {
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
----------------------------------------------------------------------
diff --git a/java8/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java b/java8/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
index 856530d..8e22fa5 100644
--- a/java8/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
+++ b/java8/api/src/test/java/org/apache/tamaya/spi/TestServiceContext.java
@@ -36,11 +36,11 @@ public final class TestServiceContext implements ServiceContext {
/**
* List current services loaded, per class.
*/
- private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<Class<?>, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
/**
* Singletons.
*/
- private final Map<Class, Optional<?>> singletons = new ConcurrentHashMap<>();
+ private final Map<Class<?>, Optional<?>> singletons = new ConcurrentHashMap<>();
@Override
public <T> Optional<T> getService(Class<T> serviceType) {
@@ -77,8 +77,8 @@ public final class TestServiceContext implements ServiceContext {
} catch (Exception e) {
Logger.getLogger(TestServiceContext.class.getName()).log(Level.WARNING,
"Error loading services current type " + serviceType, e);
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
index 85df017..4845e3c 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationProvider.java
@@ -57,9 +57,7 @@ public class DefaultConfigurationProvider implements ConfigurationProviderSpi {
@Override
public void setConfigurationContext(ConfigurationContext context){
- Configuration oldConfig = this.config;
- Configuration newConfig = new DefaultConfiguration(context);
- this.config = newConfig;
+ this.config = new DefaultConfiguration(context);
this.context = context;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
index 7315ef1..a5614c2 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultServiceContext.java
@@ -41,11 +41,11 @@ public final class DefaultServiceContext implements ServiceContext {
/**
* List current services loaded, per class.
*/
- private final ConcurrentHashMap<Class, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<Class<?>, List<Object>> servicesLoaded = new ConcurrentHashMap<>();
/**
* Singletons.
*/
- private final Map<Class, Optional<?>> singletons = new ConcurrentHashMap<>();
+ private final Map<Class<?>, Optional<?>> singletons = new ConcurrentHashMap<>();
@Override
public <T> Optional<T> getService(Class<T> serviceType) {
@@ -146,4 +146,4 @@ public final class DefaultServiceContext implements ServiceContext {
return highestService;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/java8/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java
----------------------------------------------------------------------
diff --git a/java8/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java b/java8/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java
index 334f89e..6a124bd 100644
--- a/java8/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java
+++ b/java8/core/src/test/java/org/apache/tamaya/core/internal/converters/CharConverterTest.java
@@ -18,14 +18,15 @@
*/
package org.apache.tamaya.core.internal.converters;
-import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.Optional;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
+import org.apache.tamaya.Configuration;
+import org.apache.tamaya.ConfigurationProvider;
+import org.junit.Test;
/**
* Tests conversion of the {@link org.apache.tamaya.core.internal.converters.CharConverter}.
@@ -86,4 +87,4 @@ public class CharConverterTest {
Optional<Character> valueRead = config.getOptional("tests.converter.char.foo", Character.class);
assertFalse(valueRead.isPresent());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java b/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java
index 160c117..896fcf7 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/TestObservingProvider.java
@@ -23,18 +23,9 @@ import org.apache.tamaya.events.folderobserver.ObservingPropertySourceProvider;
import org.apache.tamaya.format.formats.PropertiesFormat;
import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.nio.file.FileSystem;
import java.nio.file.Files;
-import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
-import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java
----------------------------------------------------------------------
diff --git a/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java b/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java
index 4505dd9..2d72be8 100644
--- a/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java
+++ b/modules/formats/src/test/java/org/apache/tamaya/format/InputStreamFactoryTest.java
@@ -20,7 +20,6 @@ package org.apache.tamaya.format;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -29,7 +28,6 @@ import java.io.InputStream;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -144,4 +142,4 @@ public class InputStreamFactoryTest {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java
index fd7f6fc..e824589 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/ConfiguredField.java
@@ -28,7 +28,6 @@ import java.security.AccessController;
import java.security.PrivilegedExceptionAction;
import java.util.Collection;
import java.util.Objects;
-import java.util.logging.Logger;
/**
* Small class that contains and manages all information anc access to a configured field and a concrete instance current
@@ -37,10 +36,6 @@ import java.util.logging.Logger;
*/
public class ConfiguredField {
/**
- * The logger used.
- */
- private static final Logger LOG = Logger.getLogger(ConfiguredField.class.getName());
- /**
* The configured field instance.
*/
protected Field annotatedField;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
index 06de9f5..9cdfe1a 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultConfigurationInjector.java
@@ -35,7 +35,7 @@ import org.apache.tamaya.inject.ConfiguredItemSupplier;
@Priority(0)
public final class DefaultConfigurationInjector implements ConfigurationInjector {
- private Map<Class, ConfiguredType> configuredTypes = new ConcurrentHashMap<>();
+ private Map<Class<?>, ConfiguredType> configuredTypes = new ConcurrentHashMap<>();
/**
* Extract the configuration annotation config and registers it per class, for later reuse.
@@ -62,7 +62,7 @@ public final class DefaultConfigurationInjector implements ConfigurationInjector
*/
@Override
public <T> T configure(T instance) {
- Class type = Objects.requireNonNull(instance).getClass();
+ Class<?> type = Objects.requireNonNull(instance).getClass();
ConfiguredType configuredType = registerType(type);
Objects.requireNonNull(configuredType).configure(instance);
return instance;
@@ -79,8 +79,8 @@ public final class DefaultConfigurationInjector implements ConfigurationInjector
if(cl==null){
cl = this.getClass().getClassLoader();
}
- return (T) Proxy.newProxyInstance(cl, new Class[]{ConfiguredItemSupplier.class, Objects.requireNonNull(templateType)},
- new ConfigTemplateInvocationHandler(templateType, ConfigurationProvider.getConfiguration()));
+ return templateType.cast(Proxy.newProxyInstance(cl, new Class[]{ConfiguredItemSupplier.class, Objects.requireNonNull(templateType)},
+ new ConfigTemplateInvocationHandler(templateType, ConfigurationProvider.getConfiguration())));
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
----------------------------------------------------------------------
diff --git a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
index 433ea00..9da9c6d 100644
--- a/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
+++ b/modules/injection/src/main/java/org/apache/tamaya/inject/internal/DefaultDynamicValue.java
@@ -135,7 +135,7 @@ public final class DefaultDynamicValue<T> implements DynamicValue<T>, Serializab
throw new ConfigException("Failed to evaluate target type for " + annotatedField.getAnnotatedType().getType().getTypeName()
+ '.' + annotatedField.getName());
}
- targetType = (Class) types[0];
+ targetType = (Type) types[0];
}
PropertyConverter<?> propertyConverter = null;
WithPropertyConverter annot = annotatedField.getAnnotation(WithPropertyConverter.class);
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatIT.java
----------------------------------------------------------------------
diff --git a/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatIT.java b/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatIT.java
index 97ab567..851655e 100644
--- a/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatIT.java
+++ b/modules/json/src/test/java/org/apache/tamaya/json/JSONFormatIT.java
@@ -19,14 +19,12 @@
package org.apache.tamaya.json;
import org.apache.tamaya.format.ConfigurationFormat;
-import org.apache.tamaya.spi.ServiceContext;
import org.apache.tamaya.spi.ServiceContextManager;
import org.junit.Test;
import java.util.List;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.notNullValue;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/management/src/main/java/org/apache/tamaya/management/ManagedConfig.java
----------------------------------------------------------------------
diff --git a/modules/management/src/main/java/org/apache/tamaya/management/ManagedConfig.java b/modules/management/src/main/java/org/apache/tamaya/management/ManagedConfig.java
index 91b8256..dab3457 100644
--- a/modules/management/src/main/java/org/apache/tamaya/management/ManagedConfig.java
+++ b/modules/management/src/main/java/org/apache/tamaya/management/ManagedConfig.java
@@ -25,7 +25,6 @@ import org.apache.tamaya.functions.ConfigurationFunctions;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Logger;
/**
* Default implementation of the {@link ManagedConfigMBean} interface. Each bean binds to the
@@ -34,11 +33,6 @@ import java.util.logging.Logger;
public class ManagedConfig implements ManagedConfigMBean {
/**
- * The logger used.
- */
- private final static Logger LOG = Logger.getLogger(ManagedConfig.class.getName());
-
- /**
* Classloader that was active when this instance was created.
*/
private ClassLoader classLoader;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/model/src/main/java/org/apache/tamaya/model/ConfigValidator.java
----------------------------------------------------------------------
diff --git a/modules/model/src/main/java/org/apache/tamaya/model/ConfigValidator.java b/modules/model/src/main/java/org/apache/tamaya/model/ConfigValidator.java
index a6d231a..827adca 100644
--- a/modules/model/src/main/java/org/apache/tamaya/model/ConfigValidator.java
+++ b/modules/model/src/main/java/org/apache/tamaya/model/ConfigValidator.java
@@ -93,7 +93,7 @@ public final class ConfigValidator {
for (ValidationProviderSpi model : ServiceContextManager.getServiceContext().getServices(ValidationProviderSpi.class)) {
for(Validation validation: model.getValidations()) {
if(validation.getName().equals(name) && validation.getClass().equals(validationType)) {
- return (T)validation;
+ return validationType.cast(validation);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/model/src/main/java/org/apache/tamaya/model/spi/ConfigValidationsReader.java
----------------------------------------------------------------------
diff --git a/modules/model/src/main/java/org/apache/tamaya/model/spi/ConfigValidationsReader.java b/modules/model/src/main/java/org/apache/tamaya/model/spi/ConfigValidationsReader.java
index 9a720dc..e735286 100644
--- a/modules/model/src/main/java/org/apache/tamaya/model/spi/ConfigValidationsReader.java
+++ b/modules/model/src/main/java/org/apache/tamaya/model/spi/ConfigValidationsReader.java
@@ -18,8 +18,6 @@
*/
package org.apache.tamaya.model.spi;
-import org.apache.tamaya.model.Validation;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -28,7 +26,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.logging.Logger;
+
+import org.apache.tamaya.model.Validation;
/**
* Utility class to read metamodel information from properties. Hereby these properties can be part of a
@@ -37,9 +36,6 @@ import java.util.logging.Logger;
*/
public final class ConfigValidationsReader {
- /** The logger used. */
- private static final Logger LOGGER = Logger.getLogger(ConfigValidationsReader.class.getName());
-
/** The default model entries selector. */
private static final String DEFAULT_META_INFO_SELECTOR = "{model}";
/** parameter to change the selector to be used for filtering out the target values to be used. */
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterValidation.java
----------------------------------------------------------------------
diff --git a/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterValidation.java b/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterValidation.java
index 59444f7..a8ac17d 100644
--- a/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterValidation.java
+++ b/modules/model/src/main/java/org/apache/tamaya/model/spi/ParameterValidation.java
@@ -37,7 +37,7 @@ public class ParameterValidation extends AbstractValidation {
/** Optional regular expression for validating the value. */
private String regEx;
/** The target type into which the value must be convertible. */
- private Class type;
+ private Class<?> type;
/**
* Internal constructor.
@@ -59,7 +59,7 @@ public class ParameterValidation extends AbstractValidation {
*
* @return the type.
*/
- public Class getParameterType() {
+ public Class<?> getParameterType() {
return type;
}
@@ -137,7 +137,7 @@ public class ParameterValidation extends AbstractValidation {
*/
public static class Builder {
/** The parameter's target type. */
- private Class type;
+ private Class<?> type;
/** The fully qualified parameter name. */
private String name;
/** The optional provider. */
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java b/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
index 4db21e4..43dd16a 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/AbstractPathPropertySourceProvider.java
@@ -18,9 +18,6 @@
*/
package org.apache.tamaya.resource;
-import org.apache.tamaya.spi.PropertySource;
-import org.apache.tamaya.spi.PropertySourceProvider;
-
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
@@ -28,11 +25,15 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Objects;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.tamaya.spi.PropertySource;
+import org.apache.tamaya.spi.PropertySourceProvider;
+
/**
* Abstract base class that uses a descriptive resource path to define the locations of configuration files to be
* included into the configuration. This is especially useful, when the current configuration policy in place
@@ -124,7 +125,7 @@ public abstract class AbstractPathPropertySourceProvider implements PropertySour
*/
public PropertiesBasedPropertySource(String name, Properties props) {
this.name = name;
- for (Map.Entry en : props.entrySet()) {
+ for (Entry<Object, Object> en : props.entrySet()) {
this.properties.put(en.getKey().toString(), String.valueOf(en.getValue()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java
index 83307d3..7bf6ee8 100644
--- a/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java
+++ b/modules/resources/src/main/java/org/apache/tamaya/resource/internal/ClasspathCollector.java
@@ -194,8 +194,8 @@ public class ClasspathCollector {
rootEntryPath = rootEntryPath + '/';
}
Collection<URL> result = new ArrayList<>(10);
- for (Enumeration entries = jarFile.entries(); entries.hasMoreElements(); ) {
- JarEntry entry = (JarEntry) entries.nextElement();
+ for (Enumeration<JarEntry> entries = jarFile.entries(); entries.hasMoreElements(); ) {
+ JarEntry entry = entries.nextElement();
String entryPath = entry.getName();
if (entryPath.startsWith(rootEntryPath)) {
String relativePath = entryPath.substring(rootEntryPath.length());
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/80c8fa65/modules/resources/src/test/java/org/apache/tamaya/resource/internal/DefaultResourceResolverTest.java
----------------------------------------------------------------------
diff --git a/modules/resources/src/test/java/org/apache/tamaya/resource/internal/DefaultResourceResolverTest.java b/modules/resources/src/test/java/org/apache/tamaya/resource/internal/DefaultResourceResolverTest.java
index 161ac76..960345b 100644
--- a/modules/resources/src/test/java/org/apache/tamaya/resource/internal/DefaultResourceResolverTest.java
+++ b/modules/resources/src/test/java/org/apache/tamaya/resource/internal/DefaultResourceResolverTest.java
@@ -18,15 +18,14 @@
*/
package org.apache.tamaya.resource.internal;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collection;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
/**
* Tests the {@link org.apache.tamaya.resource.internal.DefaultResourceResolver} using CP and FS path expressions.
@@ -57,4 +56,4 @@ public class DefaultResourceResolverTest {
URL res = getClass().getResource("/resources_testroot/");
return new File(res.toURI()).getParentFile().getAbsolutePath();
}
-}
\ No newline at end of file
+}