[spring-extensions] 01/03: Auto style (mostly @Override and final)
Rod Widdowson
rdw at steadingsoftware.com
Fri Sep 23 08:09:27 EDT 2016
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository spring-extensions.
View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=a71a7cd12b44ac5e1799d3c0b83c7bfa14daddc9
commit a71a7cd12b44ac5e1799d3c0b83c7bfa14daddc9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Sep 23 10:58:57 2016 +0100
Auto style (mostly @Override and final)
---
.../spring/config/BooleanToPredicateConverter.java | 2 +-
.../ext/spring/config/DurationPropertyEditor.java | 3 +-
.../ext/spring/config/DurationToLongConverter.java | 4 +-
.../config/IdentifiableBeanPostProcessor.java | 4 +-
.../config/StringBooleanToPredicateConverter.java | 6 +--
.../spring/config/StringToIPRangeConverter.java | 7 ++-
.../spring/config/StringToResourceConverter.java | 4 +-
...ceholderFileSystemXmlWebApplicationContext.java | 2 +-
.../context/DelimiterAwareApplicationContext.java | 2 +-
.../FileSystemXmlWebApplicationContext.java | 4 +-
.../FilesystemGenericApplicationContext.java | 9 ++--
.../error/ExtendedMappingExceptionResolver.java | 6 +--
.../factory/AbstractComponentAwareFactoryBean.java | 2 +-
.../ext/spring/factory/DOMDocumentFactoryBean.java | 9 ++--
.../spring/factory/EvaluableScriptFactoryBean.java | 8 ++--
.../factory/FileCachingHttpClientFactoryBean.java | 10 ++---
.../InMemoryCachingHttpClientFactoryBean.java | 4 +-
.../ext/spring/factory/PrivateKeyFactoryBean.java | 6 +--
.../ext/spring/factory/PublicKeyFactoryBean.java | 6 +--
.../factory/X509CertificateChainFactoryBean.java | 8 ++--
.../spring/factory/X509CertificateFactoryBean.java | 8 ++--
.../spring/resource/FileBackedHTTPResource.java | 36 +++++++--------
.../ext/spring/resource/HTTPResource.java | 51 +++++++++++++---------
.../resource/PreferFileSystemResourceLoader.java | 4 +-
.../ext/spring/resource/ResourceHelper.java | 6 +--
.../ext/spring/resource/SVNResource.java | 30 ++++++-------
.../service/AbstractServiceableComponent.java | 2 +-
.../spring/service/ClassBasedServiceStrategy.java | 2 +-
.../spring/service/ReloadableSpringService.java | 14 +++---
.../spring/util/BaseSpringNamespaceHandler.java | 6 +--
...chemaTypeAwareBeanDefinitionParserDelegate.java | 6 +--
31 files changed, 136 insertions(+), 135 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 5cab70e..7cac796 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) {
+ @Override 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 3d588dd..9197e7f 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/DurationPropertyEditor.java
@@ -28,8 +28,7 @@ import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
public class DurationPropertyEditor extends PropertyEditorSupport {
/** {@inheritDoc} */
- @Override
- public void setAsText(String text) {
+ @Override 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 b4898e1..d67c5e5 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 41bf095..6793544 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 061f184..201af0b 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/StringBooleanToPredicateConverter.java
@@ -17,10 +17,10 @@
package net.shibboleth.ext.spring.config;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
import javax.annotation.Nonnull;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.convert.converter.Converter;
@@ -37,7 +37,7 @@ public class StringBooleanToPredicateConverter implements Converter<String,Predi
@Nonnull private final Logger log = LoggerFactory.getLogger(StringBooleanToPredicateConverter.class);
/** {@inheritDoc} */
- public Predicate convert(String source) {
+ @Override public Predicate convert(final String source) {
final String trimmed = StringSupport.trimOrNull(source);
if (Boolean.valueOf(trimmed)) {
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 f7e7217..4993521 100644
--- a/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java
+++ b/src/main/java/net/shibboleth/ext/spring/config/StringToIPRangeConverter.java
@@ -17,10 +17,10 @@
package net.shibboleth.ext.spring.config;
-import org.springframework.core.convert.converter.Converter;
-
import net.shibboleth.utilities.java.support.net.IPRange;
+import org.springframework.core.convert.converter.Converter;
+
/**
* Allows setting of {@link IPRange} properties using a CIDR string.
@@ -28,8 +28,7 @@ import net.shibboleth.utilities.java.support.net.IPRange;
public class StringToIPRangeConverter implements Converter<String,IPRange> {
/** {@inheritDoc} */
- @Override
- public IPRange convert(String source) {
+ @Override 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 5e6778e..53e54a8 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 e791e0a..f4dd82d 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 20575d0..1c341ff 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 17c222e..0c1c99a 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 ba86687..9619d14 100644
--- a/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
+++ b/src/main/java/net/shibboleth/ext/spring/context/FilesystemGenericApplicationContext.java
@@ -39,7 +39,7 @@ public class FilesystemGenericApplicationContext extends GenericApplicationConte
*
* @param beanFactory bean factory
*/
- public FilesystemGenericApplicationContext(DefaultListableBeanFactory beanFactory) {
+ public FilesystemGenericApplicationContext(final DefaultListableBeanFactory beanFactory) {
super(beanFactory);
}
@@ -48,7 +48,7 @@ public class FilesystemGenericApplicationContext extends GenericApplicationConte
*
* @param parent parent context
*/
- public FilesystemGenericApplicationContext(ApplicationContext parent) {
+ public FilesystemGenericApplicationContext(final ApplicationContext parent) {
super(parent);
}
@@ -58,7 +58,8 @@ public class FilesystemGenericApplicationContext extends GenericApplicationConte
* @param beanFactory bean factory
* @param parent parent context
*/
- public FilesystemGenericApplicationContext(DefaultListableBeanFactory beanFactory, ApplicationContext parent) {
+ public FilesystemGenericApplicationContext(final DefaultListableBeanFactory beanFactory,
+ final ApplicationContext parent) {
super(beanFactory, parent);
}
@@ -70,7 +71,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 fb69a66..b864b85 100644
--- a/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
+++ b/src/main/java/net/shibboleth/ext/spring/error/ExtendedMappingExceptionResolver.java
@@ -65,13 +65,13 @@ public class ExtendedMappingExceptionResolver extends SimpleMappingExceptionReso
*
* @param extender function to obtain extensions to view model
*/
- public ExtendedMappingExceptionResolver(@Nonnull Function<HttpServletRequest,Map<String,Object>> extender) {
+ public ExtendedMappingExceptionResolver(@Nonnull final Function<HttpServletRequest,Map<String,Object>> extender) {
viewModelExtenderFunction = Constraint.isNotNull(extender, "Extender function cannot be null");
}
/** {@inheritDoc} */
- @Override
- protected ModelAndView getModelAndView(String viewName, Exception ex, HttpServletRequest request) {
+ @Override 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 f9efe08..74beb1c 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/DOMDocumentFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java
index caf10e9..55fece8 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java
@@ -61,8 +61,7 @@ public class DOMDocumentFactoryBean implements FactoryBean<Document> {
}
/** {@inheritDoc} */
- @Override
- @Nonnull public synchronized Document getObject() throws Exception {
+ @Override @Nonnull public synchronized Document getObject() throws Exception {
if (document == null) {
if (resource == null){
throw new BeanCreationException("Document resource must be provided in order to use this factory.");
@@ -81,14 +80,12 @@ public class DOMDocumentFactoryBean implements FactoryBean<Document> {
}
/** {@inheritDoc} */
- @Override
- @Nonnull public Class<?> getObjectType() {
+ @Override @Nonnull public Class<?> getObjectType() {
return Document.class;
}
/** {@inheritDoc} */
- @Override
- public boolean isSingleton() {
+ @Override public boolean isSingleton() {
return true;
}
}
\ No newline at end of file
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 ea6a5f7..8251d28 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 eb77e40..d7045d3 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);
}
@@ -79,10 +79,10 @@ public class FileCachingHttpClientFactoryBean extends HttpClientFactoryBean impl
/** {@inheritDoc} */
@Override
protected HttpClient doCreateInstance() throws Exception {
- HttpClient client = super.doCreateInstance();
+ final HttpClient client = super.doCreateInstance();
synchronized(this) {
if (client instanceof InitializableComponent) {
- InitializableComponent component = (InitializableComponent) client;
+ final InitializableComponent component = (InitializableComponent) client;
if (!component.isInitialized()) {
component.initialize();
}
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 5d6ff5a..33e95e2 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/factory/PrivateKeyFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
index c124399..872a9e0 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
@@ -66,7 +66,7 @@ public class PrivateKeyFactoryBean implements FactoryBean<PrivateKey> {
}
/** {@inheritDoc} */
- public PrivateKey getObject() throws Exception {
+ @Override public PrivateKey getObject() throws Exception {
if (key == null) {
if (resource == null) {
throw new BeanCreationException("Private key resource must be provided in order to use this factory.");
@@ -85,12 +85,12 @@ public class PrivateKeyFactoryBean implements FactoryBean<PrivateKey> {
}
/** {@inheritDoc} */
- @Nonnull public Class<?> getObjectType() {
+ @Override @Nonnull public Class<?> getObjectType() {
return PrivateKey.class;
}
/** {@inheritDoc} */
- public boolean isSingleton() {
+ @Override public boolean isSingleton() {
return true;
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
index e1f0bc1..64a4c98 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
@@ -52,7 +52,7 @@ public class PublicKeyFactoryBean implements FactoryBean<PublicKey> {
}
/** {@inheritDoc} */
- public PublicKey getObject() throws Exception {
+ @Override public PublicKey getObject() throws Exception {
if (key == null) {
if (resource == null) {
throw new BeanCreationException("Public key resource must be provided in order to use this factory.");
@@ -67,12 +67,12 @@ public class PublicKeyFactoryBean implements FactoryBean<PublicKey> {
}
/** {@inheritDoc} */
- @Nonnull public Class<?> getObjectType() {
+ @Override @Nonnull public Class<?> getObjectType() {
return PublicKey.class;
}
/** {@inheritDoc} */
- public boolean isSingleton() {
+ @Override public boolean isSingleton() {
return true;
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
index 63631ce..2ea27a9 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
@@ -52,7 +52,7 @@ public class X509CertificateChainFactoryBean implements FactoryBean<X509Certific
}
/** {@inheritDoc} */
- public X509Certificate[] getObject() throws Exception {
+ @Override public X509Certificate[] getObject() throws Exception {
if (certificates == null) {
if (resource == null) {
throw new BeanCreationException(
@@ -60,7 +60,7 @@ public class X509CertificateChainFactoryBean implements FactoryBean<X509Certific
}
try (InputStream is = resource.getInputStream()) {
- certificates = (X509Certificate[]) CertUtil.readCertificateChain(is);
+ certificates = CertUtil.readCertificateChain(is);
}
}
@@ -68,12 +68,12 @@ public class X509CertificateChainFactoryBean implements FactoryBean<X509Certific
}
/** {@inheritDoc} */
- @Nonnull public Class<?> getObjectType() {
+ @Override @Nonnull public Class<?> getObjectType() {
return X509Certificate.class;
}
/** {@inheritDoc} */
- public boolean isSingleton() {
+ @Override public boolean isSingleton() {
return true;
}
}
\ No newline at end of file
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java
index ab3cbfa..cbe3386 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java
@@ -52,14 +52,14 @@ public class X509CertificateFactoryBean implements FactoryBean<X509Certificate>
}
/** {@inheritDoc} */
- public X509Certificate getObject() throws Exception {
+ @Override public X509Certificate getObject() throws Exception {
if (certificate == null) {
if (resource == null) {
throw new BeanCreationException("Certificate resource must be provided in order to use this factory.");
}
try (InputStream is = resource.getInputStream()) {
- certificate = (X509Certificate) CertUtil.readCertificate(is);
+ certificate = CertUtil.readCertificate(is);
}
}
@@ -67,12 +67,12 @@ public class X509CertificateFactoryBean implements FactoryBean<X509Certificate>
}
/** {@inheritDoc} */
- @Nonnull public Class<?> getObjectType() {
+ @Override @Nonnull public Class<?> getObjectType() {
return X509Certificate.class;
}
/** {@inheritDoc} */
- public boolean isSingleton() {
+ @Override public boolean isSingleton() {
return true;
}
}
\ No newline at end of file
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 6e9dfb2..0a1d7cb 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/FileBackedHTTPResource.java
@@ -61,8 +61,8 @@ public class FileBackedHTTPResource extends HTTPResource {
* @param resource the file to use as backing store
* @throws IOException if the URL was badly formed
* @deprecated use {@link #FileBackedHTTPResource(String, HttpClient, String) */
- @Deprecated public FileBackedHTTPResource(@Nonnull HttpClient client, @NotEmpty @Nonnull String url,
- @Nonnull Resource resource) throws IOException {
+ @Deprecated public FileBackedHTTPResource(@Nonnull final HttpClient client, @NotEmpty @Nonnull final String url,
+ @Nonnull final Resource resource) throws IOException {
super(client, url);
backingResource = Constraint.isNotNull(resource, "Backing resource must not be null");
if (null == resource.getFile()) {
@@ -80,8 +80,8 @@ public class FileBackedHTTPResource extends HTTPResource {
* @param resource the file to use as backing store
* @throws IOException if the URL was badly formed
* @deprecated use {@link #FileBackedHTTPResource(String, HttpClient, URL) */
- @Deprecated public FileBackedHTTPResource(@Nonnull HttpClient client, @Nonnull URL url, @Nonnull Resource resource)
- throws IOException {
+ @Deprecated public FileBackedHTTPResource(@Nonnull final HttpClient client, @Nonnull final URL url,
+ @Nonnull final Resource resource) throws IOException {
super(client, url);
backingResource = Constraint.isNotNull(resource, "Backing resource must not be null");
if (null == resource.getFile()) {
@@ -97,8 +97,8 @@ public class FileBackedHTTPResource extends HTTPResource {
* @param url URL to the remote data
* @throws IOException if the URL was badly formed
*/
- public FileBackedHTTPResource(@Nonnull String backingFile, @Nonnull HttpClient client,
- @NotEmpty @Nonnull String url) throws IOException {
+ public FileBackedHTTPResource(@Nonnull final String backingFile, @Nonnull final HttpClient client,
+ @NotEmpty @Nonnull final String url) throws IOException {
super(client, url);
Constraint.isNotNull(backingFile, "File Name must not be null");
final File file = new File(backingFile);
@@ -113,8 +113,8 @@ public class FileBackedHTTPResource extends HTTPResource {
* @param url URL to the remote data
* @throws IOException if the URL was badly formed
*/
- public FileBackedHTTPResource(@Nonnull String backingFile, @Nonnull HttpClient client, @Nonnull URL url)
- throws IOException {
+ public FileBackedHTTPResource(@Nonnull final String backingFile, @Nonnull final HttpClient client,
+ @Nonnull final URL url) throws IOException {
super(client, url);
Constraint.isNotNull(backingFile, "File Name must not be null");
final File file = new File(backingFile);
@@ -129,13 +129,13 @@ 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 {
- FileOutputStream out = new FileOutputStream(backingResource.getFile());
+ protected InputStream saveAndClone(final InputStream input) throws IOException {
+ final FileOutputStream out = new FileOutputStream(backingResource.getFile());
try {
log.debug("{}: Copying file.", getDescription());
ByteStreams.copy(input, out);
log.debug("{}: Copy done.", getDescription());
- } catch (IOException e) {
+ } catch (final IOException e) {
// try to tidy up
backingResource.getFile().delete();
log.error("{}: Copy failed", getDescription(), e);
@@ -152,12 +152,12 @@ public class FileBackedHTTPResource extends HTTPResource {
try {
final InputStream stream = super.getInputStream();
return saveAndClone(stream);
- } catch (IOException ex) {
+ } catch (final IOException ex) {
log.debug("{} Error obtaining HTTPResource InputStream or creating backing file", getDescription(), ex);
log.warn("{} HTTP resource was inaccessible for getInputStream(), trying backing file.", getDescription());
try {
return new FileInputStream(backingResource.getFile());
- } catch (IOException e) {
+ } catch (final IOException e) {
log.error("FileBackedHTTPResource {}: Could not read backing file", getDescription(), e);
throw e;
}
@@ -171,11 +171,11 @@ public class FileBackedHTTPResource extends HTTPResource {
final HttpResponse response;
try {
response = getResourceHeaders();
- } catch (IOException e) {
+ } catch (final IOException e) {
log.info("{}: Could not reach URL, trying file", getDescription(), e);
return backingResource.exists();
}
- int httpStatusCode = response.getStatusLine().getStatusCode();
+ final int httpStatusCode = response.getStatusLine().getStatusCode();
if (httpStatusCode == HttpStatus.SC_OK) {
return true;
@@ -188,7 +188,7 @@ public class FileBackedHTTPResource extends HTTPResource {
try {
return super.contentLength();
- } catch (IOException e) {
+ } catch (final IOException e) {
log.info("{}: Could not reach URL, trying file", getDescription(), e);
return backingResource.contentLength();
}
@@ -198,7 +198,7 @@ public class FileBackedHTTPResource extends HTTPResource {
@Override public long lastModified() throws IOException {
try {
return super.lastModified();
- } catch (IOException e) {
+ } catch (final IOException e) {
log.info("{}: Could not reach URL, trying file", getDescription(), e);
return backingResource.lastModified();
}
@@ -215,7 +215,7 @@ public class FileBackedHTTPResource extends HTTPResource {
String urlAsString;
try {
urlAsString = getURL().toString();
- } catch (IOException e) {
+ } catch (final IOException e) {
urlAsString = "<unknown>";
}
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 0daf1d9..57e31ab 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
@@ -82,7 +82,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
* @param url URL to the remote data
* @throws IOException if the URL was badly formed
*/
- public HTTPResource(@Nonnull HttpClient client, @NotEmpty @Nonnull String url) throws IOException {
+ public HTTPResource(@Nonnull final HttpClient client, @NotEmpty @Nonnull final String url) throws IOException {
httpClient = Constraint.isNotNull(client, "The Client must not be null");
final String trimmedAddress =
Constraint.isNotNull(StringSupport.trimOrNull(url), "Provided URL must be non empty and non null");
@@ -97,7 +97,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
* @param url URL to the remote data
* @throws IOException if the URL was badly formed
*/
- public HTTPResource(@Nonnull HttpClient client, @Nonnull URL url) throws IOException {
+ public HTTPResource(@Nonnull final HttpClient client, @Nonnull final URL url) throws IOException {
httpClient = Constraint.isNotNull(client, "The Client must not be null");
resourceURL = Constraint.isNotNull(url, "Provided URL must be non empty and non null");
@@ -109,7 +109,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
* @return a new instance of {@link HttpCacheContext}
*/
protected HttpCacheContext buildHttpClientContext() {
- HttpCacheContext context = HttpCacheContext.create();
+ final HttpCacheContext context = HttpCacheContext.create();
if (credentialsProvider != null) {
context.setCredentialsProvider(credentialsProvider);
}
@@ -121,8 +121,8 @@ 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) {
- CacheResponseStatus responseStatus = context.getCacheResponseStatus();
+ protected void reportCachingStatus(final HttpCacheContext context) {
+ final CacheResponseStatus responseStatus = context.getCacheResponseStatus();
if (null == responseStatus) {
log.debug("Non caching client provided");
return;
@@ -156,10 +156,10 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
log.debug("Attempting to get data from remote resource '{}'", resourceURL);
response = httpClient.execute(httpGet, context);
reportCachingStatus(context);
- int httpStatusCode = response.getStatusLine().getStatusCode();
+ final int httpStatusCode = response.getStatusLine().getStatusCode();
if (httpStatusCode != HttpStatus.SC_OK) {
- String errMsg =
+ final String errMsg =
"Non-ok status code " + httpStatusCode + " returned from remote resource " + resourceURL;
log.error(errMsg);
closeResponse(response);
@@ -186,10 +186,10 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
final HttpResponse response;
try {
response = getResourceHeaders();
- } catch (IOException e) {
+ } catch (final IOException e) {
return false;
}
- int httpStatusCode = response.getStatusLine().getStatusCode();
+ final int httpStatusCode = response.getStatusLine().getStatusCode();
return httpStatusCode == HttpStatus.SC_OK;
}
@@ -213,7 +213,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
@Override public URI getURI() throws IOException {
try {
return resourceURL.toURI();
- } catch (URISyntaxException ex) {
+ } catch (final URISyntaxException ex) {
throw new NestedIOException("Invalid URI [" + resourceURL + "]", ex);
}
}
@@ -233,7 +233,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
* @throws IOException thrown if there is a problem contacting the resource
*/
protected HttpResponse getResourceHeaders() throws IOException {
- HttpUriRequest httpRequest = new HttpGet(resourceURL.toExternalForm());
+ final HttpUriRequest httpRequest = new HttpGet(resourceURL.toExternalForm());
HttpResponse httpResponse = null;
try {
@@ -242,7 +242,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
reportCachingStatus(context);
EntityUtils.consume(httpResponse.getEntity());
return httpResponse;
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new IOException("Error contacting remote resource " + resourceURL.toString(), e);
} finally {
closeResponse(httpResponse);
@@ -256,12 +256,12 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
* @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);
response = getResourceHeaders();
- int httpStatusCode = response.getStatusLine().getStatusCode();
+ final int httpStatusCode = response.getStatusLine().getStatusCode();
if (httpStatusCode != HttpStatus.SC_OK) {
final String errMsg =
@@ -280,7 +280,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
/** {@inheritDoc} */
@Override public long contentLength() throws IOException {
- String response = getResponseHeader(HttpHeaders.CONTENT_LENGTH);
+ final String response = getResponseHeader(HttpHeaders.CONTENT_LENGTH);
if (null != response) {
return Long.parseLong(response);
}
@@ -292,7 +292,7 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
/** {@inheritDoc} */
@Override public long lastModified() throws IOException {
- String response = getResponseHeader(HttpHeaders.LAST_MODIFIED);
+ final String response = getResponseHeader(HttpHeaders.LAST_MODIFIED);
if (null != response) {
return DateUtils.parseDate(response).getTime();
}
@@ -370,17 +370,19 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
* @param httpResponse HTTP method that was invoked
* @throws IOException if there is a problem getting the entity content input stream from the response
*/
- public ConnectionClosingInputStream(HttpResponse httpResponse) throws IOException {
+ public ConnectionClosingInputStream(final HttpResponse httpResponse) throws IOException {
response = httpResponse;
stream = response.getEntity().getContent();
}
/** {@inheritDoc} */
+ @Override
public int available() throws IOException {
return stream.available();
}
/** {@inheritDoc} */
+ @Override
public void close() throws IOException {
stream.close();
if (response instanceof CloseableHttpResponse) {
@@ -389,37 +391,44 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
}
/** {@inheritDoc} */
- public void mark(int readLimit) {
+ @Override
+ public void mark(final int readLimit) {
stream.mark(readLimit);
}
/** {@inheritDoc} */
+ @Override
public boolean markSupported() {
return stream.markSupported();
}
/** {@inheritDoc} */
+ @Override
public int read() throws IOException {
return stream.read();
}
/** {@inheritDoc} */
- public int read(byte[] b) throws IOException {
+ @Override
+ public int read(final byte[] b) throws IOException {
return stream.read(b);
}
/** {@inheritDoc} */
- public int read(byte[] b, int off, int len) throws IOException {
+ @Override
+ public int read(final byte[] b, final int off, final int len) throws IOException {
return stream.read(b, off, len);
}
/** {@inheritDoc} */
+ @Override
public synchronized void reset() throws IOException {
stream.reset();
}
/** {@inheritDoc} */
- public long skip(long n) throws IOException {
+ @Override
+ 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 40d6dc8..9371e02 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 f16485f..a44a090 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/ResourceHelper.java
@@ -42,7 +42,7 @@ public final class ResourceHelper implements net.shibboleth.utilities.java.suppo
*
* @param theResource the spring resource;
*/
- private ResourceHelper(@Nonnull Resource theResource) {
+ private ResourceHelper(@Nonnull final Resource theResource) {
springResource = Constraint.isNotNull(theResource, "provided Spring Resource should not be null");
}
@@ -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/SVNResource.java b/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
index 70dd9c3..0c6d61b 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/SVNResource.java
@@ -95,8 +95,8 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
*
* @throws BeanCreationException thrown if there is a problem initializing the SVN resource
*/
- public SVNResource(SVNClientManager svnClientMgr, SVNURL repositoryUrl, File workingCopy, long workingRevision,
- String resourceFile) {
+ public SVNResource(final SVNClientManager svnClientMgr, final SVNURL repositoryUrl,
+ final File workingCopy, final long workingRevision, final String resourceFile) {
DAVRepositoryFactory.setup();
SVNRepositoryFactoryImpl.setup();
FSRepositoryFactory.setup();
@@ -114,7 +114,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
try {
checkWorkingCopyDirectory(workingCopy);
workingCopyDirectory = workingCopy;
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new BeanCreationException(e.getMessage());
}
@@ -132,7 +132,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
log.error("Resource file " + resourceFile + " does not exist in SVN working copy directory "
+ workingCopy.getAbsolutePath());
}
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new BeanCreationException(e.getMessage());
}
}
@@ -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,14 +186,14 @@ 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");
}
if (!directory.exists()) {
- boolean created = directory.mkdirs();
+ final boolean created = directory.mkdirs();
if (!created) {
final String msg = "SVN working copy directory " + directory.getAbsolutePath()
+ " does not exist and could not be created";
@@ -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,
@@ -361,7 +361,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
try {
checkoutOrUpdateResource();
return getFile().exists();
- } catch (IOException e) {
+ } catch (final IOException e) {
return false;
}
}
@@ -391,7 +391,7 @@ public class SVNResource extends AbstractIdentifiedInitializableComponent implem
try {
return new URI(getProtocol(), null, remoteRepository.getHost(), remoteRepository.getPort(), getFullPath(),
null, null);
- } catch (URISyntaxException e) {
+ } catch (final URISyntaxException e) {
throw new IOException(e);
}
}
@@ -413,19 +413,19 @@ 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");
}
/** {@inheritDoc} */
@Override public String getDescription() {
- StringBuffer sb = new StringBuffer("SVN Resource: ");
+ final StringBuffer sb = new StringBuffer("SVN Resource: ");
return sb.append(getFullPath()).toString();
}
@@ -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 f2a29e0..d73615f 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 73eecc0..0b8c6e9 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 427bc89..b3c7b51 100644
--- a/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
+++ b/src/main/java/net/shibboleth/ext/spring/service/ReloadableSpringService.java
@@ -111,7 +111,7 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
*
* @param claz The interface being implemented.
*/
- public ReloadableSpringService(@Nonnull Class<T> claz) {
+ public ReloadableSpringService(@Nonnull final Class<T> claz) {
this(claz, new ClassBasedServiceStrategy());
}
@@ -121,8 +121,8 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
* @param claz The interface being implemented.
* @param strategy the strategy to use to look up servicable component to look for.
*/
- public ReloadableSpringService(@Nonnull Class<T> claz,
- @Nonnull Function<GenericApplicationContext, ServiceableComponent> strategy) {
+ public ReloadableSpringService(@Nonnull final Class<T> claz,
+ @Nonnull final Function<GenericApplicationContext, ServiceableComponent> strategy) {
theClaz = Constraint.isNotNull(claz, "Class cannot be null");
serviceStrategy = Constraint.isNotNull(strategy, "Strategy cannot be null");
factoryPostProcessors = Collections.emptyList();
@@ -176,7 +176,7 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
if (!serviceConfigurations.isEmpty()) {
resourceLastModifiedTimes = new long[serviceConfigurations.size()];
- int numOfResources = serviceConfigurations.size();
+ final int numOfResources = serviceConfigurations.size();
Resource serviceConfig;
for (int i = 0; i < numOfResources; i++) {
serviceConfig = serviceConfigurations.get(i);
@@ -237,7 +237,7 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
public final void start() {
try {
initialize();
- } catch (ComponentInitializationException e) {
+ } catch (final ComponentInitializationException e) {
throw new BeanInitializationException("Could not start service", e);
}
}
@@ -273,7 +273,7 @@ public class ReloadableSpringService<T> extends AbstractReloadableService<T> imp
}
boolean configResourceChanged = false;
- int numOfResources = serviceConfigurations.size();
+ final int numOfResources = serviceConfigurations.size();
Resource serviceConfig;
long serviceConfigLastModified;
@@ -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 2acd44a..33bf213 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/BaseSpringNamespaceHandler.java
@@ -77,8 +77,7 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
*
* @return the decorated bean definition
*/
- @Override
- public BeanDefinitionHolder decorate(final Node node, final BeanDefinitionHolder definition,
+ @Override public BeanDefinitionHolder decorate(final Node node, final BeanDefinitionHolder definition,
final ParserContext parserContext) {
return findDecoratorForNode(node).decorate(node, definition, parserContext);
}
@@ -92,8 +91,7 @@ public abstract class BaseSpringNamespaceHandler implements NamespaceHandler {
*
* @return the bean definition created from the given element
*/
- @Override
- public BeanDefinition parse(final Element element, final ParserContext parserContext) {
+ @Override public BeanDefinition parse(final Element element, final ParserContext parserContext) {
return findParserForElement(element).parse(element, parserContext);
}
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 c9de398..a784014 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
@@ -44,14 +44,12 @@ public class SchemaTypeAwareBeanDefinitionParserDelegate extends BeanDefinitionP
}
/** {@inheritDoc} */
- @Override
- public BeanDefinition parseCustomElement(final Element element) {
+ @Override public BeanDefinition parseCustomElement(final Element element) {
return parseCustomElement(element, null);
}
/** {@inheritDoc} */
- @Override
- public BeanDefinition parseCustomElement(final Element element, final BeanDefinition containingBd) {
+ @Override public BeanDefinition parseCustomElement(final Element element, final BeanDefinition containingBd) {
String namespaceUri = element.getNamespaceURI();
if (DOMTypeSupport.hasXSIType(element)) {
namespaceUri = DOMTypeSupport.getXSIType(element).getNamespaceURI();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list