You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by ot...@apache.org on 2014/12/07 23:48:57 UTC
[2/2] incubator-tamaya git commit: using collect and removing
redundant toString
using collect and removing redundant toString
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/67f27e1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/67f27e1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/67f27e1a
Branch: refs/heads/master
Commit: 67f27e1a21fc2255badc819f5811b63ff0900bec
Parents: 73ab1cd
Author: otaviojava <ot...@people.apache.org>
Authored: Sun Dec 7 20:48:43 2014 -0200
Committer: otaviojava <ot...@people.apache.org>
Committed: Sun Dec 7 20:48:43 2014 -0200
----------------------------------------------------------------------
.../internal/format/DefaultConfigFormatsSingletonSpi.java | 6 +++---
.../core/internal/properties/ReplacingPropertyProvider.java | 8 +++-----
.../core/internal/resources/AntPathClasspathResolver.java | 2 +-
.../tamaya/core/internal/resources/AntPathFileResolver.java | 2 +-
.../core/internal/resources/DefaultPathResourceLoader.java | 8 +++-----
.../resources/io/PathMatchingResourcePatternResolver.java | 5 ++---
6 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/67f27e1a/core/src/main/java/org/apache/tamaya/core/internal/format/DefaultConfigFormatsSingletonSpi.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/format/DefaultConfigFormatsSingletonSpi.java b/core/src/main/java/org/apache/tamaya/core/internal/format/DefaultConfigFormatsSingletonSpi.java
index 69ec180..31d226a 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/format/DefaultConfigFormatsSingletonSpi.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/format/DefaultConfigFormatsSingletonSpi.java
@@ -23,6 +23,7 @@ import org.apache.tamaya.core.spi.ConfigurationFormat;
import org.apache.tamaya.core.spi.ConfigurationFormatsSingletonSpi;
import java.util.*;
+import java.util.stream.Collectors;
import org.apache.tamaya.spi.Bootstrap;
@@ -49,9 +50,8 @@ public final class DefaultConfigFormatsSingletonSpi implements ConfigurationForm
public Collection<String> getFormatNames(){
Set<String> result = new HashSet<>();
try {
- for (ConfigurationFormat configFormat : Bootstrap.getServices(ConfigurationFormat.class)) {
- result.add(configFormat.getFormatName());
- }
+ result.addAll(Bootstrap.getServices(ConfigurationFormat.class).stream().map(ConfigurationFormat::getFormatName)
+ .collect(Collectors.toList()));
} catch (Exception e) {
// TODO: handle exception
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/67f27e1a/core/src/main/java/org/apache/tamaya/core/internal/properties/ReplacingPropertyProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/properties/ReplacingPropertyProvider.java b/core/src/main/java/org/apache/tamaya/core/internal/properties/ReplacingPropertyProvider.java
index aab6d6e..f1e125d 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/properties/ReplacingPropertyProvider.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/properties/ReplacingPropertyProvider.java
@@ -70,11 +70,9 @@ class ReplacingPropertyProvider implements PropertyProvider{
@Override
public Map<String,String> toMap(){
Map<String,String> result = new HashMap<>(replacingMap);
- for(Map.Entry<String,String> en : mainMap.toMap().entrySet()){
- if(!replacingMap.containsKey(en.getKey())){
- result.put(en.getKey(), en.getValue());
- }
- }
+ mainMap.toMap().entrySet().stream().filter(en -> !replacingMap.containsKey(en.getKey())).forEach(en -> {
+ result.put(en.getKey(), en.getValue());
+ });
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/67f27e1a/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathClasspathResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathClasspathResolver.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathClasspathResolver.java
index 5ca68eb..38a9644 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathClasspathResolver.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathClasspathResolver.java
@@ -52,7 +52,7 @@ public class AntPathClasspathResolver implements PathResolver {
}
}
catch(IOException e){
- LOG.log(Level.FINE, "Failed to load resource expression: " + expression.toString(), e);
+ LOG.log(Level.FINE, "Failed to load resource expression: " + expression, e);
}
});
return result;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/67f27e1a/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathFileResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathFileResolver.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathFileResolver.java
index 477bc85..0645d70 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathFileResolver.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/AntPathFileResolver.java
@@ -53,7 +53,7 @@ public class AntPathFileResolver implements PathResolver {
}
}
catch(IOException e){
- LOG.log(Level.FINE, "Failed to load resource expression: " + expression.toString(), e);
+ LOG.log(Level.FINE, "Failed to load resource expression: " + expression, e);
}
});
return result;
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/67f27e1a/core/src/main/java/org/apache/tamaya/core/internal/resources/DefaultPathResourceLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/DefaultPathResourceLoader.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/DefaultPathResourceLoader.java
index ad7dc1d..15050f5 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/DefaultPathResourceLoader.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/DefaultPathResourceLoader.java
@@ -27,6 +27,7 @@ import org.apache.tamaya.spi.Bootstrap;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.stream.Collectors;
/**
* Singleton accessor to access registered reader mechanism.
@@ -37,11 +38,8 @@ public class DefaultPathResourceLoader implements ResourceLoader{
@Override
public Collection<String> getResolverIds(){
- Set<String> ids = new HashSet<>();
- for(PathResolver resolver : Bootstrap.getServices(PathResolver.class)){
- ids.add(resolver.getResolverId());
- }
- return ids;
+ return Bootstrap.getServices(PathResolver.class).stream().map(PathResolver::getResolverId)
+ .collect(Collectors.toSet());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/67f27e1a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java
index f8fb4c3..08b9cc8 100644
--- a/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java
+++ b/core/src/main/java/org/apache/tamaya/core/internal/resources/io/PathMatchingResourcePatternResolver.java
@@ -34,6 +34,7 @@ import java.net.URISyntaxException;
import java.net.URLClassLoader;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.stream.Collectors;
/**
@@ -564,9 +565,7 @@ public final class PathMatchingResourcePatternResolver{
logger.finest(() -> "Looking for matching resources in directory tree [" + rootDir.getPath() + "]");
Set<File> matchingFiles = retrieveMatchingFiles(rootDir, subPattern);
Set<Resource> result = new LinkedHashSet<>(matchingFiles.size());
- for (File file : matchingFiles) {
- result.add(new FileSystemResource(file));
- }
+ result.addAll(matchingFiles.stream().map(FileSystemResource::new).collect(Collectors.toList()));
return result;
}