Refactor Environment and PropertySource

* Environment now extends PropertyResolver
* Environment no longer exposes resolver and sources
* PropertySource is String,Object instead of String,String
* PropertySource no longer assumes enumerability of property names
* Introduced EnumerablePropertySource for those that do have enumerable property names
This commit is contained in:
Chris Beams
2011-01-05 22:24:14 +00:00
parent 7c4582b4b3
commit 2b99cf6d29
39 changed files with 392 additions and 316 deletions

View File

@@ -18,6 +18,7 @@ package org.springframework.web.portlet.context;
import javax.portlet.PortletConfig;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.util.CollectionUtils;
@@ -28,7 +29,7 @@ import org.springframework.util.CollectionUtils;
* @since 3.1
* @see PortletContextPropertySource
*/
public class PortletConfigPropertySource extends PropertySource<PortletConfig> {
public class PortletConfigPropertySource extends EnumerablePropertySource<PortletConfig> {
public PortletConfigPropertySource(String name, PortletConfig portletConfig) {
super(name, portletConfig);

View File

@@ -18,6 +18,7 @@ package org.springframework.web.portlet.context;
import javax.portlet.PortletContext;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.util.CollectionUtils;
@@ -28,7 +29,7 @@ import org.springframework.util.CollectionUtils;
* @since 3.1
* @see PortletConfigPropertySource
*/
public class PortletContextPropertySource extends PropertySource<PortletContext> {
public class PortletContextPropertySource extends EnumerablePropertySource<PortletContext> {
public PortletContextPropertySource(String name, PortletContext portletContext) {
super(name, portletContext);