TAMAYA-212: Rendered default comparators into singletons.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/commit/9e1cd74c Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/9e1cd74c Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/9e1cd74c Branch: refs/heads/master Commit: 9e1cd74c93eec37eddb25d492e6a471853e8ff20 Parents: a144252 Author: anatole <anat...@apache.org> Authored: Thu Dec 22 22:18:27 2016 +0100 Committer: anatole <anat...@apache.org> Committed: Thu Dec 22 22:18:27 2016 +0100 ---------------------------------------------------------------------- .../internal/DSLLoadingConfigurationProviderSpi.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/9e1cd74c/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java ---------------------------------------------------------------------- diff --git a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java index 47ce7f0..b6247c5 100644 --- a/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java +++ b/metamodel/src/main/java/org/apache/tamaya/metamodel/internal/DSLLoadingConfigurationProviderSpi.java @@ -19,13 +19,17 @@ package org.apache.tamaya.metamodel.internal; import org.apache.tamaya.metamodel.MetaConfiguration; -import org.apache.tamaya.spi.*; import org.apache.tamaya.Configuration; +import org.apache.tamaya.spi.ConfigurationContext; +import org.apache.tamaya.spi.ConfigurationContextBuilder; +import org.apache.tamaya.spi.ConfigurationProviderSpi; +import org.apache.tamaya.spi.ServiceContextManager; import org.apache.tamaya.spisupport.DefaultConfiguration; import org.apache.tamaya.spisupport.DefaultConfigurationContextBuilder; +import org.apache.tamaya.spisupport.PropertyFilterComparator; +import org.apache.tamaya.spisupport.PropertySourceComparator; import javax.annotation.Priority; -import java.util.Comparator; import java.util.Objects; /** @@ -93,10 +97,8 @@ public class DSLLoadingConfigurationProviderSpi implements ConfigurationProvider .addDefaultPropertyConverters() .addDefaultPropertyFilters() .addDefaultPropertySources() - .sortPropertyFilter( - (Comparator<PropertyFilter>) - DefaultConfigurationContextBuilder.DEFAULT_PROPERTYFILTER_COMPARATOR) - .sortPropertySources(DefaultConfigurationContextBuilder.DEFAULT_PROPERTYSOURCE_COMPARATOR) + .sortPropertyFilter(PropertyFilterComparator.getInstance()) + .sortPropertySources(PropertySourceComparator.getInstance()) .build()); } }