From c33b2a4dbfb5ac310a9872246c057350b498f2cb Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Fri, 14 Aug 2020 16:43:47 -0400
Subject: [PATCH] Fix SI sample for compatibility with latest SI

* Fix test `FunctionSampleSpringIntegrationApplicationTests` to use AssertJ
---
 .../example/FunctionSampleSpringIntegrationApplication.java | 5 +++--
 .../FunctionSampleSpringIntegrationApplicationTests.java    | 6 +++---
 spring-cloud-function-samples/pom.xml                       | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-function-samples/function-sample-spring-integration/src/main/java/example/FunctionSampleSpringIntegrationApplication.java b/spring-cloud-function-samples/function-sample-spring-integration/src/main/java/example/FunctionSampleSpringIntegrationApplication.java
index 42ebc98b2..193bd7966 100644
--- a/spring-cloud-function-samples/function-sample-spring-integration/src/main/java/example/FunctionSampleSpringIntegrationApplication.java
+++ b/spring-cloud-function-samples/function-sample-spring-integration/src/main/java/example/FunctionSampleSpringIntegrationApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 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.
@@ -35,7 +35,7 @@ public class FunctionSampleSpringIntegrationApplication {
 
 	@Bean
 	public IntegrationFlow uppercaseFlow() {
-		return IntegrationFlows.from(MessageFunction.class, "uppercase")
+		return IntegrationFlows.from(MessageFunction.class, (gateway) -> gateway.beanName("uppercase"))
 				.<String, String>transform(String::toUpperCase)
 				.logAndReply(LoggingHandler.Level.WARN);
 	}
@@ -43,4 +43,5 @@ public class FunctionSampleSpringIntegrationApplication {
 	public interface MessageFunction extends Function<Message<String>, Message<String>> {
 
 	}
+
 }
diff --git a/spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java b/spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java
index f4304776a..b6ee09a11 100644
--- a/spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java
+++ b/spring-cloud-function-samples/function-sample-spring-integration/src/test/java/example/FunctionSampleSpringIntegrationApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2020 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.
@@ -16,7 +16,7 @@
 
 package example;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
@@ -39,7 +39,7 @@ public class FunctionSampleSpringIntegrationApplicationTests {
 		httpHeaders.setContentType(MediaType.APPLICATION_JSON);
 		HttpEntity<String> requestEntity = new HttpEntity<>("[\"foo\", \"bar\"]", httpHeaders);
 		HttpEntity<String> result = this.restTemplate.postForEntity("/uppercase", requestEntity, String.class);
-		assertEquals("[\"FOO\",\"BAR\"]", result.getBody());
+		assertThat(result.getBody()).isEqualTo("[\"FOO\",\"BAR\"]");
 	}
 
 }
diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml
index 323e84bd7..46e2ed59d 100644
--- a/spring-cloud-function-samples/pom.xml
+++ b/spring-cloud-function-samples/pom.xml
@@ -21,7 +21,7 @@
 		<module>function-sample-aws-custom</module>
 		<module>function-sample-supplier-exporter</module>
 		<module>function-sample-azure</module>
-		<!--><module>function-sample-spring-integration</module>-->
+		><module>function-sample-spring-integration</module>
 		<module>function-sample-gcp-http</module>
  		<module>function-sample-gcp-background</module>
 	</modules>