From 04ef89784f52f22ffaf2b811b6ffac778aba0e5f Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 1 Dec 2016 17:21:42 -0500
Subject: [PATCH] Upgrade to SI-5.0.0.M1

---
 .../samples/mongodb/util/StringConverter.java | 26 +++++++++++--------
 build.gradle                                  |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java
index 0ac41a5b..27f94e7e 100644
--- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java
+++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java
@@ -16,6 +16,8 @@
 
 package org.springframework.integration.samples.mongodb.util;
 
+import org.bson.Document;
+import org.bson.conversions.Bson;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
@@ -40,28 +42,30 @@ public class StringConverter extends MappingMongoConverter {
 	}
 
 	@Override
-	public void write(Object source, DBObject target) {
+	public void write(Object source, Bson target) {
+		Document document = (Document) target;
 		String strPerson = (String) source;
 		String[] parsedStrPerson = StringUtils.tokenizeToStringArray(strPerson, ",");
-		target.put("fname", parsedStrPerson[0]);
-		target.put("lname", parsedStrPerson[1]);
+		document.put("fname", parsedStrPerson[0]);
+		document.put("lname", parsedStrPerson[1]);
 		DBObject innerObject = new BasicDBObject();
 		innerObject.put("city", parsedStrPerson[2]);
 		innerObject.put("street", parsedStrPerson[3]);
 		innerObject.put("zip", parsedStrPerson[4]);
 		innerObject.put("state", parsedStrPerson[5]);
-		target.put("address", innerObject);
+		document.put("address", innerObject);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public <S> S read(Class<S> clazz, DBObject source) {
-		return (S) ((source.get("fname") + ", ")
-				+ source.get("lname") + ", "
-				+ source.get("city") + ", "
-				+ source.get("street") + ", "
-				+ source.get("zip") + ", "
-				+ source.get("state") + ", ");
+	public <S> S read(Class<S> clazz, Bson source) {
+		Document document = (Document) source;
+		return (S) ((document.get("fname") + ", ")
+				+ document.get("lname") + ", "
+				+ document.get("city") + ", "
+				+ document.get("street") + ", "
+				+ document.get("zip") + ", "
+				+ document.get("state") + ", ");
 	}
 
 }
diff --git a/build.gradle b/build.gradle
index bad7c6d8..a46f0cbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -198,7 +198,7 @@ subprojects { subproject ->
 			postgresVersion = '9.1-901-1.jdbc4'
 			subethasmtpVersion = '1.2'
 			slf4jVersion = '1.7.11'
-			springIntegrationVersion = '5.0.0.BUILD-SNAPSHOT'
+			springIntegrationVersion = '5.0.0.M1'
 			springIntegrationKafkaVersion = '3.0.0.BUILD-SNAPSHOT'
 			springIntegrationSplunkVersion = '1.1.0.RELEASE'
 			springKafkaVersion = '1.1.2.BUILD-SNAPSHOT'