Polishing

Author: poutsma

src/main/scala/org/springframework/scala/beans/factory/RichBeanFactory.scala

@@ -17,8 +17,7 @@
 package org.springframework.scala.beans.factory.config
 
 import org.springframework.beans.factory.config.AbstractFactoryBean
-import scala.collection.mutable.Builder
-import scala.collection.Map
+import scala.collection.{mutable, Map}
 
 /**
  * Simple factory for shared [[scala.collection.Map]] instances. Allows for central setup
@@ -30,7 +29,7 @@ import scala.collection.Map
  * @param builderFunction function used to create a new map builder
  */
 class MapFactoryBean[T, U](val sourceMap: Map[T, U],
-                           val builderFunction: () => Builder[(T, U), Map[T, U]])
+                           val builderFunction: () => mutable.Builder[(T, U), Map[T, U]])
 		extends AbstractFactoryBean[scala.collection.Map[T, U]] {
 
 	def this(sourceMap: Map[T, U]) {

src/main/scala/org/springframework/scala/beans/factory/RichListableBeanFactory.scala

@@ -1,8 +1,7 @@
 package org.springframework.scala.beans.factory.config
 
 import org.springframework.beans.factory.config.AbstractFactoryBean
-import scala.collection.mutable.Builder
-import scala.collection.Seq
+import scala.collection.{mutable, Seq}
 
 /**
  * Simple factory for shared [[scala.collection.Seq]] instances. Allows for central setup
@@ -14,7 +13,7 @@ import scala.collection.Seq
  * @param builderFunction function used to create a new sequence builder
  */
 class SeqFactoryBean[T](val sourceSeq: Seq[T],
-                        val builderFunction: () => Builder[T, Seq[T]])
+                        val builderFunction: () => mutable.Builder[T, Seq[T]])
 		extends AbstractFactoryBean[Seq[T]] {
 
 	def this(sourceSeq: Seq[T]) {

src/main/scala/org/springframework/scala/beans/factory/config/MapFactoryBean.scala

@@ -1,7 +1,7 @@
 package org.springframework.scala.beans.factory.config
 
 import org.springframework.beans.factory.config.AbstractFactoryBean
-import collection.mutable.Builder
+import scala.collection.mutable
 
 /**
  * Simple factory for shared [[scala.collection.Set]] instances. Allows for central setup
@@ -13,7 +13,7 @@ import collection.mutable.Builder
  * @param builderFunction function used to create a new set builder
  */
 class SetFactoryBean[T](val sourceSet: scala.collection.Set[T],
-                        val builderFunction: () => Builder[T, Set[T]])
+                        val builderFunction: () => mutable.Builder[T, Set[T]])
 		extends AbstractFactoryBean[scala.collection.Set[T]] {
 
 	def this(sourceSet: scala.collection.Set[T]) {

src/main/scala/org/springframework/scala/beans/factory/config/SeqFactoryBean.scala

@@ -19,9 +19,12 @@ package org.springframework.scala.beans.factory.function
 import org.springframework.beans.factory.support.GenericBeanDefinition
 
 /**
+ * Default implementation of
+ * [[org.springframework.scala.beans.factory.function.FunctionalBeanDefinition]].
+ *
  * @author Arjen Poutsma
  */
-class FunctionalGenericBeanDefinition[T](val beanFunction: () => T)
+class FunctionalGenericBeanDefinition[T](beanFunction: () => T)
 		extends GenericBeanDefinition with FunctionalBeanDefinition[T] {
 
 	setBeanClass(classOf[Function0Wrapper])

src/main/scala/org/springframework/scala/beans/factory/config/SetFactoryBean.scala

@@ -28,8 +28,8 @@ import scala.collection.mutable.{Set, MultiMap, SynchronizedMap, HashMap}
  * alternative to Spring's [[org.springframework.beans.factory.InitializingBean]]
  * and [[org.springframework.beans.factory.DisposableBean]] callback interfaces.
  *
- * Initialization functions are defined as `(T) => T`, i.e. a function that takes the bean
- * as parameter, and returns either the original bean or a wrapped one.
+ * Initialization functions are defined as `(T) => Unit`, i.e. a function that takes the
+ * bean as parameter, but does not return anything.
  *
  * Destruction functions are defined as `(T) => Unit`, i.e. a function that takes the bean
  * as parameter, but does not return anything.
@@ -61,8 +61,8 @@ class InitDestroyFunctionBeanPostProcessor
 	 * @tparam T the bean type
 	 */
 	def registerInitFunction[T](beanName: String, initFunction: (T) => Unit) {
-		Assert.hasLength(beanName, "'beanName' must not be empty");
-		Assert.notNull(initFunction, "'initFunction' must not be null");
+		Assert.hasLength(beanName, "'beanName' must not be empty")
+		Assert.notNull(initFunction, "'initFunction' must not be null")
 
 		initFunctions.addBinding(beanName, initFunction.asInstanceOf[Function1[Any, Unit]])
 	}
@@ -78,8 +78,8 @@ class InitDestroyFunctionBeanPostProcessor
 	 * @tparam T the bean type
 	 */
 	def registerDestroyFunction[T](beanName: String, destroyFunction: (T) => Unit) {
-		Assert.hasLength(beanName, "'beanName' must not be empty");
-		Assert.notNull(destroyFunction, "'destroyFunction' must not be null");
+		Assert.hasLength(beanName, "'beanName' must not be empty")
+		Assert.notNull(destroyFunction, "'destroyFunction' must not be null")
 
 		destroyFunctions
 				.addBinding(beanName, destroyFunction.asInstanceOf[Function1[Any, Unit]])

src/main/scala/org/springframework/scala/beans/factory/function/FunctionalGenericBeanDefinition.scala

@@ -7,6 +7,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder
 import org.springframework.scala.beans.factory.config.{MapFactoryBean, SetFactoryBean, SeqFactoryBean}
 
 /**
+ * Namespace handler for the `scala-util` namespace.
+ *
  * @author Arjen Poutsma
  */
 class UtilNamespaceHandler extends NamespaceHandlerSupport {

src/main/scala/org/springframework/scala/beans/factory/function/InitDestroyFunctionBeanPostProcessor.scala

@@ -18,7 +18,7 @@ package org.springframework.scala.beans.propertyeditors
 
 import java.beans.PropertyEditorSupport
 import scala.collection.JavaConversions._
-import scala.collection.mutable.Builder
+import scala.collection.mutable
 
 /**
  * Property editor for Scala collections, converting any source collection to a given
@@ -30,7 +30,7 @@ import scala.collection.mutable.Builder
  * @param nullAsEmptyCollection whether to convert an incoming `null` value to an empty
  * collection (of the appropriate type). Defaults to `false`.
  */
-class ScalaCollectionEditor[T, U](val builderFunction: () => Builder[T, _],
+class ScalaCollectionEditor[T, U](val builderFunction: () => mutable.Builder[T, _],
                                   val nullAsEmptyCollection: Boolean = false)
 		extends PropertyEditorSupport {
 
@@ -52,10 +52,10 @@ class ScalaCollectionEditor[T, U](val builderFunction: () => Builder[T, _],
 				builder ++= source
 			}
 			case javaCollection: java.util.Collection[T] => {
-				builder ++= collectionAsScalaIterable(javaCollection);
+				builder ++= collectionAsScalaIterable(javaCollection)
 			}
 			case javaMap: java.util.Map[T, U] => {
-				val mapBuilder = builder.asInstanceOf[Builder[(T, U), _]]
+				val mapBuilder = builder.asInstanceOf[mutable.Builder[(T, U), _]]
 				mapBuilder ++= mapAsScalaMap(javaMap)
 			}
 			case el: T => {

src/main/scala/org/springframework/scala/beans/factory/xml/UtilNamespaceHandler.scala

@@ -1,5 +1,3 @@
-package org.springframework.scala.beans.propertyeditors
-
 /*
  * Copyright 2011-2012 the original author or authors.
  *
@@ -16,6 +14,8 @@ package org.springframework.scala.beans.propertyeditors
  * limitations under the License.
  */
 
+package org.springframework.scala.beans.propertyeditors
+
 import scala.util.matching.Regex
 
 import org.springframework.beans.{PropertyEditorRegistry, PropertyEditorRegistrar}