From 5866693eceb81c4f7ceffaa9fc6d1635f7e10e18 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Wed, 25 Sep 2019 16:59:31 +0200 Subject: [PATCH] Add MetadataExtractorRegistry.metadataToExtract Kotlin extensions Closes gh-23705 --- .../MetadataExtractorRegistryExtensions.kt | 47 +++++++++++++++++ .../MetadataExtractorRegistryExtensions.kt | 51 +++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/MetadataExtractorRegistryExtensions.kt create mode 100644 spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/MetadataExtractorRegistryExtensions.kt diff --git a/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/MetadataExtractorRegistryExtensions.kt b/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/MetadataExtractorRegistryExtensions.kt new file mode 100644 index 00000000000..ddff4e44336 --- /dev/null +++ b/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/MetadataExtractorRegistryExtensions.kt @@ -0,0 +1,47 @@ +/* + * Copyright 2002-2019 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 + * + * https://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.messaging.rsocket + +import org.springframework.util.MimeType + +/** + * Extension for [MetadataExtractorRegistry.metadataToExtract] providing a `metadataToExtract(...)` + * variant leveraging Kotlin reified type parameters. This extension is not subject to type + * erasure and retains actual generic type arguments. + * @param mimeType the mime type of metadata entries to extract + * @param name assign a name for the decoded value; if not provided, then + * the mime type is used as the key + * @param T the target value type to decode to + * @author Sebastien Deleuze + * @since 5.2 + */ +inline fun MetadataExtractorRegistry.metadataToExtract(mimeType: MimeType, name: String? = null) = + metadataToExtract(mimeType, object : org.springframework.core.ParameterizedTypeReference() {}, name) + +/** + * Extension for [MetadataExtractorRegistry.metadataToExtract] providing a `metadataToExtract(...)` + * variant leveraging Kotlin reified type parameters. This extension is not subject to type + * erasure and retains actual generic type arguments. + * @param mimeType the mime type of metadata entries to extract + * @param mapper custom logic to add the decoded value to the output map + * @param T the target value type to decode to + * @author Sebastien Deleuze + * @since 5.2 + */ +inline fun MetadataExtractorRegistry.metadataToExtract(mimeType: MimeType, noinline mapper: (T, MutableMap) -> Unit) = + metadataToExtract(mimeType, object : org.springframework.core.ParameterizedTypeReference() {}, mapper) + diff --git a/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/MetadataExtractorRegistryExtensions.kt b/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/MetadataExtractorRegistryExtensions.kt new file mode 100644 index 00000000000..3c8cc133737 --- /dev/null +++ b/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/MetadataExtractorRegistryExtensions.kt @@ -0,0 +1,51 @@ +/* + * Copyright 2002-2019 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 + * + * https://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.messaging.rsocket + +import io.mockk.mockk +import io.mockk.verify +import org.junit.jupiter.api.Test +import org.springframework.core.ParameterizedTypeReference +import org.springframework.util.MimeType +import java.util.function.BiConsumer + +class MetadataExtractorRegistryExtensions { + + @Test + fun `metadataToExtract with String parameter`() { + val extractor = mockk(relaxed = true) + val name = "name" + val mimeType = MimeType.valueOf("application/json") + extractor.metadataToExtract(mimeType, name) + verify { + extractor.metadataToExtract(mimeType, object: ParameterizedTypeReference() {}, name) + } + } + + @Test + fun `metadataToExtract with BiConsumer parameter`() { + val extractor = mockk(relaxed = true) + val name = "name" + val mimeType = MimeType.valueOf("application/json") + extractor.metadataToExtract>(mimeType) { jsonMap, outputMap -> + outputMap.putAll(jsonMap) + } + verify { + extractor.metadataToExtract(mimeType, object: ParameterizedTypeReference>() {}, any, MutableMap>>()) + } + } +} \ No newline at end of file