From e2fd04dff3fa72c38b3840639678a5c588b69447 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Tue, 18 Jul 2017 16:42:32 +0200
Subject: [PATCH] Add a [] Kotlin extension for
 PropertyResolver#getRequiredProperty

---
 .../context/support/BeanDefinitionDslTests.kt |  3 +-
 .../main/kotlin/PropertyResolverExtensions.kt | 29 ++++++++++++
 .../env/PropertyResolverExtensionsTests.kt    | 44 +++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 spring-core/src/main/kotlin/PropertyResolverExtensions.kt
 create mode 100644 spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt

diff --git a/spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt b/spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt
index b4b0260bee..21fc17f336 100644
--- a/spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt
+++ b/spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException
 import org.springframework.beans.factory.getBean
 import org.springframework.context.support.BeanDefinitionDsl.*
 import org.springframework.core.env.SimpleCommandLinePropertySource
+import org.springframework.core.env.get
 
 class BeanDefinitionDslTests {
 	
@@ -76,7 +77,7 @@ class BeanDefinitionDslTests {
 		val beans = beans {
 			bean<Foo>()
 			bean<Bar>("bar")
-			bean { FooFoo(it.env.getProperty("name")) }
+			bean { FooFoo(it.env["name"]) }
 			environment({it.activeProfiles.contains("baz")}) {
 				bean { Baz(it.ref()) }
 				bean { Baz(it.ref("bar")) }
diff --git a/spring-core/src/main/kotlin/PropertyResolverExtensions.kt b/spring-core/src/main/kotlin/PropertyResolverExtensions.kt
new file mode 100644
index 0000000000..b58dec0641
--- /dev/null
+++ b/spring-core/src/main/kotlin/PropertyResolverExtensions.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2002-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env
+
+/**
+ * Extension for [PropertyResolver.getRequiredProperty] providing Array like getter.
+ *
+ * ```kotlin
+ * env["name"] = "Seb"
+ * ```
+ *
+ * @author Sebastien Deleuze
+ * @since 5.0
+ */
+operator fun PropertyResolver.get(key: String) : String = getRequiredProperty(key)
diff --git a/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt b/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt
new file mode 100644
index 0000000000..e505b25765
--- /dev/null
+++ b/spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2002-2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.core.env
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Answers
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnitRunner
+
+/**
+ * Mock object based tests for PropertyResolver Kotlin extensions
+ *
+ * @author Sebastien Deleuze
+ */
+@RunWith(MockitoJUnitRunner::class)
+class PropertyResolverExtensionsTests {
+
+	@Mock(answer = Answers.RETURNS_MOCKS)
+	lateinit var propertyResolver: PropertyResolver
+
+	@Suppress("UNUSED_VARIABLE")
+	@Test
+	fun `get operator`() {
+		val name = propertyResolver["name"]
+		Mockito.verify(propertyResolver, Mockito.times(1)).getRequiredProperty("name")
+	}
+
+}