root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Kotlin 1.1.4-eap-33 

Issue: SPR-15814
This commit is contained in:
Sebastien Deleuze 2017-07-24 17:29:02 +02:00
parent 14ccb38523
commit ed6fe2b723
6 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -1,7 +1,8 @@
buildscript { buildscript {
ext.kotlinVersion = '1.1.3-2' ext.kotlinVersion = '1.1.4-eap-33'
repositories { repositories {
maven { url "https://repo.spring.io/plugins-release" } maven { url "https://repo.spring.io/plugins-release" }
maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
} }
dependencies { dependencies {
classpath("io.spring.gradle:dependency-management-plugin:1.0.0.RELEASE") classpath("io.spring.gradle:dependency-management-plugin:1.0.0.RELEASE")
@ -112,12 +113,12 @@ configure(allprojects) { project ->
apply plugin: "kotlin" apply plugin: "kotlin"
compileKotlin { compileKotlin {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"] kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xload-jsr305-annotations"]
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.jvmTarget = "1.8" kotlinOptions.jvmTarget = "1.8"
kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check"] kotlinOptions.freeCompilerArgs = ["-Xskip-runtime-version-check", "-Xload-jsr305-annotations"]
} }
configurations.all { configurations.all {
@ -176,6 +177,7 @@ configure(allprojects) { project ->
maven { url "https://repo.spring.io/libs-release" } maven { url "https://repo.spring.io/libs-release" }
maven { url "https://repo.spring.io/milestone" } maven { url "https://repo.spring.io/milestone" }
maven { url "https://repo.spring.io/snapshot" } maven { url "https://repo.spring.io/snapshot" }
maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
} }
dependencies { dependencies {

16
spring-beans/src/test/kotlin/org/springframework/beans/BeanUtilsKotlinTests.kt
View File

@ -28,32 +28,32 @@ class BeanUtilsKotlinTests {
@Test @Test
fun `Instantiate immutable class`() { fun `Instantiate immutable class`() {
val constructor = BeanUtils.findPrimaryConstructor(Foo::class.java) val constructor = BeanUtils.findPrimaryConstructor(Foo::class.java)!!
val foo = BeanUtils.instantiateClass(constructor, "bar", 3) as Foo val foo = BeanUtils.instantiateClass(constructor, "bar", 3)
assertEquals("bar", foo.param1) assertEquals("bar", foo.param1)
assertEquals(3, foo.param2) assertEquals(3, foo.param2)
} }
@Test @Test
fun `Instantiate immutable class with optional parameter and all parameters specified`() { fun `Instantiate immutable class with optional parameter and all parameters specified`() {
val constructor = BeanUtils.findPrimaryConstructor(Bar::class.java) val constructor = BeanUtils.findPrimaryConstructor(Bar::class.java)!!
val bar = BeanUtils.instantiateClass(constructor, "baz", 8) as Bar val bar = BeanUtils.instantiateClass(constructor, "baz", 8)
assertEquals("baz", bar.param1) assertEquals("baz", bar.param1)
assertEquals(8, bar.param2) assertEquals(8, bar.param2)
} }
@Test @Test
fun `Instantiate immutable class with optional parameter and only mandatory parameters specified by position`() { fun `Instantiate immutable class with optional parameter and only mandatory parameters specified by position`() {
val constructor = BeanUtils.findPrimaryConstructor(Bar::class.java) val constructor = BeanUtils.findPrimaryConstructor(Bar::class.java)!!
val bar = BeanUtils.instantiateClass(constructor, "baz") as Bar val bar = BeanUtils.instantiateClass(constructor, "baz")
assertEquals("baz", bar.param1) assertEquals("baz", bar.param1)
assertEquals(12, bar.param2) assertEquals(12, bar.param2)
} }
@Test @Test
fun `Instantiate immutable class with optional parameter specified with null value`() { fun `Instantiate immutable class with optional parameter specified with null value`() {
val constructor = BeanUtils.findPrimaryConstructor(Bar::class.java) val constructor = BeanUtils.findPrimaryConstructor(Bar::class.java)!!
val bar = BeanUtils.instantiateClass(constructor, "baz", null) as Bar val bar = BeanUtils.instantiateClass(constructor, "baz", null)
assertEquals("baz", bar.param1) assertEquals("baz", bar.param1)
assertEquals(12, bar.param2) assertEquals(12, bar.param2)
} }

4
spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageHeaderAccessor.java
View File

@ -130,7 +130,7 @@ public class SimpMessageHeaderAccessor extends NativeMessageHeaderAccessor {
return (String) getHeader(DESTINATION_HEADER); return (String) getHeader(DESTINATION_HEADER);
} }
public void setSubscriptionId(String subscriptionId) { public void setSubscriptionId(@Nullable String subscriptionId) {
setHeader(SUBSCRIPTION_ID_HEADER, subscriptionId); setHeader(SUBSCRIPTION_ID_HEADER, subscriptionId);
} }
@ -139,7 +139,7 @@ public class SimpMessageHeaderAccessor extends NativeMessageHeaderAccessor {
return (String) getHeader(SUBSCRIPTION_ID_HEADER); return (String) getHeader(SUBSCRIPTION_ID_HEADER);
} }
public void setSessionId(String sessionId) { public void setSessionId(@Nullable String sessionId) {
setHeader(SESSION_ID_HEADER, sessionId); setHeader(SESSION_ID_HEADER, sessionId);
} }

2
spring-messaging/src/test/kotlin/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerKotlinTests.kt
View File

@ -155,7 +155,7 @@ class SimpAnnotationMethodMessageHandlerKotlinTests {
clientOutboundChannel: MessageChannel) : clientOutboundChannel: MessageChannel) :
SimpAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerTemplate) { SimpAnnotationMethodMessageHandler(clientInboundChannel, clientOutboundChannel, brokerTemplate) {
fun registerHandler(handler: Any?) { fun registerHandler(handler: Any) {
super.detectHandlerMethods(handler) super.detectHandlerMethods(handler)
} }
} }

2
spring-web/src/test/kotlin/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt
View File

@ -76,7 +76,7 @@ class RequestParamMethodArgumentResolverKotlinTests {
val method = ReflectionUtils.findMethod(javaClass, "handle", String::class.java, val method = ReflectionUtils.findMethod(javaClass, "handle", String::class.java,
String::class.java, String::class.java, String::class.java, String::class.java, String::class.java, String::class.java,
MultipartFile::class.java, MultipartFile::class.java, MultipartFile::class.java, MultipartFile::class.java,
MultipartFile::class.java, MultipartFile::class.java) MultipartFile::class.java, MultipartFile::class.java)!!
nullableParamRequired = SynthesizingMethodParameter(method, 0) nullableParamRequired = SynthesizingMethodParameter(method, 0)
nullableParamNotRequired = SynthesizingMethodParameter(method, 1) nullableParamNotRequired = SynthesizingMethodParameter(method, 1)

2
spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt
View File

@ -54,7 +54,7 @@ class RequestParamMethodArgumentResolverKotlinTests {
bindingContext = BindingContext(initializer) bindingContext = BindingContext(initializer)
val method = ReflectionUtils.findMethod(javaClass, "handle", String::class.java, val method = ReflectionUtils.findMethod(javaClass, "handle", String::class.java,
String::class.java, String::class.java, String::class.java) String::class.java, String::class.java, String::class.java)!!
nullableParamRequired = SynthesizingMethodParameter(method, 0) nullableParamRequired = SynthesizingMethodParameter(method, 0)
nullableParamNotRequired = SynthesizingMethodParameter(method, 1) nullableParamNotRequired = SynthesizingMethodParameter(method, 1)