From 13c72f653e93e1721c381e2a384254dd2a71b0d5 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 17 Dec 2019 11:51:15 -0500 Subject: [PATCH] Upgrade to data Neumann and S-D-Mongo 3.0 * Fix reactive driver version; reinstate tests. --- build.gradle | 10 ++-- .../integration/mongodb/dsl/MongoDb.java | 8 +-- .../dsl/MongoDbOutboundGatewaySpec.java | 19 +------ .../mongodb/inbound/MongoDbMessageSource.java | 10 ++-- .../metadata/MongoDbMetadataStore.java | 14 ++--- .../outbound/MongoDbOutboundGateway.java | 10 ++-- .../MongoDbStoringMessageHandler.java | 10 ++-- .../ReactiveMongoDbStoringMessageHandler.java | 4 +- ...stractConfigurableMongoDbMessageStore.java | 8 +-- .../ConfigurableMongoDbMessageStore.java | 10 ++-- .../store/MongoDbChannelMessageStore.java | 10 ++-- .../mongodb/store/MongoDbMessageStore.java | 12 ++--- ...boundChannelAdapterParserTests-context.xml | 2 +- ...ngoDbInboundChannelAdapterParserTests.java | 4 +- ...utboundChannelAdapterIntegrationTests.java | 14 ++--- ...goDbOutboundGatewayParserTests-context.xml | 2 +- .../MongoDbOutboundGatewayParserTests.java | 4 +- ...-parser-fail-template-converter-config.xml | 2 +- ...er-parser-fail-template-factory-config.xml | 2 +- .../config/outbound-adapter-parser-config.xml | 2 +- ...-parser-fail-template-converter-config.xml | 2 +- ...er-parser-fail-template-factory-config.xml | 2 +- ...ateway-fail-collection-callback-config.xml | 2 +- ...gateway-fail-template-converter-config.xml | 2 +- ...d-gateway-fail-template-factory-config.xml | 2 +- .../integration/mongodb/dsl/MongoDbTests.java | 8 +-- .../inbound/MongoDbMessageSourceTests.java | 24 ++++----- .../metadata/MongoDbMetadataStoreTests.java | 10 ++-- .../outbound/MongoDbOutboundGatewayTests.java | 6 +-- .../MongoDbOutboundGatewayXmlTests.java | 6 +-- .../MongoDbStoringMessageHandlerTests.java | 6 +-- .../mongodb/rules/MongoDbAvailableRule.java | 18 ++++--- .../mongodb/rules/MongoDbAvailableTests.java | 12 ++--- ...AbstractMongoDbMessageGroupStoreTests.java | 8 +-- .../AbstractMongoDbMessageStoreTests.java | 6 +-- ...leIntegrationConfigurableTests-context.xml | 53 +++++++++++-------- ...dlerRescheduleIntegrationTests-context.xml | 53 +++++++++++-------- ...essageStoreClaimCheckIntegrationTests.java | 6 +-- .../mongodb/store/mongo-aggregator-config.xml | 8 ++- .../mongo-aggregator-configurable-config.xml | 8 ++- 40 files changed, 207 insertions(+), 192 deletions(-) diff --git a/build.gradle b/build.gradle index 1988d52803..e746d17479 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,7 @@ ext { log4jVersion = '2.12.1' micrometerVersion = '1.3.2' mockitoVersion = '3.2.0' - mongodbReactiveDriverVersion = '1.12.0' + mongoDriverVersion = '4.0.0-SNAPSHOT' mysqlVersion = '8.0.18' pahoMqttClientVersion = '1.2.0' postgresVersion = '42.2.8' @@ -91,7 +91,7 @@ ext { servletApiVersion = '4.0.1' smackVersion = '4.3.4' springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.2.RELEASE' - springDataVersion = 'Moore-SR3' + springDataVersion = 'Neumann-BUILD-SNAPSHOT' springSecurityVersion = '5.2.1.RELEASE' springRetryVersion = '1.2.4.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.2.RELEASE' @@ -112,6 +112,7 @@ allprojects { maven { url 'https://repo.spring.io/libs-snapshot' } maven { url "https://oss.jfrog.org/artifactory/libs-snapshot" } // RSocket } + maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } // maven { url 'https://repo.spring.io/libs-staging-local' } } @@ -572,10 +573,11 @@ project('spring-integration-mongodb') { description = 'Spring Integration MongoDB Support' dependencies { compile project(':spring-integration-core') - compile('org.springframework.data:spring-data-mongodb') { + compile('org.springframework.data:spring-data-mongodb:3.0.0.BUILD-SNAPSHOT') { exclude group: 'org.springframework' } - compile("org.mongodb:mongodb-driver-reactivestreams:$mongodbReactiveDriverVersion", optional) + compile("org.mongodb:mongodb-driver-reactivestreams:$mongoDriverVersion", optional) + compile("org.mongodb:mongodb-driver-sync:$mongoDriverVersion", optional) testCompile 'io.projectreactor:reactor-test' } } diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/dsl/MongoDb.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/dsl/MongoDb.java index 1411d7df57..400de9eb0e 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/dsl/MongoDb.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/dsl/MongoDb.java @@ -16,7 +16,7 @@ package org.springframework.integration.mongodb.dsl; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.convert.MongoConverter; @@ -30,13 +30,13 @@ public final class MongoDb { /** * Create a {@link MongoDbOutboundGatewaySpec} builder instance - * based on the provided {@link MongoDbFactory} and {@link MongoConverter}. - * @param mongoDbFactory the {@link MongoDbFactory} to use. + * based on the provided {@link MongoDatabaseFactory} and {@link MongoConverter}. + * @param mongoDbFactory the {@link MongoDatabaseFactory} to use. * @param mongoConverter the {@link MongoConverter} to use. * @return the {@link MongoDbOutboundGatewaySpec} instance */ public static MongoDbOutboundGatewaySpec outboundGateway( - MongoDbFactory mongoDbFactory, MongoConverter mongoConverter) { + MongoDatabaseFactory mongoDbFactory, MongoConverter mongoConverter) { return new MongoDbOutboundGatewaySpec(mongoDbFactory, mongoConverter); } diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/dsl/MongoDbOutboundGatewaySpec.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/dsl/MongoDbOutboundGatewaySpec.java index 1f428784f0..20c536035a 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/dsl/MongoDbOutboundGatewaySpec.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/dsl/MongoDbOutboundGatewaySpec.java @@ -18,8 +18,7 @@ package org.springframework.integration.mongodb.dsl; import java.util.function.Function; -import org.springframework.data.mongodb.MongoDbFactory; -import org.springframework.data.mongodb.core.CollectionCallback; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.convert.MongoConverter; import org.springframework.data.mongodb.core.query.Query; @@ -41,7 +40,7 @@ import org.springframework.messaging.Message; public class MongoDbOutboundGatewaySpec extends MessageHandlerSpec { - MongoDbOutboundGatewaySpec(MongoDbFactory mongoDbFactory, MongoConverter mongoConverter) { + MongoDbOutboundGatewaySpec(MongoDatabaseFactory mongoDbFactory, MongoConverter mongoConverter) { this.target = new MongoDbOutboundGateway(mongoDbFactory, mongoConverter); this.target.setRequiresReply(true); } @@ -146,20 +145,6 @@ public class MongoDbOutboundGatewaySpec return this; } - /** - * Reference to an instance of {@link CollectionCallback} which specifies the database operation to execute. - * This property is mutually exclusive with {@link #query} and {@link #queryExpression} properties. - * @param collectionCallback the {@link CollectionCallback} instance - * @param

the type of the message payload. - * @return the spec - * @deprecated in favor of {@link #collectionCallback(MessageCollectionCallback)} - */ - @Deprecated - public

MongoDbOutboundGatewaySpec collectionCallback(CollectionCallback

collectionCallback) { - this.target.setCollectionCallback(collectionCallback); - return this; - } - /** * Reference to an instance of {@link MessageCollectionCallback} * which specifies the database operation to execute in the request message context. diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java index a1486bc892..a1b6624a0f 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java @@ -18,7 +18,7 @@ package org.springframework.integration.mongodb.inbound; import java.util.List; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.MongoConverter; @@ -75,7 +75,7 @@ public class MongoDbMessageSource extends AbstractMessageSource { private volatile MongoConverter mongoConverter; - private volatile MongoDbFactory mongoDbFactory; + private volatile MongoDatabaseFactory mongoDbFactory; private volatile boolean initialized = false; @@ -84,14 +84,14 @@ public class MongoDbMessageSource extends AbstractMessageSource { private volatile boolean expectSingleResult = false; /** - * Creates an instance with the provided {@link MongoDbFactory} and SpEL expression + * Creates an instance with the provided {@link MongoDatabaseFactory} and SpEL expression * which should resolve to a MongoDb 'query' string * (see https://www.mongodb.org/display/DOCS/Querying). * The 'queryExpression' will be evaluated on every call to the {@link #receive()} method. * @param mongoDbFactory The mongodb factory. * @param queryExpression The query expression. */ - public MongoDbMessageSource(MongoDbFactory mongoDbFactory, Expression queryExpression) { + public MongoDbMessageSource(MongoDatabaseFactory mongoDbFactory, Expression queryExpression) { Assert.notNull(mongoDbFactory, "'mongoDbFactory' must not be null"); Assert.notNull(queryExpression, "'queryExpression' must not be null"); @@ -156,7 +156,7 @@ public class MongoDbMessageSource extends AbstractMessageSource { /** * Allows you to provide a custom {@link MongoConverter} used to assist in deserialization * data read from MongoDb. Only allowed if this instance was constructed with a - * {@link MongoDbFactory}. + * {@link MongoDatabaseFactory}. * @param mongoConverter The mongo converter. */ public void setMongoConverter(MongoConverter mongoConverter) { diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStore.java index 9e872280ba..38faa485d0 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStore.java @@ -21,12 +21,13 @@ import java.util.Map; import org.bson.Document; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.FindAndModifyOptions; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; +import org.springframework.data.mongodb.core.query.UpdateDefinition; import org.springframework.integration.metadata.ConcurrentMetadataStore; import org.springframework.util.Assert; @@ -57,21 +58,21 @@ public class MongoDbMetadataStore implements ConcurrentMetadataStore { private final String collectionName; /** - * Configure the MongoDbMetadataStore by provided {@link MongoDbFactory} and + * Configure the MongoDbMetadataStore by provided {@link MongoDatabaseFactory} and * default collection name - {@link #DEFAULT_COLLECTION_NAME}. * @param factory the mongodb factory */ - public MongoDbMetadataStore(MongoDbFactory factory) { + public MongoDbMetadataStore(MongoDatabaseFactory factory) { this(factory, DEFAULT_COLLECTION_NAME); } /** - * Configure the MongoDbMetadataStore by provided {@link MongoDbFactory} and + * Configure the MongoDbMetadataStore by provided {@link MongoDatabaseFactory} and * collection name * @param factory the mongodb factory * @param collectionName the collection name where it persists the data */ - public MongoDbMetadataStore(MongoDbFactory factory, String collectionName) { + public MongoDbMetadataStore(MongoDatabaseFactory factory, String collectionName) { this(new MongoTemplate(factory), collectionName); } @@ -105,7 +106,6 @@ public class MongoDbMetadataStore implements ConcurrentMetadataStore { * @param key the metadata entry key * @param value the metadata entry value * @see MongoTemplate#execute(String, org.springframework.data.mongodb.core.CollectionCallback) - * @see com.mongodb.DBCollection#save */ @Override public void put(String key, String value) { @@ -188,7 +188,7 @@ public class MongoDbMetadataStore implements ConcurrentMetadataStore { * @param oldValue the metadata entry old value to replace * @param newValue the metadata entry new value to put * @return {@code true} if replace was successful, {@code false} otherwise. - * @see MongoTemplate#updateFirst(Query, Update, String) + * @see MongoTemplate#updateFirst(Query, UpdateDefinition, String) */ @Override public boolean replace(String key, String oldValue, String newValue) { diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java index 36a87a6909..a4104a30b0 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGateway.java @@ -18,7 +18,7 @@ package org.springframework.integration.mongodb.outbound; import org.bson.Document; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.CollectionCallback; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; @@ -47,7 +47,7 @@ import org.springframework.util.Assert; */ public class MongoDbOutboundGateway extends AbstractReplyProducingMessageHandler { - private MongoDbFactory mongoDbFactory; + private MongoDatabaseFactory mongoDbFactory; private MongoConverter mongoConverter; @@ -65,13 +65,13 @@ public class MongoDbOutboundGateway extends AbstractReplyProducingMessageHandler private Expression collectionNameExpression; - public MongoDbOutboundGateway(MongoDbFactory mongoDbFactory) { + public MongoDbOutboundGateway(MongoDatabaseFactory mongoDbFactory) { this(mongoDbFactory, new MappingMongoConverter(new DefaultDbRefResolver(mongoDbFactory), new MongoMappingContext())); } - public MongoDbOutboundGateway(MongoDbFactory mongoDbFactory, MongoConverter mongoConverter) { - Assert.notNull(mongoDbFactory, "mongoDbFactory must not be null."); + public MongoDbOutboundGateway(MongoDatabaseFactory mongoDbFactory, MongoConverter mongoConverter) { + Assert.notNull(mongoDbFactory, "mongoDatabaseFactory must not be null."); Assert.notNull(mongoConverter, "mongoConverter must not be null."); this.mongoDbFactory = mongoDbFactory; this.mongoConverter = mongoConverter; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java index 3e97756695..cc7dd6a9dc 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java @@ -16,7 +16,7 @@ package org.springframework.integration.mongodb.outbound; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.MongoConverter; @@ -42,7 +42,7 @@ public class MongoDbStoringMessageHandler extends AbstractMessageHandler { private volatile MongoOperations mongoTemplate; - private volatile MongoDbFactory mongoDbFactory; + private volatile MongoDatabaseFactory mongoDbFactory; private volatile MongoConverter mongoConverter; @@ -53,11 +53,11 @@ public class MongoDbStoringMessageHandler extends AbstractMessageHandler { private volatile boolean initialized = false; /** - * Will construct this instance using provided {@link MongoDbFactory} + * Will construct this instance using provided {@link MongoDatabaseFactory} * * @param mongoDbFactory The mongodb factory. */ - public MongoDbStoringMessageHandler(MongoDbFactory mongoDbFactory) { + public MongoDbStoringMessageHandler(MongoDatabaseFactory mongoDbFactory) { Assert.notNull(mongoDbFactory, "'mongoDbFactory' must not be null"); this.mongoDbFactory = mongoDbFactory; @@ -78,7 +78,7 @@ public class MongoDbStoringMessageHandler extends AbstractMessageHandler { /** * Allows you to provide custom {@link MongoConverter} used to assist in serialization * of data written to MongoDb. Only allowed if this instance was constructed with a - * {@link MongoDbFactory}. + * {@link MongoDatabaseFactory}. * * @param mongoConverter The mongo converter. */ diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandler.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandler.java index 0b067fed9b..b75ae6dec3 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandler.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/ReactiveMongoDbStoringMessageHandler.java @@ -16,7 +16,7 @@ package org.springframework.integration.mongodb.outbound; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.ReactiveMongoOperations; @@ -77,7 +77,7 @@ public class ReactiveMongoDbStoringMessageHandler extends AbstractReactiveMessag /** * Provide a custom {@link MongoConverter} used to assist in serialization of * data written to MongoDb. Only allowed if this instance was constructed with a - * {@link MongoDbFactory}. + * {@link MongoDatabaseFactory}. * @param mongoConverter The mongo converter. */ public void setMongoConverter(MongoConverter mongoConverter) { diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java index 9640b6c547..309fc4b3aa 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java @@ -32,7 +32,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.dao.DuplicateKeyException; import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.FindAndModifyOptions; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; @@ -76,7 +76,7 @@ public abstract class AbstractConfigurableMongoDbMessageStore extends AbstractMe protected final String collectionName; // NOSONAR - final - protected final MongoDbFactory mongoDbFactory; // NOSONAR - final + protected final MongoDatabaseFactory mongoDbFactory; // NOSONAR - final private MongoTemplate mongoTemplate; @@ -94,11 +94,11 @@ public abstract class AbstractConfigurableMongoDbMessageStore extends AbstractMe this.mongoDbFactory = null; } - public AbstractConfigurableMongoDbMessageStore(MongoDbFactory mongoDbFactory, String collectionName) { + public AbstractConfigurableMongoDbMessageStore(MongoDatabaseFactory mongoDbFactory, String collectionName) { this(mongoDbFactory, null, collectionName); } - public AbstractConfigurableMongoDbMessageStore(MongoDbFactory mongoDbFactory, + public AbstractConfigurableMongoDbMessageStore(MongoDatabaseFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter, String collectionName) { Assert.notNull(mongoDbFactory, "'mongoDbFactory' must not be null"); Assert.hasText(collectionName, "'collectionName' must not be empty"); diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java index 9feee1ba4c..ed68c09aba 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import org.springframework.data.domain.Sort; -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.convert.MappingMongoConverter; import org.springframework.data.mongodb.core.query.Criteria; @@ -68,19 +68,19 @@ public class ConfigurableMongoDbMessageStore extends AbstractConfigurableMongoDb super(mongoTemplate, collectionName); } - public ConfigurableMongoDbMessageStore(MongoDbFactory mongoDbFactory) { + public ConfigurableMongoDbMessageStore(MongoDatabaseFactory mongoDbFactory) { this(mongoDbFactory, null, DEFAULT_COLLECTION_NAME); } - public ConfigurableMongoDbMessageStore(MongoDbFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter) { + public ConfigurableMongoDbMessageStore(MongoDatabaseFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter) { this(mongoDbFactory, mappingMongoConverter, DEFAULT_COLLECTION_NAME); } - public ConfigurableMongoDbMessageStore(MongoDbFactory mongoDbFactory, String collectionName) { + public ConfigurableMongoDbMessageStore(MongoDatabaseFactory mongoDbFactory, String collectionName) { this(mongoDbFactory, null, collectionName); } - public ConfigurableMongoDbMessageStore(MongoDbFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter, + public ConfigurableMongoDbMessageStore(MongoDatabaseFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter, String collectionName) { super(mongoDbFactory, mappingMongoConverter, collectionName); diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbChannelMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbChannelMessageStore.java index 123d2c37b0..281fd83bfb 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbChannelMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbChannelMessageStore.java @@ -17,7 +17,7 @@ package org.springframework.integration.mongodb.store; import org.springframework.data.domain.Sort; -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.convert.MappingMongoConverter; import org.springframework.data.mongodb.core.index.Index; @@ -61,19 +61,19 @@ public class MongoDbChannelMessageStore extends AbstractConfigurableMongoDbMessa super(mongoTemplate, collectionName); } - public MongoDbChannelMessageStore(MongoDbFactory mongoDbFactory) { + public MongoDbChannelMessageStore(MongoDatabaseFactory mongoDbFactory) { this(mongoDbFactory, null, DEFAULT_COLLECTION_NAME); } - public MongoDbChannelMessageStore(MongoDbFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter) { + public MongoDbChannelMessageStore(MongoDatabaseFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter) { this(mongoDbFactory, mappingMongoConverter, DEFAULT_COLLECTION_NAME); } - public MongoDbChannelMessageStore(MongoDbFactory mongoDbFactory, String collectionName) { + public MongoDbChannelMessageStore(MongoDatabaseFactory mongoDbFactory, String collectionName) { this(mongoDbFactory, null, collectionName); } - public MongoDbChannelMessageStore(MongoDbFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter, + public MongoDbChannelMessageStore(MongoDatabaseFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter, String collectionName) { super(mongoDbFactory, mappingMongoConverter, collectionName); } diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java index 3133289e10..20dff75a67 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java @@ -47,7 +47,7 @@ import org.springframework.data.convert.ReadingConverter; import org.springframework.data.convert.WritingConverter; import org.springframework.data.domain.Sort; 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.BulkOperations; import org.springframework.data.mongodb.core.FindAndModifyOptions; import org.springframework.data.mongodb.core.MongoTemplate; @@ -141,19 +141,19 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore private String[] whiteListPatterns; /** - * Create a MongoDbMessageStore using the provided {@link MongoDbFactory}.and the default collection name. + * Create a MongoDbMessageStore using the provided {@link MongoDatabaseFactory}.and the default collection name. * @param mongoDbFactory The mongodb factory. */ - public MongoDbMessageStore(MongoDbFactory mongoDbFactory) { + public MongoDbMessageStore(MongoDatabaseFactory mongoDbFactory) { this(mongoDbFactory, null); } /** - * Create a MongoDbMessageStore using the provided {@link MongoDbFactory} and collection name. + * Create a MongoDbMessageStore using the provided {@link MongoDatabaseFactory} and collection name. * @param mongoDbFactory The mongodb factory. * @param collectionName The collection name. */ - public MongoDbMessageStore(MongoDbFactory mongoDbFactory, @Nullable String collectionName) { + public MongoDbMessageStore(MongoDatabaseFactory mongoDbFactory, @Nullable String collectionName) { Assert.notNull(mongoDbFactory, "mongoDbFactory must not be null"); this.converter = new MessageReadingMongoConverter(mongoDbFactory, new MongoMappingContext()); this.template = new MongoTemplate(mongoDbFactory, this.converter); @@ -523,7 +523,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore private Object[] customConverters; - MessageReadingMongoConverter(MongoDbFactory mongoDbFactory, + MessageReadingMongoConverter(MongoDatabaseFactory mongoDbFactory, MappingContext, MongoPersistentProperty> mappingContext) { super(new DefaultDbRefResolver(mongoDbFactory), mappingContext); } diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParserTests-context.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParserTests-context.xml index df71797cb7..19b6fe0f59 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParserTests-context.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterParserTests-context.xml @@ -8,7 +8,7 @@ http://www.springframework.org/schema/integration/mongodb https://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd"> - + message = new GenericMessage(this.createPerson("Bob")); channel.send(message); - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); assertThat(template.find(new BasicQuery("{'name' : 'Bob'}"), Person.class, "data")).isNotNull(); context.close(); @@ -58,7 +58,7 @@ public class MongoDbOutboundChannelAdapterIntegrationTests extends MongoDbAvaila @Test @MongoDbAvailable public void testWithNamedCollection() throws Exception { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory("foo"); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory("foo"); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("outbound-adapter-config.xml", this.getClass()); @@ -77,7 +77,7 @@ public class MongoDbOutboundChannelAdapterIntegrationTests extends MongoDbAvaila @Test @MongoDbAvailable public void testWithTemplate() throws Exception { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory("foo"); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory("foo"); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("outbound-adapter-config.xml", this.getClass()); @@ -100,7 +100,7 @@ public class MongoDbOutboundChannelAdapterIntegrationTests extends MongoDbAvaila BasicDBObject dbObject = BasicDBObject.parse("{'foo' : 'bar'}"); - MongoDbFactory mongoDbFactory = this.prepareMongoFactory("foo"); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory("foo"); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("outbound-adapter-config.xml", this.getClass()); @@ -124,7 +124,7 @@ public class MongoDbOutboundChannelAdapterIntegrationTests extends MongoDbAvaila String object = "{'foo' : 'bar'}"; - MongoDbFactory mongoDbFactory = this.prepareMongoFactory("foo"); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory("foo"); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("outbound-adapter-config.xml", this.getClass()); @@ -152,7 +152,7 @@ public class MongoDbOutboundChannelAdapterIntegrationTests extends MongoDbAvaila Message message = new GenericMessage(this.createPerson("Bob")); channel.send(message); - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); assertThat(template.find(new BasicQuery("{'name' : 'Bob'}"), Person.class, "data")).isNotNull(); context.close(); diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests-context.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests-context.xml index c8bc944d8b..8b8307f506 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests-context.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundGatewayParserTests-context.xml @@ -62,7 +62,7 @@ - + - + - + - + diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-adapter-parser-fail-template-converter-config.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-adapter-parser-fail-template-converter-config.xml index 161a1de389..87c865cb9b 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-adapter-parser-fail-template-converter-config.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-adapter-parser-fail-template-converter-config.xml @@ -10,7 +10,7 @@ http://www.springframework.org/schema/integration/mongodb https://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd"> - + - + - + diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-gateway-fail-template-converter-config.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-gateway-fail-template-converter-config.xml index 507f6d893a..927a7c41e4 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-gateway-fail-template-converter-config.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-gateway-fail-template-converter-config.xml @@ -19,7 +19,7 @@ reply-channel="out"/> - + diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-gateway-fail-template-factory-config.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-gateway-fail-template-factory-config.xml index 891fc69faf..4d808d6a1d 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-gateway-fail-template-factory-config.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/outbound-gateway-fail-template-factory-config.xml @@ -19,7 +19,7 @@ reply-channel="out"/> - + diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java index 03388c6912..47cb1aad25 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java @@ -30,11 +30,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.BulkOperations; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; import org.springframework.data.mongodb.core.convert.MongoConverter; import org.springframework.data.mongodb.core.mapping.MongoMappingContext; import org.springframework.data.mongodb.core.query.Criteria; @@ -325,8 +325,8 @@ public class MongoDbTests extends MongoDbAvailableTests { } @Bean - public MongoDbFactory mongoDbFactory() { - return new SimpleMongoClientDbFactory(MongoClients.create(), "test"); + public MongoDatabaseFactory mongoDbFactory() { + return new SimpleMongoClientDatabaseFactory(MongoClients.create(), "test"); } @Bean diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSourceTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSourceTests.java index e6ace19105..f398e3ad00 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSourceTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSourceTests.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.springframework.beans.factory.BeanFactory; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.MappingMongoConverter; @@ -58,7 +58,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @Test public void withNullMongoDBFactory() { assertThatIllegalArgumentException() - .isThrownBy(() -> new MongoDbMessageSource((MongoDbFactory) null, mock(Expression.class))); + .isThrownBy(() -> new MongoDbMessageSource((MongoDatabaseFactory) null, mock(Expression.class))); } @Test @@ -70,13 +70,13 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @Test public void withNullQueryExpression() { assertThatIllegalArgumentException() - .isThrownBy(() -> new MongoDbMessageSource(mock(MongoDbFactory.class), null)); + .isThrownBy(() -> new MongoDbMessageSource(mock(MongoDatabaseFactory.class), null)); } @Test @MongoDbAvailable public void validateSuccessfulQueryWithSingleElementIfOneInListAsDbObject() { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.save(this.createPerson(), "data"); @@ -96,7 +96,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @Test @MongoDbAvailable public void validateSuccessfulQueryWithSingleElementIfOneInList() { - MongoDbFactory mongoDbFactory = prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.save(this.createPerson(), "data"); @@ -117,7 +117,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @Test @MongoDbAvailable public void validateSuccessfulQueryWithSingleElementIfOneInListAndSingleResult() { - MongoDbFactory mongoDbFactory = prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.save(this.createPerson(), "data"); @@ -138,7 +138,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @Test @MongoDbAvailable public void validateSuccessfulSubObjectQueryWithSingleElementIfOneInList() { - MongoDbFactory mongoDbFactory = prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.save(this.createPerson(), "data"); @@ -180,7 +180,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @SuppressWarnings("unchecked") private List queryMultipleElements(Expression queryExpression) { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.save(this.createPerson("Manny"), "data"); @@ -198,7 +198,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @MongoDbAvailable public void validateSuccessfulQueryWithNullReturn() { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.save(this.createPerson("Manny"), "data"); @@ -217,7 +217,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @MongoDbAvailable public void validateSuccessfulQueryWithCustomConverter() { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.save(this.createPerson("Manny"), "data"); @@ -243,7 +243,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @MongoDbAvailable public void validateSuccessfulQueryWithMongoTemplate() { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MappingMongoConverter converter = new TestMongoConverter(mongoDbFactory, new MongoMappingContext()); converter.afterPropertiesSet(); @@ -269,7 +269,7 @@ public class MongoDbMessageSourceTests extends MongoDbAvailableTests { @MongoDbAvailable public void validatePipelineInModifyOut() { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate template = new MongoTemplate(mongoDbFactory); diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStoreTests.java index 0e743fd9b0..c4c705a5ca 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/metadata/MongoDbMetadataStoreTests.java @@ -21,7 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; import org.junit.Before; import org.junit.Test; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.integration.mongodb.rules.MongoDbAvailable; import org.springframework.integration.mongodb.rules.MongoDbAvailableTests; @@ -45,7 +45,7 @@ public class MongoDbMetadataStoreTests extends MongoDbAvailableTests { @Before public void configure() { - final MongoDbFactory mongoDbFactory = this.prepareMongoFactory(DEFAULT_COLLECTION_NAME); + final MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(DEFAULT_COLLECTION_NAME); this.store = new MongoDbMetadataStore(mongoDbFactory); } @@ -53,7 +53,7 @@ public class MongoDbMetadataStoreTests extends MongoDbAvailableTests { @Test public void testConfigureCustomCollection() { final String collectionName = "testMetadataStore"; - final MongoDbFactory mongoDbFactory = this.prepareMongoFactory(collectionName); + final MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(collectionName); final MongoTemplate template = new MongoTemplate(mongoDbFactory); store = new MongoDbMetadataStore(template, collectionName); testBasics(); @@ -62,7 +62,7 @@ public class MongoDbMetadataStoreTests extends MongoDbAvailableTests { @MongoDbAvailable @Test public void testConfigureFactory() { - final MongoDbFactory mongoDbFactory = this.prepareMongoFactory(DEFAULT_COLLECTION_NAME); + final MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(DEFAULT_COLLECTION_NAME); store = new MongoDbMetadataStore(mongoDbFactory); testBasics(); } @@ -71,7 +71,7 @@ public class MongoDbMetadataStoreTests extends MongoDbAvailableTests { @Test public void testConfigureFactorCustomCollection() { final String collectionName = "testMetadataStore"; - final MongoDbFactory mongoDbFactory = this.prepareMongoFactory(collectionName); + final MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(collectionName); store = new MongoDbMetadataStore(mongoDbFactory, collectionName); testBasics(); } diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayTests.java index a3d6c9b27b..3dccd1f3c4 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayTests.java @@ -31,7 +31,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.BulkOperations; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; @@ -74,7 +74,7 @@ public class MongoDbOutboundGatewayTests extends MongoDbAvailableTests { private MongoConverter mongoConverter; @Autowired - private MongoDbFactory mongoDbFactory; + private MongoDatabaseFactory mongoDbFactory; @Before public void setUp() { @@ -97,7 +97,7 @@ public class MongoDbOutboundGatewayTests extends MongoDbAvailableTests { public void testNoFactorySpecified() { try { - new MongoDbOutboundGateway((MongoDbFactory) null); + new MongoDbOutboundGateway((MongoDatabaseFactory) null); fail("Expected the test case to throw an IllegalArgumentException"); } catch (IllegalArgumentException e) { diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayXmlTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayXmlTests.java index 08fd2c4543..e93d38247c 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayXmlTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbOutboundGatewayXmlTests.java @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.mongodb.rules.MongoDbAvailable; @@ -53,7 +53,7 @@ public class MongoDbOutboundGatewayXmlTests extends MongoDbAvailableTests { @Before public void setUp() throws Exception { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate mongoTemplate = new MongoTemplate(mongoDbFactory); mongoTemplate.save(this.createPerson("Artem"), COLLECTION_NAME); @@ -64,7 +64,7 @@ public class MongoDbOutboundGatewayXmlTests extends MongoDbAvailableTests { @After public void cleanUp() throws Exception { - MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); MongoTemplate mongoTemplate = new MongoTemplate(mongoDbFactory); mongoTemplate.dropCollection(COLLECTION_NAME); diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java index d8288b696b..2ba196e50f 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.springframework.beans.factory.BeanFactory; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.MappingMongoConverter; @@ -53,7 +53,7 @@ public class MongoDbStoringMessageHandlerTests extends MongoDbAvailableTests { private MongoTemplate template; - private MongoDbFactory mongoDbFactory; + private MongoDatabaseFactory mongoDbFactory; @Before public void setUp() { @@ -66,7 +66,7 @@ public class MongoDbStoringMessageHandlerTests extends MongoDbAvailableTests { @MongoDbAvailable public void withNullMongoDBFactory() { assertThatIllegalArgumentException() - .isThrownBy(() -> new MongoDbStoringMessageHandler((MongoDbFactory) null)); + .isThrownBy(() -> new MongoDbStoringMessageHandler((MongoDatabaseFactory) null)); } @Test diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableRule.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableRule.java index e2bcc14b31..86e774d782 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableRule.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableRule.java @@ -16,15 +16,17 @@ package org.springframework.integration.mongodb.rules; +import java.util.concurrent.TimeUnit; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.rules.MethodRule; import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.Statement; -import com.mongodb.MongoClient; -import com.mongodb.MongoClientOptions; -import com.mongodb.ServerAddress; +import com.mongodb.MongoClientSettings; +import com.mongodb.client.MongoClient; +import com.mongodb.client.internal.MongoClientImpl; /** * A {@link MethodRule} implementation that checks for a running MongoDB process. @@ -46,11 +48,11 @@ public final class MongoDbAvailableRule implements MethodRule { public void evaluate() throws Throwable { MongoDbAvailable mongoAvailable = method.getAnnotation(MongoDbAvailable.class); if (mongoAvailable != null) { - try { - MongoClientOptions options = new MongoClientOptions.Builder() - .serverSelectionTimeout(100) - .build(); - MongoClient mongo = new MongoClient(ServerAddress.defaultHost(), options); + MongoClientSettings settings = MongoClientSettings.builder() + .applyToSocketSettings(ss -> ss.connectTimeout(100, TimeUnit.MILLISECONDS)) + .applyToClusterSettings(cs -> cs.serverSelectionTimeout(100, TimeUnit.MILLISECONDS)) + .build(); + try (MongoClient mongo = new MongoClientImpl(settings, null)) { mongo.listDatabaseNames() .first(); } diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableTests.java index 8df8a9c232..01128cb2eb 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableTests.java @@ -24,11 +24,11 @@ import org.junit.Rule; import org.springframework.dao.DataAccessException; import org.springframework.data.mapping.context.MappingContext; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory; import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; import org.springframework.data.mongodb.core.convert.MappingMongoConverter; @@ -59,8 +59,8 @@ public abstract class MongoDbAvailableTests { public MongoDbAvailableRule mongoDbAvailableRule = new MongoDbAvailableRule(); - protected MongoDbFactory prepareMongoFactory(String... additionalCollectionsToDrop) { - MongoDbFactory mongoDbFactory = new SimpleMongoClientDbFactory(MongoClients.create(), "test"); + protected MongoDatabaseFactory prepareMongoFactory(String... additionalCollectionsToDrop) { + MongoDatabaseFactory mongoDbFactory = new SimpleMongoClientDatabaseFactory(MongoClients.create(), "test"); cleanupCollections(mongoDbFactory, additionalCollectionsToDrop); return mongoDbFactory; } @@ -84,7 +84,7 @@ public abstract class MongoDbAvailableTests { } } - protected void cleanupCollections(MongoDbFactory mongoDbFactory, String... additionalCollectionsToDrop) { + protected void cleanupCollections(MongoDatabaseFactory mongoDbFactory, String... additionalCollectionsToDrop) { MongoTemplate template = new MongoTemplate(mongoDbFactory); template.dropCollection("messages"); template.dropCollection("configurableStoreMessages"); @@ -179,7 +179,7 @@ public abstract class MongoDbAvailableTests { public static class TestMongoConverter extends MappingMongoConverter { public TestMongoConverter( - MongoDbFactory mongoDbFactory, + MongoDatabaseFactory mongoDbFactory, MappingContext, MongoPersistentProperty> mappingContext) { super(new DefaultDbRefResolver(mongoDbFactory), mappingContext); diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageGroupStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageGroupStoreTests.java index 32eb7b51d4..459b2526ab 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageGroupStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageGroupStoreTests.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; @@ -59,8 +59,8 @@ public abstract class AbstractMongoDbMessageGroupStoreTests extends MongoDbAvail protected final GenericApplicationContext testApplicationContext = TestUtils.createTestApplicationContext(); - protected final SimpleMongoClientDbFactory clientDbFactory = - new SimpleMongoClientDbFactory(MongoClients.create(), "test"); + protected final SimpleMongoClientDatabaseFactory clientDbFactory = + new SimpleMongoClientDatabaseFactory(MongoClients.create(), "test"); @Before public void setup() { @@ -423,7 +423,7 @@ public abstract class AbstractMongoDbMessageGroupStoreTests extends MongoDbAvail // @Test // @MongoDbAvailable // public void testConcurrentModifications() throws Exception{ - // MongoDbFactory mongoDbFactory = this.prepareMongoFactory(); + // MongoDatabaseFactory mongoDbFactory = this.prepareMongoFactory(); // final MongoDbMessageStore store1 = new MongoDbMessageStore(mongoDbFactory); // final MongoDbMessageStore store2 = new MongoDbMessageStore(mongoDbFactory); // diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageStoreTests.java index e4ce0e2b5b..f27e34c3da 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/AbstractMongoDbMessageStoreTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; import org.springframework.data.annotation.PersistenceConstructor; -import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.AdviceMessage; @@ -58,8 +58,8 @@ public abstract class AbstractMongoDbMessageStoreTests extends MongoDbAvailableT protected final GenericApplicationContext testApplicationContext = TestUtils.createTestApplicationContext(); - protected final SimpleMongoClientDbFactory clientDbFactory = - new SimpleMongoClientDbFactory(MongoClients.create(), "test"); + protected final SimpleMongoClientDatabaseFactory clientDbFactory = + new SimpleMongoClientDatabaseFactory(MongoClients.create(), "test"); @Before public void setup() { diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationConfigurableTests-context.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationConfigurableTests-context.xml index b09c76f38f..6218f570ed 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationConfigurableTests-context.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationConfigurableTests-context.xml @@ -1,33 +1,42 @@ - - + - - - - - - + + + + + + + + + + - - - + + + - - + + - + diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests-context.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests-context.xml index afa6ae3f16..153a7639f6 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests-context.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests-context.xml @@ -1,33 +1,42 @@ - - + - - - - - - + + + + + + + + + + - - - + + + - - + + - + diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java index 3773bad785..db1aa124b7 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; import org.springframework.integration.mongodb.rules.MongoDbAvailable; import org.springframework.integration.mongodb.rules.MongoDbAvailableTests; import org.springframework.integration.support.MessageBuilder; @@ -44,8 +44,8 @@ public class MongoDbMessageStoreClaimCheckIntegrationTests extends MongoDbAvaila private final GenericApplicationContext testApplicationContext = TestUtils.createTestApplicationContext(); - private final SimpleMongoClientDbFactory clientDbFactory = - new SimpleMongoClientDbFactory(MongoClients.create(), "test"); + private final SimpleMongoClientDatabaseFactory clientDbFactory = + new SimpleMongoClientDatabaseFactory(MongoClients.create(), "test"); @Before public void setup() { diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/mongo-aggregator-config.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/mongo-aggregator-config.xml index 7faf6f9cfe..2281664017 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/mongo-aggregator-config.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/mongo-aggregator-config.xml @@ -20,9 +20,13 @@ - + - + + + + + diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/mongo-aggregator-configurable-config.xml b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/mongo-aggregator-configurable-config.xml index c7c3209eb3..a04690b866 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/mongo-aggregator-configurable-config.xml +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/mongo-aggregator-configurable-config.xml @@ -20,9 +20,13 @@ - + - + + + + +