[spring-extensions] 02/10: JPAR-85 - Add missing final keywords to method parameters.
Tom Zeller
tzeller at dragonacea.biz
Mon May 16 21:56:48 EDT 2016
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch JPAR-85
in repository spring-extensions.
commit db9dc9c7818cf45321b18f39bce5ec92ddb1825a
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon May 16 20:45:41 2016 -0500
JPAR-85 - Add missing final keywords to method parameters.
---
.../ext/spring/config/BooleanToPredicateConverter.java | 2 +-
.../ext/spring/config/DurationPropertyEditor.java | 2 +-
.../ext/spring/config/DurationToLongConverter.java | 4 ++--
.../spring/config/IdentifiableBeanPostProcessor.java | 4 ++--
.../config/StringBooleanToPredicateConverter.java | 2 +-
.../ext/spring/config/StringToIPRangeConverter.java | 2 +-
.../ext/spring/config/StringToResourceConverter.java | 4 ++--
...erPlaceholderFileSystemXmlWebApplicationContext.java | 2 +-
.../context/DelimiterAwareApplicationContext.java | 2 +-
.../context/FileSystemXmlWebApplicationContext.java | 4 ++--
.../context/FilesystemGenericApplicationContext.java | 2 +-
.../spring/error/ExtendedMappingExceptionResolver.java | 3 ++-
.../factory/AbstractComponentAwareFactoryBean.java | 2 +-
.../ext/spring/factory/EvaluableScriptFactoryBean.java | 8 ++++----
.../factory/FileCachingHttpClientFactoryBean.java | 6 +++---
.../ext/spring/factory/HttpClientFactoryBean.java | 2 +-
.../factory/InMemoryCachingHttpClientFactoryBean.java | 4 ++--
.../ext/spring/resource/FileBackedHTTPResource.java | 2 +-
.../shibboleth/ext/spring/resource/HTTPResource.java | 14 +++++++-------
.../spring/resource/PreferFileSystemResourceLoader.java | 4 ++--
.../shibboleth/ext/spring/resource/ResourceHelper.java | 4 ++--
.../spring/resource/SVNBasicAuthenticationManager.java | 8 ++++----
.../net/shibboleth/ext/spring/resource/SVNResource.java | 14 +++++++-------
.../spring/service/AbstractServiceableComponent.java | 2 +-
.../ext/spring/service/ClassBasedServiceStrategy.java | 2 +-
.../ext/spring/service/ReloadableSpringService.java | 2 +-
.../ext/spring/util/BaseSpringNamespaceHandler.java | 17 ++++++++++-------
.../SchemaTypeAwareBeanDefinitionDocumentReader.java | 4 ++--
.../SchemaTypeAwareBeanDefinitionParserDelegate.java | 4 ++--
.../net/shibboleth/ext/spring/util/SpringSupport.java | 2 +-
30 files changed, 69 insertions(+), 65 deletions(-)
diff --git a/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java b/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java
index ad4abf4..c5bf2b2 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/BooleanToPredicateConverter.java
@@ -28,7 +28,7 @@ import com.google.common.base.Predicates;
public class BooleanToPredicateConverter implements Converter<Boolean,Predicate> {
/** {@inheritDoc} */
- public Predicate convert(Boolean source) {
+ public Predicate convert(final Boolean source) {
return source ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
}
diff --git a/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java b/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
index b49ca6a..575bf31 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
@@ -29,7 +29,7 @@ public class DurationPropertyEditor extends PropertyEditorSupport {
/** {@inheritDoc} */
@Override
- public void setAsText(String text) {
+ public void setAsText(final String text) {
if (text.startsWith("P")) {
setValue(DOMTypeSupport.getDataTypeFactory().newDuration(text.trim()));
diff --git a/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java b/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java
index 88a5584..55173d8 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/DurationToLongConverter.java
@@ -37,7 +37,7 @@ public class DurationToLongConverter implements Converter<String,Long>, Conditio
@Nonnull private Logger log = LoggerFactory.getLogger(DurationToLongConverter.class);
/** {@inheritDoc} */
- @Override public Long convert(String source) {
+ @Override public Long convert(final String source) {
if (source.startsWith("P")) {
return DOMTypeSupport.durationToLong(source.trim());
} else if (source.startsWith("-P")) {
@@ -52,7 +52,7 @@ public class DurationToLongConverter implements Converter<String,Long>, Conditio
}
/** {@inheritDoc} */
- @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+ @Override public boolean matches(final TypeDescriptor sourceType, final TypeDescriptor targetType) {
return targetType.hasAnnotation(Duration.class);
}
diff --git a/src/main/java/net/shibboleth/ext/spring/config/IdentifiableBeanPostProcessor.java b/src/main/java/net/shibboleth/ext/spring/config/IdentifiableBeanPostProcessor.java
index 4ed7437..b6bce22 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/IdentifiableBeanPostProcessor.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/IdentifiableBeanPostProcessor.java
@@ -34,7 +34,7 @@ public class IdentifiableBeanPostProcessor implements BeanPostProcessor {
@Nonnull private final Logger log = LoggerFactory.getLogger(IdentifiableBeanPostProcessor.class);
/** {@inheritDoc} */
- @Override public Object postProcessBeforeInitialization(Object bean, String beanName) {
+ @Override public Object postProcessBeforeInitialization(final Object bean, final String beanName) {
if (bean instanceof IdentifiableComponent) {
final IdentifiableComponent component = (IdentifiableComponent) bean;
if (component.getId() == null) {
@@ -52,7 +52,7 @@ public class IdentifiableBeanPostProcessor implements BeanPostProcessor {
}
/** {@inheritDoc} */
- @Override public Object postProcessAfterInitialization(Object bean, String beanName) {
+ @Override public Object postProcessAfterInitialization(final Object bean, final String beanName) {
return bean;
}
diff --git a/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java b/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java
index 793d314..e04fe79 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java
@@ -30,7 +30,7 @@ import com.google.common.base.Predicates;
public class StringBooleanToPredicateConverter implements Converter<String,Predicate> {
/** {@inheritDoc} */
- public Predicate convert(String source) {
+ public Predicate convert(final String source) {
return Boolean.valueOf(StringSupport.trimOrNull(source)) ? Predicates.alwaysTrue() : Predicates.alwaysFalse();
}
diff --git a/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java b/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java
index 96c90d7..a2d9e46 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java
@@ -29,7 +29,7 @@ public class StringToIPRangeConverter implements Converter<String,IPRange> {
/** {@inheritDoc} */
@Override
- public IPRange convert(String source) {
+ public IPRange convert(final String source) {
return IPRange.parseCIDRBlock(source);
}
diff --git a/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java b/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java
index 9eba54b..1a50ed3 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/StringToResourceConverter.java
@@ -40,14 +40,14 @@ public class StringToResourceConverter implements Converter<String, Resource>, A
/** {@inheritDoc} */
@Override
- public Resource convert(String source) {
+ public Resource convert(final String source) {
final ResourceLoader loader = applicationContext == null ? new DefaultResourceLoader() : applicationContext;
return ResourceHelper.of(loader.getResource(source));
}
/** {@inheritDoc} */
@Override
- public void setApplicationContext(ApplicationContext context) {
+ public void setApplicationContext(final ApplicationContext context) {
applicationContext = context;
}
diff --git a/src/main/java/net/shibboleth/ext/spring/context/DeferPlaceholderFileSystemXmlWebApplicationContext.java b/src/main/java/net/shibboleth/ext/spring/context/DeferPlaceholderFileSystemXmlWebApplicationContext.java
index 8641e84..6d2d04b 100644
--- a/src/main/java/net/shibboleth/ext/spring/context/DeferPlaceholderFileSystemXmlWebApplicationContext.java
+++ b/src/main/java/net/shibboleth/ext/spring/context/DeferPlaceholderFileSystemXmlWebApplicationContext.java
@@ -54,7 +54,7 @@ public class DeferPlaceholderFileSystemXmlWebApplicationContext extends FileSyst
* unchanged.
* </p>
*/
- @Override protected String resolvePath(String path) {
+ @Override protected String resolvePath(final String path) {
if (propertySourcesInitialized) {
return super.resolvePath(path);
}
diff --git a/src/main/java/net/shibboleth/ext/spring/context/DelimiterAwareApplicationContext.java b/src/main/java/net/shibboleth/ext/spring/context/DelimiterAwareApplicationContext.java
index a81ce06..271f68d 100644
--- a/src/main/java/net/shibboleth/ext/spring/context/DelimiterAwareApplicationContext.java
+++ b/src/main/java/net/shibboleth/ext/spring/context/DelimiterAwareApplicationContext.java
@@ -28,7 +28,7 @@ import org.springframework.util.StringUtils;
public class DelimiterAwareApplicationContext extends DeferPlaceholderFileSystemXmlWebApplicationContext {
/** {@inheritDoc} */
- @Override public void setConfigLocation(String location) {
+ @Override public void setConfigLocation(final String location) {
setConfigLocations(StringUtils.tokenizeToStringArray(location, getDelimiters()));
}
diff --git a/src/main/java/net/shibboleth/ext/spring/context/FileSystemXmlWebApplicationContext.java b/src/main/java/net/shibboleth/ext/spring/context/FileSystemXmlWebApplicationContext.java
index e9e2e77..5223e2b 100644
--- a/src/main/java/net/shibboleth/ext/spring/context/FileSystemXmlWebApplicationContext.java
+++ b/src/main/java/net/shibboleth/ext/spring/context/FileSystemXmlWebApplicationContext.java
@@ -44,7 +44,7 @@ public class FileSystemXmlWebApplicationContext extends XmlWebApplicationContext
* absolute if they are in fact absolute.
* </p>
*/
- @Override protected Resource getResourceByPath(String path) {
+ @Override protected Resource getResourceByPath(final String path) {
final Resource r = new FileSystemResource(path);
if (r.exists()) {
return r;
@@ -59,7 +59,7 @@ public class FileSystemXmlWebApplicationContext extends XmlWebApplicationContext
* Supports wildcard classpath locations prefixed with {@link ResourcePatternResolver#CLASSPATH_ALL_URL_PREFIX}.
* </p>
*/
- @Override public Resource getResource(String location) {
+ @Override public Resource getResource(final String location) {
Assert.notNull(location, "Location must not be null");
if (location.startsWith(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX)) {
return new ClassPathResource(location.substring(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX.length()),
diff --git a/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java b/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
index a7d281f..e2a4ced 100644
--- a/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
+++ b/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
@@ -70,7 +70,7 @@ public class FilesystemGenericApplicationContext extends GenericApplicationConte
* paths are treated as absolute if they are in fact absolute.</p>
*/
@Override
- protected Resource getResourceByPath(String path) {
+ protected Resource getResourceByPath(final String path) {
final Resource r = new FileSystemResource(path);
if (r.exists()) {
return r;
diff --git a/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java b/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
index 33bd27f..322d64a 100644
--- a/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
+++ b/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
@@ -71,7 +71,8 @@ public class ExtendedMappingExceptionResolver extends SimpleMappingExceptionReso
/** {@inheritDoc} */
@Override
- protected ModelAndView getModelAndView(String viewName, Exception ex, HttpServletRequest request) {
+ protected ModelAndView getModelAndView(final String viewName, final Exception ex,
+ final HttpServletRequest request) {
LoggerFactory.getLogger(ex.getClass()).error("", ex);
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java
index 180387d..eb132db 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/AbstractComponentAwareFactoryBean.java
@@ -31,7 +31,7 @@ import org.springframework.beans.factory.config.AbstractFactoryBean;
public abstract class AbstractComponentAwareFactoryBean<T> extends AbstractFactoryBean<T> {
/** {@inheritDoc}. Call our destroy method if aposite. */
- @Override protected void destroyInstance(T instance) throws Exception {
+ @Override protected void destroyInstance(final T instance) throws Exception {
super.destroyInstance(instance);
ComponentSupport.destroy(instance);
}
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
index 9f67d36..ecf9231 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
@@ -61,7 +61,7 @@ public class EvaluableScriptFactoryBean extends AbstractComponentAwareFactoryBea
*
* @param what the resource to set.
*/
- public void setResource(Resource what) {
+ public void setResource(final Resource what) {
resource = what;
}
@@ -79,7 +79,7 @@ public class EvaluableScriptFactoryBean extends AbstractComponentAwareFactoryBea
*
* @param what the script to set.
*/
- public void setScript(String what) {
+ public void setScript(final String what) {
script = what;
}
@@ -97,7 +97,7 @@ public class EvaluableScriptFactoryBean extends AbstractComponentAwareFactoryBea
*
* @param what the Id to set.
*/
- public void setSourceId(String what) {
+ public void setSourceId(final String what) {
sourceId = what;
}
@@ -115,7 +115,7 @@ public class EvaluableScriptFactoryBean extends AbstractComponentAwareFactoryBea
*
* @param what the engine name to set.
*/
- public void setEngineName(String what) {
+ public void setEngineName(final String what) {
engineName = what;
}
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/FileCachingHttpClientFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/FileCachingHttpClientFactoryBean.java
index 19a0126..c6b3a1c 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/FileCachingHttpClientFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/FileCachingHttpClientFactoryBean.java
@@ -48,7 +48,7 @@ public class FileCachingHttpClientFactoryBean extends HttpClientFactoryBean impl
*
* @param cacheDirectory The cacheDirectory to set.
*/
- public void setCacheDirectory(String cacheDirectory) {
+ public void setCacheDirectory(final String cacheDirectory) {
((FileCachingHttpClientBuilder)getHttpClientBuilder()).setCacheDirectory(cacheDirectory);
}
@@ -57,7 +57,7 @@ public class FileCachingHttpClientFactoryBean extends HttpClientFactoryBean impl
*
* @param maxCacheEntries The maxCacheEntries to set.
*/
- public void setMaxCacheEntries(int maxCacheEntries) {
+ public void setMaxCacheEntries(final int maxCacheEntries) {
((FileCachingHttpClientBuilder)getHttpClientBuilder()).setMaxCacheEntries(maxCacheEntries);
}
@@ -66,7 +66,7 @@ public class FileCachingHttpClientFactoryBean extends HttpClientFactoryBean impl
*
* @param maxCacheEntrySize The maxCacheEntrySize to set.
*/
- public void setMaxCacheEntrySize(long maxCacheEntrySize) {
+ public void setMaxCacheEntrySize(final long maxCacheEntrySize) {
((FileCachingHttpClientBuilder)getHttpClientBuilder()).setMaxCacheEntrySize(maxCacheEntrySize);
}
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java
index 2672965..18f867e 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/HttpClientFactoryBean.java
@@ -59,7 +59,7 @@ public class HttpClientFactoryBean extends AbstractComponentAwareFactoryBean<Htt
*
* @param timeout maximum length of time in milliseconds to wait for the connection to be established
*/
- public void setConnectionTimeout(@Duration long timeout) {
+ public void setConnectionTimeout(@Duration final long timeout) {
connectionTimeout = timeout;
if (timeout > Integer.MAX_VALUE) {
throw new IllegalArgumentException("Timeout was too large");
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java
index 054f786..5d79a47 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/InMemoryCachingHttpClientFactoryBean.java
@@ -36,7 +36,7 @@ public class InMemoryCachingHttpClientFactoryBean extends HttpClientFactoryBean
*
* @param maxCacheEntries The maxCacheEntries to set.
*/
- public void setMaxCacheEntries(int maxCacheEntries) {
+ public void setMaxCacheEntries(final int maxCacheEntries) {
((InMemoryCachingHttpClientBuilder) getHttpClientBuilder()).setMaxCacheEntries(maxCacheEntries);
}
@@ -45,7 +45,7 @@ public class InMemoryCachingHttpClientFactoryBean extends HttpClientFactoryBean
*
* @param maxCacheEntrySize The maxCacheEntrySize to set.
*/
- public void setMaxCacheEntrySize(long maxCacheEntrySize) {
+ public void setMaxCacheEntrySize(final long maxCacheEntrySize) {
((InMemoryCachingHttpClientBuilder) getHttpClientBuilder()).setMaxCacheEntrySize(maxCacheEntrySize);
}
diff --git a/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java b/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
index 0dd1246..c0d381f 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
@@ -129,7 +129,7 @@ public class FileBackedHTTPResource extends HTTPResource {
* @throws IOException if an error happens. If the backing file might have been corrupted we delete it.
*/
- protected InputStream saveAndClone(InputStream input) throws IOException {
+ protected InputStream saveAndClone(final InputStream input) throws IOException {
FileOutputStream out = new FileOutputStream(backingResource.getFile());
try {
log.debug("{}: Copying file.", getDescription());
diff --git a/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java b/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
index 05e6a3a..bc0b18e 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
@@ -121,7 +121,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
* http://hc.apache.org/httpcomponents-client-ga/tutorial/html/caching.html
* @param context the context of the request
*/
- protected void reportCachingStatus(HttpCacheContext context) {
+ protected void reportCachingStatus(final HttpCacheContext context) {
CacheResponseStatus responseStatus = context.getCacheResponseStatus();
if (null == responseStatus) {
log.debug("Non caching client provided");
@@ -252,11 +252,11 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
/**
* Send a Head to the client and interrogate the response for a particular response header.
*
- * @param what the repsonse header to look at
+ * @param what the response header to look at
* @return the value of that response, or null if things failed
* @throws IOException from lower levels.
*/
- @Nullable protected String getResponseHeader(String what) throws IOException {
+ @Nullable protected String getResponseHeader(final String what) throws IOException {
final HttpResponse response;
log.debug("Attempting to fetch remote resource as '{}'", resourceURL);
@@ -389,7 +389,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
}
/** {@inheritDoc} */
- public void mark(int readLimit) {
+ public void mark(final int readLimit) {
stream.mark(readLimit);
}
@@ -404,12 +404,12 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
}
/** {@inheritDoc} */
- public int read(byte[] b) throws IOException {
+ public int read(final byte[] b) throws IOException {
return stream.read(b);
}
/** {@inheritDoc} */
- public int read(byte[] b, int off, int len) throws IOException {
+ public int read(final byte[] b, final int off, final int len) throws IOException {
return stream.read(b, off, len);
}
@@ -419,7 +419,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
}
/** {@inheritDoc} */
- public long skip(long n) throws IOException {
+ public long skip(final long n) throws IOException {
return stream.skip(n);
}
}
diff --git a/src/main/java/net/shibboleth/ext/spring/resource/PreferFileSystemResourceLoader.java b/src/main/java/net/shibboleth/ext/spring/resource/PreferFileSystemResourceLoader.java
index 5dd87bb..1d87646 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/PreferFileSystemResourceLoader.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/PreferFileSystemResourceLoader.java
@@ -39,7 +39,7 @@ public class PreferFileSystemResourceLoader extends DefaultResourceLoader {
* absolute if they are in fact absolute.
* </p>
*/
- @Override protected Resource getResourceByPath(String path) {
+ @Override protected Resource getResourceByPath(final String path) {
final Resource r = new FileSystemResource(path);
if (r.exists()) {
return r;
@@ -55,7 +55,7 @@ public class PreferFileSystemResourceLoader extends DefaultResourceLoader {
* Supports wildcard classpath locations prefixed with {@link ResourcePatternResolver#CLASSPATH_ALL_URL_PREFIX}.
* </p>
*/
- @Override public Resource getResource(String location) {
+ @Override public Resource getResource(final String location) {
Assert.notNull(location, "Location must not be null");
if (location.startsWith(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX)) {
return new ClassPathResource(location.substring(ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX.length()),
diff --git a/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java b/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java
index fbd2fb3..c7cf5af 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java
@@ -54,7 +54,7 @@ public final class ResourceHelper implements net.shibboleth.utilities.java.suppo
* @param springResource the input
* @return a {@link Resource} which reflects what the Spring one does
*/
- public static net.shibboleth.utilities.java.support.resource.Resource of(Resource springResource) {
+ public static net.shibboleth.utilities.java.support.resource.Resource of(final Resource springResource) {
if (springResource instanceof net.shibboleth.utilities.java.support.resource.Resource) {
return (net.shibboleth.utilities.java.support.resource.Resource) springResource;
}
@@ -108,7 +108,7 @@ public final class ResourceHelper implements net.shibboleth.utilities.java.suppo
/** {@inheritDoc} */
@Override public net.shibboleth.utilities.java.support.resource.Resource
- createRelativeResource(String relativePath) throws IOException {
+ createRelativeResource(final String relativePath) throws IOException {
return of(springResource.createRelative(relativePath));
}
diff --git a/src/main/java/net/shibboleth/ext/spring/resource/SVNBasicAuthenticationManager.java b/src/main/java/net/shibboleth/ext/spring/resource/SVNBasicAuthenticationManager.java
index 23af313..d105f93 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/SVNBasicAuthenticationManager.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/SVNBasicAuthenticationManager.java
@@ -97,7 +97,7 @@ public class SVNBasicAuthenticationManager extends BasicAuthenticationManager im
/** Set the proxy host.
* @param host The proxyHost to set.
*/
- public void setProxyHost(String host) {
+ public void setProxyHost(final String host) {
proxyHost = host;
proxySet = true;
}
@@ -113,7 +113,7 @@ public class SVNBasicAuthenticationManager extends BasicAuthenticationManager im
/** Set the proxy port.
* @param port The proxyPort to set.
*/
- public void setProxyPort(int port) {
+ public void setProxyPort(final int port) {
proxyPort = port;
proxySet = true;
}
@@ -129,7 +129,7 @@ public class SVNBasicAuthenticationManager extends BasicAuthenticationManager im
/** Set the proxy user name.
* @param userName The proxyUserName to set.
*/
- public void setProxyUserName(String userName) {
+ public void setProxyUserName(final String userName) {
proxyUserName = userName;
proxySet = true;
}
@@ -145,7 +145,7 @@ public class SVNBasicAuthenticationManager extends BasicAuthenticationManager im
/** Set the proxy password.
* @param password The proxyPassword to set.
*/
- public void setProxyPassword(String password) {
+ public void setProxyPassword(final String password) {
proxyPassword = password;
proxySet = true;
}
diff --git a/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java b/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
index 714e39d..7c792ee 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
@@ -149,7 +149,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
*
* @param fileName the name
*/
- public void setFilename(String fileName) {
+ public void setFilename(final String fileName) {
resourceFileName = StringSupport.trimOrNull(fileName);
if (resourceFileName == null) {
log.error("SVN working copy resource file name may not be null or empty");
@@ -186,7 +186,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
*
* @throws IOException thrown if the file is invalid
*/
- protected void checkWorkingCopyDirectory(File directory) throws IOException {
+ protected void checkWorkingCopyDirectory(final File directory) throws IOException {
if (directory == null) {
log.error("SVN working copy directory cannot be null");
throw new IOException("SVN working copy directory cannot be null");
@@ -301,7 +301,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
*
* @throws IOException thrown if there is a problem getting the last modified time
*/
- private DateTime getLastModificationForRevision(SVNRevision revision) throws IOException {
+ private DateTime getLastModificationForRevision(final SVNRevision revision) throws IOException {
try {
final SVNStatusHandler handler = new SVNStatusHandler();
clientManager.getStatusClient().doStatus(getFile(), revision, SVNDepth.INFINITY, true, true, false, false,
@@ -413,13 +413,13 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
}
/** {@inheritDoc} */
- @Override public Resource createRelative(String relativePath) throws IOException {
+ @Override public Resource createRelative(final String relativePath) throws IOException {
throw new IOException("Cannot support relative open on SVN resources");
}
/** {@inheritDoc} */
@Override public net.shibboleth.utilities.java.support.resource.Resource
- createRelativeResource(String relativePath) throws IOException {
+ createRelativeResource(final String relativePath) throws IOException {
throw new IOException("Cannot support relative open on SVN resources");
}
@@ -435,7 +435,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
}
/** {@inheritDoc} */
- @Override public void setBeanName(String name) {
+ @Override public void setBeanName(final String name) {
// For some reason Spring will call this after initialization.
if (!isInitialized()) {
setId(name);
@@ -458,7 +458,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
}
/** {@inheritDoc} */
- @Override public void handleStatus(SVNStatus currentStatus) throws SVNException {
+ @Override public void handleStatus(final SVNStatus currentStatus) throws SVNException {
status = currentStatus;
}
}
diff --git a/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java b/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
index af3130e..408728a 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/AbstractServiceableComponent.java
@@ -55,7 +55,7 @@ public abstract class AbstractServiceableComponent<T> extends AbstractIdentified
private final ReentrantReadWriteLock serviceLock = new ReentrantReadWriteLock(false);
/** {@inheritDoc} */
- @Override public void setApplicationContext(ApplicationContext context) {
+ @Override public void setApplicationContext(final ApplicationContext context) {
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
applicationContext = context;
}
diff --git a/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java b/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
index 8133bec..e46ef31 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/ClassBasedServiceStrategy.java
@@ -57,7 +57,7 @@ public class ClassBasedServiceStrategy<T> implements Function<ApplicationContext
}
/** {@inheritDoc} */
- @Override @Nullable public ServiceableComponent<T> apply(@Nullable ApplicationContext appContext) {
+ @Override @Nullable public ServiceableComponent<T> apply(@Nullable final ApplicationContext appContext) {
final Collection<? extends ServiceableComponent> components = appContext.getBeansOfType(serviceClaz).values();
if (components.size() == 0) {
diff --git a/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java b/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
index ed74bf4..4ecd62a 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
@@ -412,7 +412,7 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
}
/** {@inheritDoc} */
- @Override public void setApplicationContext(ApplicationContext applicationContext) {
+ @Override public void setApplicationContext(final ApplicationContext applicationContext) {
setParentContext(applicationContext);
}
diff --git a/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java b/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
index 508ba37..a9ad660 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
@@ -78,7 +78,8 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
* @return the decorated bean definition
*/
@Override
- public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) {
+ public BeanDefinitionHolder decorate(final Node node, final BeanDefinitionHolder definition,
+ final ParserContext parserContext) {
return findDecoratorForNode(node).decorate(node, definition, parserContext);
}
@@ -92,7 +93,7 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
* @return the bean definition created from the given element
*/
@Override
- public BeanDefinition parse(Element element, ParserContext parserContext) {
+ public BeanDefinition parse(final Element element, final ParserContext parserContext) {
return findParserForElement(element).parse(element, parserContext);
}
@@ -104,7 +105,7 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
*
* @return the parser for the given bean element
*/
- protected BeanDefinitionParser findParserForElement(Element element) {
+ protected BeanDefinitionParser findParserForElement(final Element element) {
BeanDefinitionParser parser = null;
QName typeName = DOMTypeSupport.getXSIType(element);
@@ -140,7 +141,7 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
*
* @return the decorator for the given node
*/
- protected BeanDefinitionDecorator findDecoratorForNode(Node node) {
+ protected BeanDefinitionDecorator findDecoratorForNode(final Node node) {
BeanDefinitionDecorator decorator = null;
if (node instanceof Element) {
@@ -170,7 +171,7 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
* @param elementNameOrType the element name or schema type the parser is for
* @param parser the parser to register
*/
- protected void registerBeanDefinitionParser(QName elementNameOrType, BeanDefinitionParser parser) {
+ protected void registerBeanDefinitionParser(final QName elementNameOrType, final BeanDefinitionParser parser) {
parsers.put(elementNameOrType, parser);
}
@@ -181,7 +182,8 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
* @param elementNameOrType the element name or schema type the parser is for
* @param decorator the decorator to register
*/
- protected void registerBeanDefinitionDecorator(QName elementNameOrType, BeanDefinitionDecorator decorator) {
+ protected void registerBeanDefinitionDecorator(final QName elementNameOrType,
+ final BeanDefinitionDecorator decorator) {
decorators.put(elementNameOrType, decorator);
}
@@ -192,7 +194,8 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
* @param attributeName the name of the attribute to register the decorator for
* @param decorator the decorator to register
*/
- protected void registerBeanDefinitionDecoratorForAttribute(QName attributeName, BeanDefinitionDecorator decorator) {
+ protected void registerBeanDefinitionDecoratorForAttribute(final QName attributeName,
+ final BeanDefinitionDecorator decorator) {
attributeDecorators.put(attributeName, decorator);
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
index dd0f818..f75757b 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
@@ -30,8 +30,8 @@ public class SchemaTypeAwareBeanDefinitionDocumentReader extends DefaultBeanDefi
/** {@inheritDoc} */
@Override
- protected BeanDefinitionParserDelegate createDelegate(XmlReaderContext readerContext, Element root,
- BeanDefinitionParserDelegate parentDelegate) {
+ protected BeanDefinitionParserDelegate createDelegate(final XmlReaderContext readerContext, final Element root,
+ final BeanDefinitionParserDelegate parentDelegate) {
BeanDefinitionParserDelegate delegate =
new SchemaTypeAwareBeanDefinitionParserDelegate(readerContext);
delegate.initDefaults(root, parentDelegate);
diff --git a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
index a11c972..ef5eea1 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
@@ -45,13 +45,13 @@ public class SchemaTypeAwareBeanDefinitionParserDelegate extends BeanDefinitionP
/** {@inheritDoc} */
@Override
- public BeanDefinition parseCustomElement(Element element) {
+ public BeanDefinition parseCustomElement(final Element element) {
return parseCustomElement(element, null);
}
/** {@inheritDoc} */
@Override
- public BeanDefinition parseCustomElement(Element element, BeanDefinition containingBd) {
+ public BeanDefinition parseCustomElement(final Element element, final BeanDefinition containingBd) {
String namespaceUri = element.getNamespaceURI();
if (DOMTypeSupport.hasXSIType(element)) {
namespaceUri = DOMTypeSupport.getXSIType(element).getNamespaceURI();
diff --git a/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java b/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
index fa0f451..8d43fb2 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
@@ -185,7 +185,7 @@ public final class SpringSupport {
* @param registry the registry to populate
*/
public static void
- parseNativeElement(@Nonnull final Element springBeans, @Nullable BeanDefinitionRegistry registry) {
+ parseNativeElement(@Nonnull final Element springBeans, @Nullable final BeanDefinitionRegistry registry) {
final XmlBeanDefinitionReader definitionReader = new XmlBeanDefinitionReader(registry);
definitionReader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD);
definitionReader.setNamespaceAware(true);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list