Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to SI 5.3; fix SD Mongo deprecations

Browse Source
This commit is contained in:
Artem Bilan
2020-02-26 13:25:59 -05:00
parent 4ff6288db5
commit a00684726b
72 changed files with 943 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
basic/mongodb/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mongodb</artifactId>
<version>5.2.0.BUILD-SNAPSHOT</version>
<version>5.3.0.BUILD-SNAPSHOT</version>
<name>MongoDb Basic Sample</name>
<description>MongoDb Basic Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -19,12 +19,20 @@
</license>
</licenses>
<developers>
<developer>
<id>abilan</id>
<name>Artem Bilan</name>
<email>abilan@pivotal.io</email>
<roles>
<role>project lead</role>
</roles>
</developer>
<developer>
<id>garyrussell</id>
<name>Gary Russell</name>
<email>grussell@pivotal.io</email>
<roles>
<role>project lead</role>
<role>lead emeritus</role>
</roles>
</developer>
<developer>
@@ -40,11 +48,6 @@
<name>Gunnar Hillert</name>
<email>ghillert@pivotal.io</email>
</developer>
<developer>
<id>abilan</id>
<name>Artem Bilan</name>
<email>abilan@pivotal.io</email>
</developer>
</developers>
<scm>
<connection>scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git</connection>
@@ -75,6 +78,18 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>4.0.0-beta1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -106,7 +121,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.2.0</version>
<version>3.2.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -155,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.2.RELEASE</version>
<version>5.2.3.RELEASE</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.2.2.RELEASE</version>
<version>5.3.0.M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>

13
basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java
View File

@@ -16,11 +16,11 @@
package org.springframework.integration.samples.mongodb.util;
import com.mongodb.client.MongoClients;
import org.springframework.data.mongodb.MongoDbFactory;
import org.springframework.data.mongodb.MongoDatabaseFactory;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
import com.mongodb.client.MongoClients;
/**
*
@@ -28,8 +28,8 @@ import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
*/
public class DemoUtils {
public static MongoDbFactory prepareMongoFactory(String... additionalCollectionToDrop) throws Exception {
MongoDbFactory mongoDbFactory = new SimpleMongoClientDbFactory(MongoClients.create(), "test");
public static MongoDatabaseFactory prepareMongoFactory(String... additionalCollectionToDrop) throws Exception {
MongoDatabaseFactory mongoDbFactory = new SimpleMongoClientDatabaseFactory(MongoClients.create(), "test");
MongoTemplate template = new MongoTemplate(mongoDbFactory);
template.dropCollection("messages");
template.dropCollection("data");
@@ -38,4 +38,5 @@ public class DemoUtils {
}
return mongoDbFactory;
}
}

5
basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java
View File

@@ -18,8 +18,9 @@ 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.MongoDatabaseFactory;
import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
@@ -36,7 +37,7 @@ import com.mongodb.DBObject;
public class StringConverter extends MappingMongoConverter {
public StringConverter(
MongoDbFactory mongoDbFactory,
MongoDatabaseFactory mongoDbFactory,
MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
super(new DefaultDbRefResolver(mongoDbFactory), mappingContext);
}