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:11 UTC
[10/16] incubator-tamaya git commit: Added
Configuration.getConfiguratinContext()
Added Configuration.getConfiguratinContext()
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/18fcd12d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/18fcd12d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/18fcd12d
Branch: refs/heads/master
Commit: 18fcd12d7becf00d4420bb21ea4034d2f0febbb1
Parents: 0e3e51d
Author: anatole <an...@apache.org>
Authored: Mon Mar 14 00:34:54 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Mon Mar 14 00:34:54 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/tamaya/spi/ConfigurationContext.java | 2 ++
.../java/org/apache/tamaya/spi/ConfigurationProviderSpi.java | 2 ++
.../src/test/java/org/apache/tamaya/TestConfiguration.java | 7 +++++++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/18fcd12d/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java b/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
index a8416a9..d61bde7 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationContext.java
@@ -21,6 +21,7 @@ package org.apache.tamaya.spi;
import org.apache.tamaya.TypeLiteral;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -155,4 +156,5 @@ public interface ConfigurationContext {
* @return a new builder instance, never null.
*/
ConfigurationContextBuilder toBuilder();
+
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/18fcd12d/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationProviderSpi.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationProviderSpi.java b/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationProviderSpi.java
index bb87372..d179d1e 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationProviderSpi.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/ConfigurationProviderSpi.java
@@ -39,7 +39,9 @@ public interface ConfigurationProviderSpi {
* Get access to the current {@link ConfigurationContext}.
*
* @return the current {@link ConfigurationContext}, never null.
+ * @deprecated Will be removed in favour of {@link Configuration#getContext()}.
*/
+ @Deprecated
ConfigurationContext getConfigurationContext();
/**
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/18fcd12d/code/api/src/test/java/org/apache/tamaya/TestConfiguration.java
----------------------------------------------------------------------
diff --git a/code/api/src/test/java/org/apache/tamaya/TestConfiguration.java b/code/api/src/test/java/org/apache/tamaya/TestConfiguration.java
index 3078714..3efdaea 100644
--- a/code/api/src/test/java/org/apache/tamaya/TestConfiguration.java
+++ b/code/api/src/test/java/org/apache/tamaya/TestConfiguration.java
@@ -19,6 +19,8 @@
package org.apache.tamaya;
+import org.apache.tamaya.spi.ConfigurationContext;
+
import java.util.HashMap;
import java.util.Map;
@@ -123,6 +125,11 @@ public class TestConfiguration implements Configuration{
}
@Override
+ public ConfigurationContext getContext() {
+ return null;
+ }
+
+ @Override
public Map<String, String> getProperties() {
throw new RuntimeException("Method not implemented yet.");
}