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 2015/04/18 23:58:48 UTC
[2/2] incubator-tamaya git commit: Removed star import.
Removed star import.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/60ed4daf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/60ed4daf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/60ed4daf
Branch: refs/heads/master
Commit: 60ed4daf9e1b0cdb510c95710516bea9a9f39f3b
Parents: 64cb2ff
Author: anatole <an...@apache.org>
Authored: Sat Apr 18 23:58:36 2015 +0200
Committer: anatole <an...@apache.org>
Committed: Sat Apr 18 23:58:36 2015 +0200
----------------------------------------------------------------------
.../org/apache/tamaya/core/internal/DefaultConfiguration.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/60ed4daf/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
index fe0887f..8eaa5cd 100644
--- a/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
+++ b/java8/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfiguration.java
@@ -28,7 +28,6 @@ import org.apache.tamaya.spi.PropertySource;
import org.apache.tamaya.spi.PropertyValueCombinationPolicy;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -39,8 +38,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
-import static java.util.Map.*;
-
/**
* Implementation of the Configuration API. This class uses the current {@link ConfigurationContext} to evaluate the
* chain of {@link org.apache.tamaya.spi.PropertySource} and {@link org.apache.tamaya.spi.PropertyFilter}
@@ -143,7 +140,6 @@ public class DefaultConfiguration implements Configuration {
@Override
public Map<String, String> getProperties() {
List<PropertySource> propertySources = new ArrayList<>(configurationContext.getPropertySources());
- Collections.reverse(propertySources);
Map<String, String> result = new HashMap<>();
for (PropertySource propertySource : propertySources) {
try {
@@ -199,7 +195,7 @@ public class DefaultConfiguration implements Configuration {
}
// Remove null values
return inputMap.entrySet().parallelStream().filter((e) -> e.getValue() != null).collect(
- Collectors.toMap(Entry::getKey, Entry::getValue));
+ Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}
/**