Polishing

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryUtils.java

@@ -139,7 +139,7 @@ public static String[] beanNamesIncludingAncestors(ListableBeanFactory lbf) {
 	 * @param type the type that beans must match
 	 * @return the array of matching bean names, or an empty array if none
 	 */
-	public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lbf, Class type) {
+	public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lbf, Class<?> type) {
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type);
 		if (lbf instanceof HierarchicalBeanFactory) {
@@ -181,7 +181,7 @@ public static String[] beanNamesForTypeIncludingAncestors(ListableBeanFactory lb
 	 * @return the array of matching bean names, or an empty array if none
 	 */
 	public static String[] beanNamesForTypeIncludingAncestors(
-			ListableBeanFactory lbf, Class type, boolean includeNonSingletons, boolean allowEagerInit) {
+			ListableBeanFactory lbf, Class<?> type, boolean includeNonSingletons, boolean allowEagerInit) {
 
 		Assert.notNull(lbf, "ListableBeanFactory must not be null");
 		String[] result = lbf.getBeanNamesForType(type, includeNonSingletons, allowEagerInit);

spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,12 +51,12 @@
  * an {@code XMLEventReader}, and calls the corresponding methods on the SAX callback interfaces.
  *
  * @author Arjen Poutsma
+ * @since 3.0
  * @see XMLEventReader
  * @see #setContentHandler(org.xml.sax.ContentHandler)
  * @see #setDTDHandler(org.xml.sax.DTDHandler)
  * @see #setEntityResolver(org.xml.sax.EntityResolver)
  * @see #setErrorHandler(org.xml.sax.ErrorHandler)
- * @since 3.0
  */
 class StaxEventXMLReader extends AbstractStaxXMLReader {
 
@@ -70,11 +70,11 @@ class StaxEventXMLReader extends AbstractStaxXMLReader {
 
 	private String encoding;
 
+
 	/**
 	 * Constructs a new instance of the {@code StaxEventXmlReader} that reads from the given
 	 * {@code XMLEventReader}. The supplied event reader must be in {@code XMLStreamConstants.START_DOCUMENT} or
 	 * {@code XMLStreamConstants.START_ELEMENT} state.
-	 *
 	 * @param reader the {@code XMLEventReader} to read from
 	 * @throws IllegalStateException if the reader is not at the start of a document or element
 	 */
@@ -89,17 +89,17 @@ class StaxEventXMLReader extends AbstractStaxXMLReader {
 		catch (XMLStreamException ex) {
 			throw new IllegalStateException("Could not read first element: " + ex.getMessage());
 		}
-
 		this.reader = reader;
 	}
 
+
 	@Override
 	protected void parseInternal() throws SAXException, XMLStreamException {
 		boolean documentStarted = false;
 		boolean documentEnded = false;
 		int elementDepth = 0;
-		while (reader.hasNext() && elementDepth >= 0) {
-			XMLEvent event = reader.nextEvent();
+		while (this.reader.hasNext() && elementDepth >= 0) {
+			XMLEvent event = this.reader.nextEvent();
 			if (!event.isStartDocument() && !event.isEndDocument() && !documentStarted) {
 				handleStartDocument(event);
 				documentStarted = true;
@@ -165,42 +165,34 @@ private void handleStartDocument(final XMLEvent event) throws SAXException {
 				this.encoding = startDocument.getCharacterEncodingScheme();
 			}
 		}
-
 		if (getContentHandler() != null) {
 			final Location location = event.getLocation();
 			getContentHandler().setDocumentLocator(new Locator2() {
-
 				@Override
 				public int getColumnNumber() {
-					return location != null ? location.getColumnNumber() : -1;
+					return (location != null ? location.getColumnNumber() : -1);
 				}
-
 				@Override
 				public int getLineNumber() {
-					return location != null ? location.getLineNumber() : -1;
+					return (location != null ? location.getLineNumber() : -1);
 				}
-
 				@Override
 				public String getPublicId() {
-					return location != null ? location.getPublicId() : null;
+					return (location != null ? location.getPublicId() : null);
 				}
-
 				@Override
 				public String getSystemId() {
-					return location != null ? location.getSystemId() : null;
+					return (location != null ? location.getSystemId() : null);
 				}
-
 				@Override
 				public String getXMLVersion() {
 					return xmlVersion;
 				}
-
 				@Override
 				public String getEncoding() {
 					return encoding;
 				}
 			});
-
 			getContentHandler().startDocument();
 		}
 	}
@@ -317,7 +309,6 @@ private void handleEntityReference(EntityReference reference) throws SAXExceptio
 
 	private Attributes getAttributes(StartElement event) {
 		AttributesImpl attributes = new AttributesImpl();
-
 		for (Iterator i = event.getAttributes(); i.hasNext();) {
 			Attribute attribute = (Attribute) i.next();
 			QName qName = attribute.getName();
@@ -329,8 +320,7 @@ private Attributes getAttributes(StartElement event) {
 			if (type == null) {
 				type = "CDATA";
 			}
-			attributes
-					.addAttribute(namespace, qName.getLocalPart(), toQualifiedName(qName), type, attribute.getValue());
+			attributes.addAttribute(namespace, qName.getLocalPart(), toQualifiedName(qName), type, attribute.getValue());
 		}
 		if (hasNamespacePrefixesFeature()) {
 			for (Iterator i = event.getNamespaces(); i.hasNext();) {