tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject [3/3] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master'
Date Sun, 14 Dec 2014 23:50:58 GMT
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/org/apache/tamaya/core/config/ConfigFunctions.java


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

Branch: refs/heads/master
Commit: c6fa7c677c0dbbb34ff82de1b8ee7d325f2957a7
Parents: 123a4af 9ac2684
Author: anatole <anatole@apache.org>
Authored: Mon Dec 15 00:50:21 2014 +0100
Committer: anatole <anatole@apache.org>
Committed: Mon Dec 15 00:50:21 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/tamaya/core/config/ConfigFunctions.java     | 4 ++--
 .../tamaya/core/internal/resources/io/AntPathMatcher.java       | 2 +-
 .../resources/io/PathMatchingResourcePatternResolver.java       | 4 ++--
 .../apache/tamaya/core/internal/resources/io/StringUtils.java   | 2 +-
 .../apache/tamaya/core/properties/AggregatedPropertySource.java | 4 +---
 .../apache/tamaya/core/properties/ReplacingPropertySource.java  | 5 ++---
 6 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/c6fa7c67/core/src/main/java/org/apache/tamaya/core/config/ConfigFunctions.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/tamaya/core/config/ConfigFunctions.java
index 3075f8c,f46473a..c9d924f
--- a/core/src/main/java/org/apache/tamaya/core/config/ConfigFunctions.java
+++ b/core/src/main/java/org/apache/tamaya/core/config/ConfigFunctions.java
@@@ -63,8 -63,8 +63,8 @@@ public final class ConfigFunctions 
                              .filter(e -> isKeyInArea(e.getKey(), areaKey))
                              .collect(Collectors.toMap(
                                      e -> stripKeys ? e.getKey().substring(areaKey.length()
+ 1) : e.getKey(),
-                                     e -> e.getValue())));
+                                     Map.Entry::getValue)));
 -            return PropertySourceBuilder.create("area: " + areaKey).addMap(area).build().toConfiguration();
 +            return PropertySourceBuilder.of("area: " + areaKey).addMap(area).build().toConfiguration();
          };
      }
  
@@@ -110,8 -110,8 +110,8 @@@
                              .filter(e -> e.getKey().startsWith(lookupKey))
                              .collect(Collectors.toMap(
                                      e -> stripKeys ? e.getKey().substring(areaKey.length()
+ 1) : e.getKey(),
-                                     e -> e.getValue())));
+                                     Map.Entry::getValue)));
 -            return PropertySourceBuilder.create("area (recursive): " + areaKey).addMap(area).build().toConfiguration();
 +            return PropertySourceBuilder.of("area (recursive): " + areaKey).addMap(area).build().toConfiguration();
          };
      }
  


Mime
View raw message