Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PropertySource implementations perform conversion to String arrays via StringUtils (getting rid of EMPTY_NAMES_ARRAY)

Browse Source
This commit is contained in:
Juergen Hoeller
2014-08-21 22:46:33 +02:00
parent 7c6088861f
commit b73c531527
7 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/env/EnumerablePropertySource.java vendored
View File

@@ -45,8 +45,6 @@ import org.springframework.util.Assert;
*/
public abstract class EnumerablePropertySource<T> extends PropertySource<T> {
protected static final String[] EMPTY_NAMES_ARRAY = new String[0];
protected final Log logger = LogFactory.getLog(getClass());

6
spring-core/src/main/java/org/springframework/core/env/MapPropertySource.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 the original author or authors.
* Copyright 2002-2014 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.
@@ -18,6 +18,8 @@ package org.springframework.core.env;
import java.util.Map;
import org.springframework.util.StringUtils;
/**
* {@link PropertySource} that reads keys and values from a {@code Map} object.
*
@@ -38,7 +40,7 @@ public class MapPropertySource extends EnumerablePropertySource<Map<String, Obje
@Override
public String[] getPropertyNames() {
return this.source.keySet().toArray(EMPTY_NAMES_ARRAY);
return StringUtils.toStringArray(this.source.keySet());
}
}

3
spring-core/src/main/java/org/springframework/core/env/MutablePropertySources.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.LinkedList;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -187,7 +188,7 @@ public class MutablePropertySources implements PropertySources {
}
@Override
public synchronized String toString() {
public String toString() {
String[] names = new String[this.size()];
for (int i=0; i < size(); i++) {
names[i] = this.propertySourceList.get(i).getName();

7
spring-web/src/main/java/org/springframework/web/context/support/ServletConfigPropertySource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 the original author or authors.
* Copyright 2002-2014 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.
@@ -20,7 +20,7 @@ import javax.servlet.ServletConfig;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
/**
* {@link PropertySource} that reads init parameters from a {@link ServletConfig} object.
@@ -37,8 +37,7 @@ public class ServletConfigPropertySource extends EnumerablePropertySource<Servle
@Override
public String[] getPropertyNames() {
return CollectionUtils.toArray(
this.source.getInitParameterNames(), EMPTY_NAMES_ARRAY);
return StringUtils.toStringArray(this.source.getInitParameterNames());
}
@Override

8
spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2014 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.
@@ -20,7 +20,7 @@ import javax.servlet.ServletContext;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
/**
* {@link PropertySource} that reads init parameters from a {@link ServletContext} object.
@@ -37,12 +37,12 @@ public class ServletContextPropertySource extends EnumerablePropertySource<Servl
@Override
public String[] getPropertyNames() {
return CollectionUtils.toArray(
this.source.getInitParameterNames(), EMPTY_NAMES_ARRAY);
return StringUtils.toStringArray(this.source.getInitParameterNames());
}
@Override
public String getProperty(String name) {
return this.source.getInitParameter(name);
}
}

7
spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigPropertySource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 the original author or authors.
* Copyright 2002-2014 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.
@@ -20,7 +20,7 @@ import javax.portlet.PortletConfig;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
/**
* {@link PropertySource} that reads init parameters from a {@link PortletConfig} object.
@@ -37,11 +37,12 @@ public class PortletConfigPropertySource extends EnumerablePropertySource<Portle
@Override
public String[] getPropertyNames() {
return CollectionUtils.toArray(this.source.getInitParameterNames(), EMPTY_NAMES_ARRAY);
return StringUtils.toStringArray(this.source.getInitParameterNames());
}
@Override
public String getProperty(String name) {
return this.source.getInitParameter(name);
}
}

7
spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextPropertySource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 the original author or authors.
* Copyright 2002-2014 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.
@@ -20,7 +20,7 @@ import javax.portlet.PortletContext;
import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
/**
* {@link PropertySource} that reads init parameters from a {@link PortletContext} object.
@@ -37,11 +37,12 @@ public class PortletContextPropertySource extends EnumerablePropertySource<Portl
@Override
public String[] getPropertyNames() {
return CollectionUtils.toArray(this.source.getInitParameterNames(), EMPTY_NAMES_ARRAY);
return StringUtils.toStringArray(this.source.getInitParameterNames());
}
@Override
public String getProperty(String name) {
return this.source.getInitParameter(name);
}
}