Polishing

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,11 +49,12 @@ public BeanInstantiationException(Class<?> beanClass, String msg, Throwable caus
 		this.beanClass = beanClass;
 	}
 
+
 	/**
 	 * Return the offending bean class.
 	 */
 	public Class<?> getBeanClass() {
-		return beanClass;
+		return this.beanClass;
 	}
 
 }

spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java

@@ -399,8 +399,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 	//---------------------------------------------------------------------
 
 	/**
-	 * Kick off bean registration automatically when deployed in an
-	 * {@code ApplicationContext}.
+	 * Kick off bean registration automatically when deployed in an {@code ApplicationContext}.
 	 * @see #registerBeans()
 	 */
 	@Override

spring-core/src/main/java/org/springframework/util/MimeType.java

@@ -64,7 +64,7 @@ public class MimeType implements Comparable<MimeType>, Serializable {
 	static {
 		// variable names refer to RFC 2616, section 2.2
 		BitSet ctl = new BitSet(128);
-		for (int i=0; i <= 31; i++) {
+		for (int i = 0; i <= 31; i++) {
 			ctl.set(i);
 		}
 		ctl.set(127);
@@ -155,14 +155,14 @@ public MimeType(String type, String subtype, Map<String, String> parameters) {
 		this.type = type.toLowerCase(Locale.ENGLISH);
 		this.subtype = subtype.toLowerCase(Locale.ENGLISH);
 		if (!CollectionUtils.isEmpty(parameters)) {
-			Map<String, String> m = new LinkedCaseInsensitiveMap<String>(parameters.size(), Locale.ENGLISH);
+			Map<String, String> map = new LinkedCaseInsensitiveMap<String>(parameters.size(), Locale.ENGLISH);
 			for (Map.Entry<String, String> entry : parameters.entrySet()) {
 				String attribute = entry.getKey();
 				String value = entry.getValue();
 				checkParameters(attribute, value);
-				m.put(attribute, value);
+				map.put(attribute, value);
 			}
-			this.parameters = Collections.unmodifiableMap(m);
+			this.parameters = Collections.unmodifiableMap(map);
 		}
 		else {
 			this.parameters = Collections.emptyMap();
@@ -256,7 +256,7 @@ public String getSubtype() {
 
 	/**
 	 * Return the character set, as indicated by a {@code charset} parameter, if any.
-	 * @return the character set; or {@code null} if not available
+	 * @return the character set, or {@code null} if not available
 	 */
 	public Charset getCharSet() {
 		String charSet = getParameter(PARAM_CHARSET);
@@ -266,18 +266,18 @@ public Charset getCharSet() {
 	/**
 	 * Return a generic parameter value, given a parameter name.
 	 * @param name the parameter name
-	 * @return the parameter value; or {@code null} if not present
+	 * @return the parameter value, or {@code null} if not present
 	 */
 	public String getParameter(String name) {
 		return this.parameters.get(name);
 	}
 
 	/**
 	 * Return all generic parameter values.
-	 * @return a read-only map, possibly empty, never {@code null}
+	 * @return a read-only map (possibly empty, never {@code null})
 	 */
 	public Map<String, String> getParameters() {
-			return parameters;
+		return this.parameters;
 	}
 
 	/**

spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java

@@ -102,7 +102,7 @@ public void findMethodAnnotationOnBridgeMethod() throws Exception {
 	@Test
 	public void findAnnotationFavorsInterfacesOverLocalMetaAnnotations() {
 		Component component = AnnotationUtils.findAnnotation(
-			ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class, Component.class);
+				ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface.class, Component.class);
 		assertNotNull(component);
 
 		// By inspecting ClassWithLocalMetaAnnotationAndMetaAnnotatedInterface, one
@@ -116,8 +116,8 @@ public void findAnnotationFavorsInterfacesOverLocalMetaAnnotations() {
 	 */
 	@Test
 	public void findAnnotationFavorsInheritedAnnotationsOverMoreLocallyDeclaredComposedAnnotations() {
-		Transactional transactional = AnnotationUtils.findAnnotation(SubSubClassWithInheritedAnnotation.class,
-			Transactional.class);
+		Transactional transactional = AnnotationUtils.findAnnotation(
+				SubSubClassWithInheritedAnnotation.class, Transactional.class);
 		assertNotNull(transactional);
 		assertTrue("readOnly flag for SubSubClassWithInheritedAnnotation", transactional.readOnly());
 	}
@@ -127,8 +127,8 @@ public void findAnnotationFavorsInheritedAnnotationsOverMoreLocallyDeclaredCompo
 	 */
 	@Test
 	public void findAnnotationFavorsInheritedComposedAnnotationsOverMoreLocallyDeclaredComposedAnnotations() {
-		Component component = AnnotationUtils.findAnnotation(SubSubClassWithInheritedMetaAnnotation.class,
-			Component.class);
+		Component component = AnnotationUtils.findAnnotation(
+				SubSubClassWithInheritedMetaAnnotation.class, Component.class);
 		assertNotNull(component);
 		assertEquals("meta2", component.value());
 	}

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHandle.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2005 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,13 @@
 
 /**
  * Simple interface to be implemented by handles for a JDBC Connection.
- * Used by JdoDialect, for example.
+ * Used by JpaDialect and JdoDialect, for example.
  *
  * @author Juergen Hoeller
  * @since 1.1
  * @see SimpleConnectionHandle
  * @see ConnectionHolder
+ * @see org.springframework.orm.jdo.JpaDialect#getJdbcConnection
  * @see org.springframework.orm.jdo.JdoDialect#getJdbcConnection
  */
 public interface ConnectionHandle {

spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractColumnMaxValueIncrementer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 /**
  * Abstract base class for {@link DataFieldMaxValueIncrementer} implementations that use
  * a column in a custom sequence table. Subclasses need to provide the specific handling
- * of that table in their {@link #getNextKey()} implementation..
+ * of that table in their {@link #getNextKey()} implementation.
  *
  * @author Juergen Hoeller
  * @since 2.5.3

spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/package-info.java

@@ -1,9 +1,5 @@
-
 /**
- *
- * Support package for the Hibernate3 Annotation add-on,
- * which supports EJB3-compliant JDK 1.5+ annotations for mappings.
- *
+ * Support package for the Hibernate 3 Annotation add-on,
+ * which supports JPA-compliant Java 5+ annotations for mappings.
  */
 package org.springframework.orm.hibernate3.annotation;
-

spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -244,8 +244,8 @@ protected DataAccessException convertHibernateAccessException(HibernateException
 		return new JpaSystemException(ex);
 	}
 
-	protected Session getSession(EntityManager em) {
-		return em.unwrap(Session.class);
+	protected Session getSession(EntityManager entityManager) {
+		return entityManager.unwrap(Session.class);
 	}
 
 
@@ -270,14 +270,14 @@ public void resetFlushMode() {
 
 	private static class HibernateConnectionHandle implements ConnectionHandle {
 
-		private final Session session;
-
 		// This will find a corresponding method on Hibernate 3.x but not on 4.x
 		private static final Method sessionConnectionMethod =
 				ClassUtils.getMethodIfAvailable(Session.class, "connection");
 
 		private static volatile Method connectionMethodToUse = sessionConnectionMethod;
 
+		private final Session session;
+
 		public HibernateConnectionHandle(Session session) {
 			this.session = session;
 		}
@@ -286,7 +286,7 @@ public HibernateConnectionHandle(Session session) {
 		public Connection getConnection() {
 			try {
 				if (connectionMethodToUse == null) {
-					// Reflective lookup trying to find SessionImpl's connection() on Hibernate 4.x
+					// Reflective lookup to find SessionImpl's connection() method on Hibernate 4.x
 					connectionMethodToUse = this.session.getClass().getMethod("connection");
 				}
 				return (Connection) ReflectionUtils.invokeMethod(connectionMethodToUse, this.session);

spring-oxm/src/main/java/org/springframework/oxm/mime/package-info.java

@@ -1,9 +1,4 @@
-
 /**
- *
  * Contains (un)marshallers optimized to store binary data in MIME attachments.
- * </htm
- *
  */
 package org.springframework.oxm.mime;
-

spring-oxm/src/main/java/org/springframework/oxm/support/package-info.java

@@ -1,11 +1,7 @@
-
 /**
- *
- * Provides generic support classes for using Spring's O/X Mapping integration within various scenario's. Includes the
- * MarshallingSource for compatibility with TrAX, MarshallingView for use withing Spring Web MVC, and the
+ * Provides generic support classes for using Spring's O/X Mapping integration
+ * within various scenario's. Includes the MarshallingSource for compatibility
+ * with TrAX, MarshallingView for use withing Spring Web MVC, and the
  * MarshallingMessageConverter for use within Spring's JMS support.
- * </htm
- *
  */
 package org.springframework.oxm.support;
-