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/01 17:47:48 UTC

[02/14] incubator-tamaya git commit: Added EMPTY constants for Configuration, ProeprtySource, PropertySourceProvider

Added EMPTY constants for Configuration, ProeprtySource, PropertySourceProvider


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/98fe89a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/98fe89a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/98fe89a8

Branch: refs/heads/master
Commit: 98fe89a82b4145a865bcd3775a5d9ae4178d7989
Parents: 2cdb462
Author: anatole <an...@apache.org>
Authored: Tue Mar 1 09:43:56 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Tue Mar 1 09:43:56 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/tamaya/Configuration.java   | 56 ++++++++++++++++++++
 .../org/apache/tamaya/spi/PropertySource.java   | 36 +++++++++++++
 .../tamaya/spi/PropertySourceProvider.java      | 17 ++++++
 3 files changed, 109 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/98fe89a8/code/api/src/main/java/org/apache/tamaya/Configuration.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/Configuration.java b/code/api/src/main/java/org/apache/tamaya/Configuration.java
index c4a373f..d5abfc5 100644
--- a/code/api/src/main/java/org/apache/tamaya/Configuration.java
+++ b/code/api/src/main/java/org/apache/tamaya/Configuration.java
@@ -18,6 +18,7 @@
  */
 package org.apache.tamaya;
 
+import java.util.Collections;
 import java.util.Map;
 
 
@@ -46,6 +47,61 @@ import java.util.Map;
 public interface Configuration {
 
     /**
+     * Empty instance usable, where a configuration is required but no one is avilable.
+     */
+    Configuration EMPTY = new Configuration(){
+        @Override
+        public String get(String key) {
+            return null;
+        }
+
+        @Override
+        public String getOrDefault(String key, String defaultValue) {
+            return defaultValue;
+        }
+
+        @Override
+        public <T> T getOrDefault(String key, Class<T> type, T defaultValue) {
+            return defaultValue;
+        }
+
+        @Override
+        public <T> T get(String key, Class<T> type) {
+            return null;
+        }
+
+        @Override
+        public <T> T get(String key, TypeLiteral<T> type) {
+            return null;
+        }
+
+        @Override
+        public <T> T getOrDefault(String key, TypeLiteral<T> type, T defaultValue) {
+            return defaultValue;
+        }
+
+        @Override
+        public Map<String, String> getProperties() {
+            return Collections.emptyMap();
+        }
+
+        @Override
+        public Configuration with(ConfigOperator operator) {
+            return operator.operate(this);
+        }
+
+        @Override
+        public <T> T query(ConfigQuery<T> query) {
+            return query.query(this);
+        }
+
+        @Override
+        public String toString(){
+            return "Configuration.EMPTY";
+        }
+    };
+
+    /**
      * Access a property.
      *
      * @param key the property's key, not null.

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/98fe89a8/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java b/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
index 56d084c..36c4059 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/PropertySource.java
@@ -19,6 +19,7 @@
 package org.apache.tamaya.spi;
 
 
+import java.util.Collections;
 import java.util.Map;
 
 
@@ -49,6 +50,41 @@ public interface PropertySource {
      */
     String TAMAYA_ORDINAL = "tamaya.ordinal";
 
+    /**
+     * A resusable instance of an empty PropertySource.
+     */
+    PropertySource EMPTY = new PropertySource() {
+        @Override
+        public int getOrdinal() {
+            return Integer.MIN_VALUE;
+        }
+
+        @Override
+        public String getName() {
+            return "<empty>";
+        }
+
+        @Override
+        public PropertyValue get(String key) {
+            return null;
+        }
+
+        @Override
+        public Map<String, String> getProperties() {
+            return Collections.emptyMap();
+        }
+
+        @Override
+        public boolean isScannable() {
+            return false;
+        }
+
+        @Override
+        public String toString(){
+            return "PropertySource.EMPTY";
+        }
+    };
+
 
     /**
      * Lookup order:

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/98fe89a8/code/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java
----------------------------------------------------------------------
diff --git a/code/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java b/code/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java
index 42e3b4d..79a8d98 100644
--- a/code/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java
+++ b/code/api/src/main/java/org/apache/tamaya/spi/PropertySourceProvider.java
@@ -19,6 +19,7 @@
 package org.apache.tamaya.spi;
 
 import java.util.Collection;
+import java.util.Collections;
 
 /**
  * <p>Implement this interfaces to provide a PropertySource provider which
@@ -36,6 +37,22 @@ import java.util.Collection;
 public interface PropertySourceProvider {
 
     /**
+     * A resusable instance of an empty PropertySource.
+     */
+    PropertySourceProvider EMPTY = new PropertySourceProvider() {
+
+        @Override
+        public Collection<PropertySource> getPropertySources() {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public String toString(){
+            return "PropertySourceProvider(empty)";
+        }
+    };
+
+    /**
      * @return For each e.g. property file, we return a single PropertySource
      *         or an empty list if no PropertySource exists.
      */