tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ple...@apache.org
Subject incubator-tamaya git commit: Fixed checkstyle violations.
Date Sun, 04 Oct 2015 19:41:32 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 47a9641d8 -> be2d6b8e2


Fixed checkstyle violations.


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

Branch: refs/heads/master
Commit: be2d6b8e2178f06a1bc3a651ca71c25b8dfe5d79
Parents: 47a9641
Author: Oliver B. Fischer <plexus@apache.org>
Authored: Sun Oct 4 21:41:15 2015 +0200
Committer: Oliver B. Fischer <plexus@apache.org>
Committed: Sun Oct 4 21:41:15 2015 +0200

----------------------------------------------------------------------
 .../java/org/apache/tamaya/functions/EnrichedConfiguration.java | 5 ++---
 .../org/apache/tamaya/functions/EnrichedPropertySource.java     | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/be2d6b8e/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
index 02eaa82..01c3ddb 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java
@@ -82,7 +82,7 @@ class EnrichedConfiguration implements Configuration{
     @Override
     public <T> T getOrDefault(String key, Class<T> type, T defaultValue) {
         T val = get(key, type);
-        if(val==null){
+        if(val==null) {
             return defaultValue;
         }
         return val;
@@ -130,8 +130,7 @@ class EnrichedConfiguration implements Configuration{
             for(Map.Entry<String,Object> en:addedProperties.entrySet()){
                 allProps.put(en.getKey(), en.getValue().toString());
             }
-        }
-        else{
+        } else {
             for(Map.Entry<String,Object> en:addedProperties.entrySet()){
                 allProps.put(en.getKey(), en.getValue().toString());
             }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/be2d6b8e/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
----------------------------------------------------------------------
diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
index ad57634..2e537c7 100644
--- a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
+++ b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedPropertySource.java
@@ -81,8 +81,7 @@ class EnrichedPropertySource implements PropertySource{
         if(overriding) {
             allProps = new HashMap<>(basePropertySource.getProperties());
             allProps.putAll(addedProperties);
-        }
-        else{
+        } else {
             allProps = new HashMap<>(addedProperties);
             allProps.putAll(basePropertySource.getProperties());
         }


Mime
View raw message