From b2e783490c07046f4d3a4bccaa3290dd97dcdc5a Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 27 Jan 2021 15:29:16 +0100 Subject: [PATCH] Fix RSocket CloudEvents sample --- .../function/cloudevent/CloudEventMessageBuilder.java | 7 ------- .../function/rsocket/RSocketAutoConfigurationTests.java | 8 -------- .../java/io/spring/cloudevent/DemoApplicationTests.java | 2 ++ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java index 670ac9f58..3581c0ce3 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/cloudevent/CloudEventMessageBuilder.java @@ -178,13 +178,6 @@ public final class CloudEventMessageBuilder { else if (key.startsWith(CloudEventMessageUtils.KAFKA_ATTR_PREFIX)) { this.swapPrefix(key, CloudEventMessageUtils.KAFKA_ATTR_PREFIX, attributePrefixToUse); } -// else if (key.equals(CloudEventMessageUtils._SPECVERSION) || -// key.equals(CloudEventMessageUtils._SOURCE) || key.equals(CloudEventMessageUtils._TYPE) || -// key.equals(CloudEventMessageUtils._DATASCHEMA) || key.equals(CloudEventMessageUtils._SCHEMAURL) || -// key.equals(CloudEventMessageUtils._SUBJECT) || key.equals(CloudEventMessageUtils._TIME) || -// key.equals(CloudEventMessageUtils._DATACONTENTTYPE)) { -// this.swapPrefix(key, "", attributePrefixToUse); -// } } } return doBuild(attributePrefixToUse); diff --git a/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RSocketAutoConfigurationTests.java b/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RSocketAutoConfigurationTests.java index 7cee17104..8fa77132c 100644 --- a/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RSocketAutoConfigurationTests.java +++ b/spring-cloud-function-rsocket/src/test/java/org/springframework/cloud/function/rsocket/RSocketAutoConfigurationTests.java @@ -389,14 +389,6 @@ public class RSocketAutoConfigurationTests { .as(StepVerifier::create) .expectComplete() .verify(); - -// applicationContext.getBean(SampleFunctionConfiguration.class).consumerData -// .asMono() -// .map(String::new) -// .as(StepVerifier::create) -// .expectNext("\"hello\"") -// .expectComplete() -// .verify(); } } diff --git a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/src/test/java/io/spring/cloudevent/DemoApplicationTests.java b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/src/test/java/io/spring/cloudevent/DemoApplicationTests.java index e09a46408..1cc2a39b1 100644 --- a/spring-cloud-function-samples/function-sample-cloudevent-rsocket/src/test/java/io/spring/cloudevent/DemoApplicationTests.java +++ b/spring-cloud-function-samples/function-sample-cloudevent-rsocket/src/test/java/io/spring/cloudevent/DemoApplicationTests.java @@ -18,6 +18,7 @@ import org.springframework.cloud.function.cloudevent.CloudEventMessageUtils; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.messaging.Message; import org.springframework.messaging.rsocket.RSocketRequester; +import org.springframework.util.MimeTypeUtils; @SpringBootTest(properties = {"spring.rsocket.server.port=55555"}) @@ -45,6 +46,7 @@ public class DemoApplicationTests { this.rsocketRequesterBuilder.tcp("localhost", 55555) .route("hire") + .metadata("{\"content-type\":\"application/cloudevents+json\"}", MimeTypeUtils.APPLICATION_JSON) .data(payload) .send() .subscribe();