Browse Source

Add a [] Kotlin extension for PropertyResolver#getRequiredProperty

pull/1481/head
Sebastien Deleuze 7 years ago
parent
commit
e2fd04dff3
  1. 3
      spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt
  2. 29
      spring-core/src/main/kotlin/PropertyResolverExtensions.kt
  3. 44
      spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt

3
spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt

@ -22,6 +22,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException @@ -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 { @@ -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")) }

29
spring-core/src/main/kotlin/PropertyResolverExtensions.kt

@ -0,0 +1,29 @@ @@ -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)

44
spring-core/src/test/kotlin/org/springframework/core/env/PropertyResolverExtensionsTests.kt vendored

@ -0,0 +1,44 @@ @@ -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")
}
}
Loading…
Cancel
Save