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 2016/03/14 00:59:14 UTC
[13/16] incubator-tamaya git commit: Added
Configuration.getConfigurationContext().
Added Configuration.getConfigurationContext().
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/1f0420f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/1f0420f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/1f0420f5
Branch: refs/heads/master
Commit: 1f0420f5f29cc37d42c49a467359f3aa7c9d1a4d
Parents: d59dd82
Author: anatole <an...@apache.org>
Authored: Mon Mar 14 00:39:53 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Mon Mar 14 00:39:53 2016 +0100
----------------------------------------------------------------------
.../apache/tamaya/events/FrozenConfiguration.java | 7 +++++++
.../org/apache/tamaya/events/TestConfigView.java | 6 ++++++
.../internal/DefaultMutableConfiguration.java | 17 ++++++++++-------
.../tamaya/spisupport/DefaultConfiguration.java | 5 +++++
4 files changed, 28 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1f0420f5/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
index b874987..304ddba 100644
--- a/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
+++ b/modules/events/src/main/java/org/apache/tamaya/events/FrozenConfiguration.java
@@ -24,6 +24,8 @@ import org.apache.tamaya.ConfigQuery;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
+import org.apache.tamaya.functions.ConfigurationFunctions;
+import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
@@ -162,6 +164,11 @@ public final class FrozenConfiguration implements Configuration, Serializable {
}
@Override
+ public ConfigurationContext getContext() {
+ return ConfigurationFunctions.emptyConfigurationContext();
+ }
+
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1f0420f5/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
----------------------------------------------------------------------
diff --git a/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java b/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
index 4f2227a..8e5b397 100644
--- a/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
+++ b/modules/events/src/test/java/org/apache/tamaya/events/TestConfigView.java
@@ -24,6 +24,7 @@ import org.apache.tamaya.ConfigQuery;
import org.apache.tamaya.Configuration;
import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
+import org.apache.tamaya.spi.ConfigurationContext;
import org.apache.tamaya.spi.ConversionContext;
import org.apache.tamaya.spi.PropertyConverter;
@@ -73,6 +74,11 @@ public class TestConfigView implements ConfigOperator{
}
@Override
+ public ConfigurationContext getContext() {
+ return config.getContext();
+ }
+
+ @Override
public String get(String key) {
return getProperties().get(key);
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1f0420f5/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java
index 83a983d..02f7193 100644
--- a/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java
+++ b/modules/mutable-config/src/main/java/org/apache/tamaya/mutableconfig/internal/DefaultMutableConfiguration.java
@@ -21,7 +21,6 @@ package org.apache.tamaya.mutableconfig.internal;
import org.apache.tamaya.ConfigOperator;
import org.apache.tamaya.ConfigQuery;
import org.apache.tamaya.Configuration;
-import org.apache.tamaya.ConfigurationProvider;
import org.apache.tamaya.TypeLiteral;
import org.apache.tamaya.mutableconfig.ChangePropagationPolicy;
import org.apache.tamaya.mutableconfig.MutableConfiguration;
@@ -87,8 +86,7 @@ public class DefaultMutableConfiguration implements MutableConfiguration {
@Override
public List<MutablePropertySource> getMutablePropertySources() {
List<MutablePropertySource> result = new ArrayList<>();
- ConfigurationContext context = ConfigurationProvider.getConfigurationContext(this.config);
- for(PropertySource propertySource:context.getPropertySources()) {
+ for(PropertySource propertySource:this.config.getContext().getPropertySources()) {
if(propertySource instanceof MutablePropertySource){
result.add((MutablePropertySource)propertySource);
}
@@ -309,6 +307,15 @@ public class DefaultMutableConfiguration implements MutableConfiguration {
}
@Override
+ public ConfigurationContext getContext() {
+ return config.getContext();
+ }
+
+ private Collection<PropertySource> getPropertySources() {
+ return this.config.getContext().getPropertySources();
+ }
+
+ @Override
public String toString() {
return "DefaultMutableConfiguration{" +
"config=" + config +
@@ -316,8 +323,4 @@ public class DefaultMutableConfiguration implements MutableConfiguration {
'}';
}
- private Collection<PropertySource> getPropertySources() {
- ConfigurationContext context = ConfigurationProvider.getConfigurationContext(this.config);
- return context.getPropertySources();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/1f0420f5/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java
index 4dbdb77..52a0d11 100644
--- a/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java
+++ b/modules/spi-support/src/main/java/org/apache/tamaya/spisupport/DefaultConfiguration.java
@@ -220,4 +220,9 @@ public class DefaultConfiguration implements Configuration {
public <T> T query(ConfigQuery<T> query) {
return query.query(this);
}
+
+ @Override
+ public ConfigurationContext getContext() {
+ return configurationContext;
+ }
}