[spring-extensions] branch master updated: Auto-add some finals
Rod Widdowson
rdw at steadingsoftware.com
Tue Sep 6 11:14:38 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=c14b32babe2a8cd3f62c4663b3483396fbbc5ab4
The following commit(s) were added to refs/heads/master by this push:
new c14b32b Auto-add some finals
c14b32b is described below
commit c14b32babe2a8cd3f62c4663b3483396fbbc5ab4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Sep 6 16:14:12 2016 +0100
Auto-add some finals
---
.../ext/spring/util/BaseSpringNamespaceHandler.java | 19 +++++++++++--------
.../SchemaTypeAwareBeanDefinitionDocumentReader.java | 6 +++---
.../SchemaTypeAwareBeanDefinitionParserDelegate.java | 8 ++++----
.../util/SchemaTypeAwareXMLBeanDefinitionReader.java | 2 +-
.../net/shibboleth/ext/spring/util/SpringSupport.java | 12 ++++++------
5 files changed, 25 insertions(+), 22 deletions(-)
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..b791d30 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,10 +105,10 @@ 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);
+ final QName typeName = DOMTypeSupport.getXSIType(element);
if (typeName != null) {
log.trace("Attempting to find parser for element of type: {}", typeName);
parser = parsers.get(typeName);
@@ -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..a12b7e9 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionDocumentReader.java
@@ -30,9 +30,9 @@ public class SchemaTypeAwareBeanDefinitionDocumentReader extends DefaultBeanDefi
/** {@inheritDoc} */
@Override
- protected BeanDefinitionParserDelegate createDelegate(XmlReaderContext readerContext, Element root,
- BeanDefinitionParserDelegate parentDelegate) {
- BeanDefinitionParserDelegate delegate =
+ protected BeanDefinitionParserDelegate createDelegate(final XmlReaderContext readerContext, final Element root,
+ final BeanDefinitionParserDelegate parentDelegate) {
+ final BeanDefinitionParserDelegate delegate =
new SchemaTypeAwareBeanDefinitionParserDelegate(readerContext);
delegate.initDefaults(root, parentDelegate);
return delegate;
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..0f02471 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareBeanDefinitionParserDelegate.java
@@ -39,25 +39,25 @@ public class SchemaTypeAwareBeanDefinitionParserDelegate extends BeanDefinitionP
*
* @param readerContext current XML reader context
*/
- public SchemaTypeAwareBeanDefinitionParserDelegate(XmlReaderContext readerContext) {
+ public SchemaTypeAwareBeanDefinitionParserDelegate(final XmlReaderContext readerContext) {
super(readerContext);
}
/** {@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();
}
- NamespaceHandler handler = getReaderContext().getNamespaceHandlerResolver().resolve(namespaceUri);
+ final NamespaceHandler handler = getReaderContext().getNamespaceHandlerResolver().resolve(namespaceUri);
if (handler == null) {
error("Unable to locate NamespaceHandler for namespace [" + namespaceUri + "]", element);
return null;
diff --git a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareXMLBeanDefinitionReader.java b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareXMLBeanDefinitionReader.java
index 4a21402..388366a 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareXMLBeanDefinitionReader.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SchemaTypeAwareXMLBeanDefinitionReader.java
@@ -35,7 +35,7 @@ public class SchemaTypeAwareXMLBeanDefinitionReader extends XmlBeanDefinitionRea
*
* @param beanRegistry the bean definition registry that will be populated by this reader
*/
- public SchemaTypeAwareXMLBeanDefinitionReader(BeanDefinitionRegistry beanRegistry) {
+ public SchemaTypeAwareXMLBeanDefinitionReader(final BeanDefinitionRegistry beanRegistry) {
super(beanRegistry);
setDocumentReaderClass(SchemaTypeAwareBeanDefinitionDocumentReader.class);
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..d40fc7c 100644
--- a/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
+++ b/src/main/java/net/shibboleth/ext/spring/util/SpringSupport.java
@@ -125,7 +125,7 @@ public final class SpringSupport {
beanDefinitionReader.loadBeanDefinitions(configurationResources.toArray(new Resource[] {}));
if (initializers != null) {
- for (ApplicationContextInitializer initializer : initializers) {
+ for (final ApplicationContextInitializer initializer : initializers) {
initializer.initialize(context);
}
}
@@ -151,8 +151,8 @@ public final class SpringSupport {
return null;
}
- ManagedList<BeanDefinition> definitions = new ManagedList<>(elements.size());
- for (Element e : elements) {
+ final ManagedList<BeanDefinition> definitions = new ManagedList<>(elements.size());
+ for (final Element e : elements) {
if (e != null) {
definitions.add(parseCustomElement(e, parserContext));
}
@@ -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);
@@ -245,7 +245,7 @@ public final class SpringSupport {
try {
bean = beanFactory.getBean(clazz);
LOG.debug("created spring bean {}", bean);
- } catch (NoSuchBeanDefinitionException e) {
+ } catch (final NoSuchBeanDefinitionException e) {
LOG.debug("no spring bean configured of type {}", clazz);
}
return bean;
@@ -259,7 +259,7 @@ public final class SpringSupport {
* @return list of values, never null
*/
@Nonnull public static ManagedList<String> getAttributeValueAsManagedList(@Nullable final Attr attribute) {
- List<String> valuesAsList = AttributeSupport.getAttributeValueAsList(attribute);
+ final List<String> valuesAsList = AttributeSupport.getAttributeValueAsList(attribute);
final ManagedList<String> managedList = new ManagedList<>(valuesAsList.size());
managedList.addAll(valuesAsList);
return managedList;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list