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

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);
}