From 4f1fe74912788f95b2785f58c8a1104fafb364c7 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Wed, 11 Jan 2017 07:57:02 +0100
Subject: [PATCH] Polish ListableBeanFactoryExtension

---
 .../factory/ListableBeanFactoryExtension.kt   | 32 +++----------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/spring-beans/src/main/kotlin/org/springframework/beans/factory/ListableBeanFactoryExtension.kt b/spring-beans/src/main/kotlin/org/springframework/beans/factory/ListableBeanFactoryExtension.kt
index 9cb0f3be897..28d6f0413a9 100644
--- a/spring-beans/src/main/kotlin/org/springframework/beans/factory/ListableBeanFactoryExtension.kt
+++ b/spring-beans/src/main/kotlin/org/springframework/beans/factory/ListableBeanFactoryExtension.kt
@@ -10,54 +10,30 @@ import kotlin.reflect.KClass
  */
 object ListableBeanFactoryExtension {
 
-	/**
-	 * @see ListableBeanFactory.getBeanNamesForType(Class<?>)
-	 */
-	fun <T : Any> ListableBeanFactory.getBeanNamesForType(type: KClass<T>) =
-			getBeanNamesForType(type.java)
-
-	/**
-	 * @see ListableBeanFactory.getBeanNamesForType(Class<?>)
-	 */
-	inline fun <reified T : Any> ListableBeanFactory.getBeanNamesForType() =
-			getBeanNamesForType(T::class.java)
-
 	/**
 	 * @see ListableBeanFactory.getBeanNamesForType(Class<?>, boolean, boolean)
 	 */
 	fun <T : Any> ListableBeanFactory.getBeanNamesForType(type: KClass<T>,
-			includeNonSingletons: Boolean, allowEagerInit: Boolean) =
+			includeNonSingletons: Boolean = true, allowEagerInit: Boolean = true) =
 					getBeanNamesForType(type.java, includeNonSingletons, allowEagerInit)
 
 	/**
 	 * @see ListableBeanFactory.getBeanNamesForType(Class<?>, boolean, boolean)
 	 */
-	inline fun <reified T : Any> ListableBeanFactory.getBeanNamesForType(includeNonSingletons: Boolean, allowEagerInit: Boolean) =
+	inline fun <reified T : Any> ListableBeanFactory.getBeanNamesForType(includeNonSingletons: Boolean = true, allowEagerInit: Boolean = true) =
 					getBeanNamesForType(T::class.java, includeNonSingletons, allowEagerInit)
 
-	/**
-	 * @see ListableBeanFactory.getBeansOfType(Class<T>)
-	 */
-	fun <T : Any> ListableBeanFactory.getBeansOfType(type: KClass<T>) =
-			getBeansOfType(type.java)
-
-	/**
-	 * @see ListableBeanFactory.getBeansOfType(Class<T>)
-	 */
-	inline fun <reified T : Any> ListableBeanFactory.getBeansOfType() =
-			getBeansOfType(T::class.java)
-
 	/**
 	 * @see ListableBeanFactory.getBeansOfType(Class<T>, boolean, boolean)
 	 */
 	fun <T : Any> ListableBeanFactory.getBeansOfType(type: KClass<T>,
-			includeNonSingletons: Boolean, allowEagerInit: Boolean) =
+			includeNonSingletons: Boolean = true, allowEagerInit: Boolean = true) =
 					getBeansOfType(type.java, includeNonSingletons, allowEagerInit)
 
 	/**
 	 * @see ListableBeanFactory.getBeansOfType(Class<T>, boolean, boolean)
 	 */
-	inline fun <reified T : Any> ListableBeanFactory.getBeansOfType(includeNonSingletons: Boolean, allowEagerInit: Boolean) =
+	inline fun <reified T : Any> ListableBeanFactory.getBeansOfType(includeNonSingletons: Boolean = true, allowEagerInit: Boolean = true) =
 					getBeansOfType(T::class.java, includeNonSingletons, allowEagerInit)
 
 	/**