Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 90F2F200BB4 for ; Mon, 17 Oct 2016 20:21:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8FA4C160AF0; Mon, 17 Oct 2016 18:21:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B84CF160AFB for ; Mon, 17 Oct 2016 20:21:25 +0200 (CEST) Received: (qmail 4896 invoked by uid 500); 17 Oct 2016 18:21:25 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 4847 invoked by uid 99); 17 Oct 2016 18:21:24 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Oct 2016 18:21:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 74B68C0A88 for ; Mon, 17 Oct 2016 18:21:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 1PJgL6wm7HX3 for ; Mon, 17 Oct 2016 18:21:23 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 7BA4B5FB20 for ; Mon, 17 Oct 2016 18:21:22 +0000 (UTC) Received: (qmail 4583 invoked by uid 99); 17 Oct 2016 18:21:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Oct 2016 18:21:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C6062E09DE; Mon, 17 Oct 2016 18:21:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plexus@apache.org To: commits@tamaya.incubator.apache.org Date: Mon, 17 Oct 2016 18:21:28 -0000 Message-Id: <45497523a0cf40209b938b3370c18c11@git.apache.org> In-Reply-To: <21b9dc5c8df142368613fa888259e0b5@git.apache.org> References: <21b9dc5c8df142368613fa888259e0b5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] incubator-tamaya-extensions git commit: TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release. archived-at: Mon, 17 Oct 2016 18:21:26 -0000 TAMAYA-136: Adding PropertyValue for PropertySource SPI. All changes and test fixes in all modules/examples relevant for release. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/2e229513 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/2e229513 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/2e229513 Branch: refs/heads/master Commit: 2e229513e335c6c3a59a42b7093413081cacaaf2 Parents: 245defb Author: anatole Authored: Tue Feb 2 17:15:53 2016 +0100 Committer: Oliver B. Fischer Committed: Fri Sep 30 21:29:37 2016 +0200 ---------------------------------------------------------------------- .../org/apache/tamaya/events/FrozenPropertySource.java | 5 +++-- .../tamaya/events/PropertySourceChangeBuilder.java | 11 ++++++----- .../apache/tamaya/events/FrozenPropertySourceTest.java | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2e229513/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java b/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java index a8167f2..81e6dca 100644 --- a/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java +++ b/src/main/java/org/apache/tamaya/events/FrozenPropertySource.java @@ -19,6 +19,7 @@ package org.apache.tamaya.events; import org.apache.tamaya.spi.PropertySource; +import org.apache.tamaya.spi.PropertyValue; import java.io.Serializable; import java.util.Collections; @@ -81,8 +82,8 @@ public final class FrozenPropertySource implements PropertySource, Serializable } @Override - public String get(String key) { - return this.properties.get(key); + public PropertyValue get(String key) { + return PropertyValue.of(key, this.properties.get(key), getName()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2e229513/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java index cefa4f4..0858fdb 100644 --- a/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java +++ b/src/main/java/org/apache/tamaya/events/PropertySourceChangeBuilder.java @@ -19,6 +19,7 @@ package org.apache.tamaya.events; import org.apache.tamaya.spi.PropertySource; +import org.apache.tamaya.spi.PropertyValue; import java.beans.PropertyChangeEvent; import java.util.ArrayList; @@ -95,19 +96,19 @@ public final class PropertySourceChangeBuilder { public static Collection compare(PropertySource map1, PropertySource map2) { List changes = new ArrayList<>(); for (Map.Entry en : map1.getProperties().entrySet()) { - String val = map2.get(en.getKey()); + PropertyValue val = map2.get(en.getKey()); if (val == null) { changes.add(new PropertyChangeEvent(map1, en.getKey(), null, en.getValue())); } else if (!val.equals(en.getValue())) { - changes.add(new PropertyChangeEvent(map1, en.getKey(), val, en.getValue())); + changes.add(new PropertyChangeEvent(map1, en.getKey(), val.getValue(), en.getValue())); } } for (Map.Entry en : map2.getProperties().entrySet()) { - String val = map1.get(en.getKey()); + PropertyValue val = map1.get(en.getKey()); if (val == null) { changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), null)); } else if (!val.equals(en.getValue())) { - changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), val)); + changes.add(new PropertyChangeEvent(map1, en.getKey(), en.getValue(), val.getValue())); } } return changes; @@ -170,7 +171,7 @@ public final class PropertySourceChangeBuilder { * @return the builder for chaining. */ public PropertySourceChangeBuilder remove(String key, String... otherKeys) { - String oldValue = this.source.get(key); + PropertyValue oldValue = this.source.get(key); if (oldValue == null) { this.delta.remove(key); } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/2e229513/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java b/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java index 0c61e0b..1431228 100644 --- a/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java +++ b/src/test/java/org/apache/tamaya/events/FrozenPropertySourceTest.java @@ -58,7 +58,7 @@ public class FrozenPropertySourceTest { PropertySource ps = FrozenPropertySource.of(myPS); assertNotNull(ps); for (Map.Entry e : myPS.getProperties().entrySet()) { - assertEquals(ps.get(e.getKey()), e.getValue()); + assertEquals(ps.get(e.getKey()).getValue(), e.getValue()); } }