Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 011310556 -> 668a36eb2
Enabled more fine grained reusage of toString fields. 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/668a36eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/668a36eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/668a36eb Branch: refs/heads/master Commit: 668a36eb2a20734e2a7db956f79c24429108f5fe Parents: 0113105 Author: anatole <anat...@apache.org> Authored: Tue Apr 18 11:37:30 2017 +0200 Committer: anatole <anat...@apache.org> Committed: Tue Apr 18 11:39:28 2017 +0200 ---------------------------------------------------------------------- .../format/MappedConfigurationDataPropertySource.java | 6 ++++++ .../org/apache/tamaya/jndi/JNDIPropertySource.java | 9 +++------ .../MutablePropertiesPropertySource.java | 5 +++++ .../MutableXmlPropertiesPropertySource.java | 6 ++++++ .../apache/tamaya/spisupport/BasePropertySource.java | 13 +++++++++++++ .../apache/tamaya/spisupport/CLIPropertySource.java | 11 +++++++---- .../tamaya/spisupport/EnvironmentPropertySource.java | 7 +++++++ .../apache/tamaya/spisupport/MapPropertySource.java | 8 -------- .../apache/tamaya/spisupport/SystemPropertySource.java | 7 +++++++ .../src/test/resources/overrideOrdinal.properties | 2 +- 10 files changed, 55 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/formats/base/src/main/java/org/apache/tamaya/format/MappedConfigurationDataPropertySource.java ---------------------------------------------------------------------- diff --git a/modules/formats/base/src/main/java/org/apache/tamaya/format/MappedConfigurationDataPropertySource.java b/modules/formats/base/src/main/java/org/apache/tamaya/format/MappedConfigurationDataPropertySource.java index e8eef40..ef9f507 100644 --- a/modules/formats/base/src/main/java/org/apache/tamaya/format/MappedConfigurationDataPropertySource.java +++ b/modules/formats/base/src/main/java/org/apache/tamaya/format/MappedConfigurationDataPropertySource.java @@ -149,4 +149,10 @@ public class MappedConfigurationDataPropertySource extends BasePropertySource { return result; } + @Override + protected String toStringValues() { + return super.toStringValues() + + " dataSupplier=" + dataSupplier + '\n'; + } + } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java ---------------------------------------------------------------------- diff --git a/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java b/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java index a944db7..13eb9b4 100644 --- a/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java +++ b/modules/jndi/src/main/java/org/apache/tamaya/jndi/JNDIPropertySource.java @@ -132,12 +132,9 @@ public class JNDIPropertySource extends BasePropertySource { } @Override - public String toString() { - return "JNDIPropertySource{" + - "name=" + getName() + - ", ordinal=" + getOrdinal() + - ", context=" + context + - '}'; + protected String toStringValues() { + return super.toStringValues() + + "\n context=" + context + '\''; } /** http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutablePropertiesPropertySource.java ---------------------------------------------------------------------- diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutablePropertiesPropertySource.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutablePropertiesPropertySource.java index 50a1b5f..39b840c 100644 --- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutablePropertiesPropertySource.java +++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutablePropertiesPropertySource.java @@ -157,5 +157,10 @@ implements MutablePropertySource{ } } + @Override + protected String toStringValues() { + return super.toStringValues() + + " file=" + file + '\n'; + } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutableXmlPropertiesPropertySource.java ---------------------------------------------------------------------- diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutableXmlPropertiesPropertySource.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutableXmlPropertiesPropertySource.java index 3d72d29..96ac691 100644 --- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutableXmlPropertiesPropertySource.java +++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/propertysources/MutableXmlPropertiesPropertySource.java @@ -163,5 +163,11 @@ implements MutablePropertySource{ } } + @Override + protected String toStringValues() { + return super.toStringValues() + + " file=" + file + '\n'; + } + } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/BasePropertySource.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/BasePropertySource.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/BasePropertySource.java index 685bffa..14c3764 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/BasePropertySource.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/BasePropertySource.java @@ -147,4 +147,17 @@ public abstract class BasePropertySource implements PropertySource{ public boolean isScannable(){ return true; } + + @Override + public String toString() { + return getClass().getSimpleName() + "{" + + toStringValues() + + '}'; + } + + protected String toStringValues() { + return " defaultOrdinal=" + defaultOrdinal + '\n' + + " ordinal=" + ordinal + '\n' + + " name='" + name + '\'' + '\n'; + } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/CLIPropertySource.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/CLIPropertySource.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/CLIPropertySource.java index 20a62bb..c74a8f3 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/CLIPropertySource.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/CLIPropertySource.java @@ -20,10 +20,7 @@ package org.apache.tamaya.spisupport; import org.apache.tamaya.spi.PropertyValue; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * PropertySource that allows to add the programs main arguments as configuration entries. Unix syntax using '--' and @@ -131,4 +128,10 @@ public class CLIPropertySource extends BasePropertySource{ public Map<String, PropertyValue> getProperties() { return Collections.unmodifiableMap(mainArgs); } + + @Override + protected String toStringValues() { + return super.toStringValues() + + " args=" + Arrays.toString(args) + '\n'; + } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/EnvironmentPropertySource.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/EnvironmentPropertySource.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/EnvironmentPropertySource.java index 7cbb713..200c567 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/EnvironmentPropertySource.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/EnvironmentPropertySource.java @@ -172,4 +172,11 @@ public class EnvironmentPropertySource extends BasePropertySource { return true; } + @Override + protected String toStringValues() { + return super.toStringValues() + + " prefix=" + prefix + '\n' + + " disabled=" + disabled + '\n'; + } + } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/MapPropertySource.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/MapPropertySource.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/MapPropertySource.java index 437cf64..b07231e 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/MapPropertySource.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/MapPropertySource.java @@ -99,12 +99,4 @@ public class MapPropertySource extends BasePropertySource { return Collections.unmodifiableMap(this.props); } - @Override - public String toString() { - return "MapPropertySource{" + - "name=" + getName() + ", " + - "ordinal=" + getOrdinal() + - '}'; - } - } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java index 61aa449..de83a82 100644 --- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java +++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/SystemPropertySource.java @@ -187,4 +187,11 @@ public class SystemPropertySource extends BasePropertySource { public boolean isScannable() { return true; } + + @Override + protected String toStringValues() { + return super.toStringValues() + + " prefix=" + prefix + '\n' + + " disabled=" + disabled + '\n'; + } } http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/668a36eb/modules/spi-support/src/test/resources/overrideOrdinal.properties ---------------------------------------------------------------------- diff --git a/modules/spi-support/src/test/resources/overrideOrdinal.properties b/modules/spi-support/src/test/resources/overrideOrdinal.properties index 96935a8..c68208a 100644 --- a/modules/spi-support/src/test/resources/overrideOrdinal.properties +++ b/modules/spi-support/src/test/resources/overrideOrdinal.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -#override ordinal +#overrideValue ordinal tamaya.ordinal=16784 mykey1=myval1
