root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminate PropertySourceAggregator interface

This commit is contained in:
Chris Beams 2010-12-08 07:59:55 +00:00
parent 8770ea96b0
commit f46a455c72
2 changed files with 26 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
org.springframework.core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java vendored
View File

@ -16,6 +16,10 @@
package org.springframework.core.env; package org.springframework.core.env;
import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
/** /**
@ -24,19 +28,34 @@ import org.springframework.core.convert.ConversionService;
* @author Chris Beams * @author Chris Beams
* @since 3.1 * @since 3.1
*/ */
public interface ConfigurableEnvironment extends Environment, PropertySourceAggregator { public interface ConfigurableEnvironment extends Environment {
/**
* TODO SPR-7508: document
*/
void setActiveProfiles(String... profiles); void setActiveProfiles(String... profiles);
/**
* TODO SPR-7508: document
*/
void setDefaultProfiles(String... profiles); void setDefaultProfiles(String... profiles);
public ConversionService getConversionService(); public ConversionService getConversionService();
public void setConversionService(ConversionService conversionService); public void setConversionService(ConversionService conversionService);
void addPropertySource(PropertySource<?> propertySource);
void addPropertySource(String name, Properties properties);
void addPropertySource(String name, Map<String, String> propertiesMap);
/**
* TODO: SPR-7508 document
*
* Care should be taken to ensure duplicates are not introduced.
*
* Recommend using {@link LinkedList#set(int, Object)} for replacing items,
* and combining {@link LinkedList#remove()} with other methods like
* {@link LinkedList#add(Object)} to prevent duplicates.
*
* Explain how {@link PropertySource#equals(Object)} and hashCode work, and that
* recommend using {@link PropertySource#named(String)} for lookups in the list.
*/
LinkedList<PropertySource<?>> getPropertySources();
} }

51
org.springframework.core/src/main/java/org/springframework/core/env/PropertySourceAggregator.java vendored
View File

@ -1,51 +0,0 @@
/*
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.core.env;
import java.util.LinkedList;
import java.util.Map;
import java.util.Properties;
/**
* TODO: SPR-7508 document
*
* @author Chris Beams
* @since 3.1
*/
public interface PropertySourceAggregator {
void addPropertySource(PropertySource<?> propertySource);
void addPropertySource(String name, Properties properties);
void addPropertySource(String name, Map<String, String> propertiesMap);
/**
* TODO: SPR-7508 document
*
* Care should be taken to ensure duplicates are not introduced.
*
* Recommend using {@link LinkedList#set(int, Object)} for replacing items,
* and combining {@link LinkedList#remove()} with other methods like
* {@link LinkedList#add(Object)} to prevent duplicates.
*
* Explain how {@link PropertySource#equals(Object)} and hashCode work, and that
* recommend using {@link PropertySource#named(String)} for lookups in the list.
*/
LinkedList<PropertySource<?>> getPropertySources();
}