#553 - Upgrade Mongo examples to Spring Boot 2.3.
This commit is contained in:
@@ -17,11 +17,10 @@ package example.springdata.mongodb.aggregation;
|
|||||||
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test configuration to connect to a MongoDB named "test" and using a {@link MongoClient}. Also enables Spring Data
|
* Test configuration to connect to a MongoDB named "test" and using a {@link com.mongodb.client.MongoClient}. Also
|
||||||
* repositories for MongoDB.
|
* enables Spring Data repositories for MongoDB.
|
||||||
*
|
*
|
||||||
* @author Oliver Gierke
|
* @author Oliver Gierke
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ import org.bson.Document;
|
|||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.core.io.ClassPathResource;
|
import org.springframework.core.io.ClassPathResource;
|
||||||
@@ -45,8 +46,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
|
|||||||
import org.springframework.data.mongodb.core.query.Query;
|
import org.springframework.data.mongodb.core.query.Query;
|
||||||
import org.springframework.test.context.junit4.SpringRunner;
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
|
|
||||||
import com.mongodb.util.JSON;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Examples for Spring Books using the MongoDB Aggregation Framework. Data originates from Google's Book search.
|
* Examples for Spring Books using the MongoDB Aggregation Framework. Data originates from Google's Book search.
|
||||||
*
|
*
|
||||||
@@ -70,7 +69,8 @@ public class SpringBooksIntegrationTests {
|
|||||||
|
|
||||||
File file = new ClassPathResource("books.json").getFile();
|
File file = new ClassPathResource("books.json").getFile();
|
||||||
String content = Files.contentOf(file, StandardCharsets.UTF_8);
|
String content = Files.contentOf(file, StandardCharsets.UTF_8);
|
||||||
List<Object> books = (List<Object>) JSON.parse(content);
|
Document wrapper = Document.parse("{wrapper: " + content + "}");
|
||||||
|
List<Object> books = wrapper.getList("wrapper", Object.class);
|
||||||
|
|
||||||
operations.insert(books, "books");
|
operations.insert(books, "books");
|
||||||
}
|
}
|
||||||
@@ -202,13 +202,13 @@ public class SpringBooksIntegrationTests {
|
|||||||
List<BookFacetPerPage> mappedResults = result.getMappedResults();
|
List<BookFacetPerPage> mappedResults = result.getMappedResults();
|
||||||
|
|
||||||
BookFacetPerPage facet_20_to_100_pages = mappedResults.get(0);
|
BookFacetPerPage facet_20_to_100_pages = mappedResults.get(0);
|
||||||
assertThat(facet_20_to_100_pages.getMin()).isEqualTo(20);
|
assertThat(facet_20_to_100_pages.getId().getMin()).isEqualTo(20);
|
||||||
assertThat(facet_20_to_100_pages.getMax()).isEqualTo(100);
|
assertThat(facet_20_to_100_pages.getId().getMax()).isEqualTo(100);
|
||||||
assertThat(facet_20_to_100_pages.getCount()).isEqualTo(12);
|
assertThat(facet_20_to_100_pages.getCount()).isEqualTo(12);
|
||||||
|
|
||||||
BookFacetPerPage facet_100_to_500_pages = mappedResults.get(1);
|
BookFacetPerPage facet_100_to_500_pages = mappedResults.get(1);
|
||||||
assertThat(facet_100_to_500_pages.getMin()).isEqualTo(100);
|
assertThat(facet_100_to_500_pages.getId().getMin()).isEqualTo(100);
|
||||||
assertThat(facet_100_to_500_pages.getMax()).isEqualTo(500);
|
assertThat(facet_100_to_500_pages.getId().getMax()).isEqualTo(500);
|
||||||
assertThat(facet_100_to_500_pages.getCount()).isEqualTo(63);
|
assertThat(facet_100_to_500_pages.getCount()).isEqualTo(63);
|
||||||
assertThat(facet_100_to_500_pages.getTitles()).contains("Spring Data");
|
assertThat(facet_100_to_500_pages.getTitles()).contains("Spring Data");
|
||||||
}
|
}
|
||||||
@@ -280,9 +280,15 @@ public class SpringBooksIntegrationTests {
|
|||||||
@Value
|
@Value
|
||||||
@Getter
|
@Getter
|
||||||
static class BookFacetPerPage {
|
static class BookFacetPerPage {
|
||||||
int min;
|
BookFacetPerPageId id;
|
||||||
int max;
|
|
||||||
int count;
|
int count;
|
||||||
List<String> titles;
|
List<String> titles;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Value
|
||||||
|
@Getter
|
||||||
|
static class BookFacetPerPageId {
|
||||||
|
int min;
|
||||||
|
int max;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import static org.springframework.data.mongodb.core.query.Criteria.*;
|
|||||||
import static org.springframework.data.mongodb.core.query.Query.*;
|
import static org.springframework.data.mongodb.core.query.Query.*;
|
||||||
import static org.springframework.data.mongodb.core.query.Update.*;
|
import static org.springframework.data.mongodb.core.query.Update.*;
|
||||||
|
|
||||||
|
import com.mongodb.client.MongoClient;
|
||||||
import example.springdata.mongodb.util.EmbeddedMongo;
|
import example.springdata.mongodb.util.EmbeddedMongo;
|
||||||
import reactor.core.publisher.Flux;
|
import reactor.core.publisher.Flux;
|
||||||
import reactor.test.StepVerifier;
|
import reactor.test.StepVerifier;
|
||||||
@@ -41,7 +42,7 @@ import org.springframework.data.mongodb.core.ChangeStreamEvent;
|
|||||||
import org.springframework.data.mongodb.core.ChangeStreamOptions;
|
import org.springframework.data.mongodb.core.ChangeStreamOptions;
|
||||||
import org.springframework.data.mongodb.core.MongoTemplate;
|
import org.springframework.data.mongodb.core.MongoTemplate;
|
||||||
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
|
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
|
||||||
import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
|
import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
|
||||||
import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
|
import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
|
||||||
import org.springframework.data.mongodb.core.messaging.ChangeStreamRequest;
|
import org.springframework.data.mongodb.core.messaging.ChangeStreamRequest;
|
||||||
import org.springframework.data.mongodb.core.messaging.DefaultMessageListenerContainer;
|
import org.springframework.data.mongodb.core.messaging.DefaultMessageListenerContainer;
|
||||||
@@ -50,7 +51,6 @@ import org.springframework.data.mongodb.core.messaging.MessageListenerContainer;
|
|||||||
import org.springframework.data.mongodb.core.messaging.Subscription;
|
import org.springframework.data.mongodb.core.messaging.Subscription;
|
||||||
import org.springframework.test.context.junit4.SpringRunner;
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
|
||||||
import com.mongodb.client.model.changestream.ChangeStreamDocument;
|
import com.mongodb.client.model.changestream.ChangeStreamDocument;
|
||||||
import com.mongodb.reactivestreams.client.MongoClients;
|
import com.mongodb.reactivestreams.client.MongoClients;
|
||||||
|
|
||||||
@@ -101,8 +101,8 @@ public class ChangeStreamsTests {
|
|||||||
* @return a new {@link SimpleReactiveMongoDatabaseFactory}.
|
* @return a new {@link SimpleReactiveMongoDatabaseFactory}.
|
||||||
*/
|
*/
|
||||||
@Bean
|
@Bean
|
||||||
SimpleMongoDbFactory mongoDbFactory() {
|
SimpleMongoClientDatabaseFactory mongoDbFactory() {
|
||||||
return new SimpleMongoDbFactory(replSet.getMongoClient(), "changestreams");
|
return new SimpleMongoClientDatabaseFactory(replSet.getMongoClient(), "changestreams");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -23,10 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.data.mongodb.core.MongoOperations;
|
import org.springframework.data.mongodb.core.MongoOperations;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test configuration to connect to a MongoDB named "test" and using a {@link MongoClient} with profiling enabled.
|
* Test configuration to connect to a MongoDB named "test" and using a {@code MongoClient} with profiling enabled.
|
||||||
*
|
*
|
||||||
* @author Christoph Strobl
|
* @author Christoph Strobl
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -17,10 +17,9 @@ package example.springdata.mongodb.customer;
|
|||||||
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test configuration to connect to a MongoDB named "test" and using a {@link MongoClient}. Also enables Spring Data
|
* Test configuration to connect to a MongoDB named "test" and using a {@code MongoClient}. Also enables Spring Data
|
||||||
* repositories for MongoDB.
|
* repositories for MongoDB.
|
||||||
*
|
*
|
||||||
* @author Oliver Gierke
|
* @author Oliver Gierke
|
||||||
|
|||||||
@@ -21,10 +21,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
|
import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test configuration to connect to a MongoDB named "test" using a {@link MongoClient}. <br />
|
* Test configuration to connect to a MongoDB named "test" using a {@code MongoClient}. <br />
|
||||||
* Also enables Spring Data repositories for MongoDB.
|
* Also enables Spring Data repositories for MongoDB.
|
||||||
*
|
*
|
||||||
* @author Mark Paluch
|
* @author Mark Paluch
|
||||||
|
|||||||
@@ -17,10 +17,8 @@ package example.springdata.mongodb.imperative;
|
|||||||
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration to connect to MongoDB using a {@link MongoClient}. <br />
|
* Configuration to connect to MongoDB using a {@code MongoClient}. <br />
|
||||||
* Enables Spring Data repositories for MongoDB.
|
* Enables Spring Data repositories for MongoDB.
|
||||||
*
|
*
|
||||||
* @author Christoph Strobl
|
* @author Christoph Strobl
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package example.springdata.mongodb.textsearch;
|
package example.springdata.mongodb.textsearch;
|
||||||
|
|
||||||
|
import javax.annotation.PostConstruct;
|
||||||
import javax.annotation.PreDestroy;
|
import javax.annotation.PreDestroy;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -24,11 +25,13 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
import org.springframework.core.io.ClassPathResource;
|
import org.springframework.core.io.ClassPathResource;
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
import org.springframework.data.mongodb.core.MongoOperations;
|
import org.springframework.data.mongodb.core.MongoOperations;
|
||||||
|
import org.springframework.data.mongodb.core.index.IndexResolver;
|
||||||
import org.springframework.data.repository.init.Jackson2RepositoryPopulatorFactoryBean;
|
import org.springframework.data.repository.init.Jackson2RepositoryPopulatorFactoryBean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Christoph Strobl
|
* @author Christoph Strobl
|
||||||
* @author Oliver Gierke
|
* @author Oliver Gierke
|
||||||
|
* @author Mark Paluch
|
||||||
*/
|
*/
|
||||||
@Configuration
|
@Configuration
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@@ -43,6 +46,14 @@ public class MongoTestConfiguration {
|
|||||||
return factoryBean;
|
return factoryBean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
private void postConstruct() {
|
||||||
|
|
||||||
|
IndexResolver resolver = IndexResolver.create(operations.getConverter().getMappingContext());
|
||||||
|
|
||||||
|
resolver.resolveIndexFor(BlogPost.class).forEach(operations.indexOps(BlogPost.class)::ensureIndex);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clean up after execution by dropping used test db instance.
|
* Clean up after execution by dropping used test db instance.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -26,20 +26,21 @@ import org.bson.Document;
|
|||||||
import org.junit.ClassRule;
|
import org.junit.ClassRule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.ComponentScan;
|
import org.springframework.context.annotation.ComponentScan;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.data.mongodb.MongoDbFactory;
|
import org.springframework.data.mongodb.MongoDatabaseFactory;
|
||||||
import org.springframework.data.mongodb.MongoTransactionManager;
|
import org.springframework.data.mongodb.MongoTransactionManager;
|
||||||
import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
|
import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
|
||||||
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
|
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
|
||||||
import org.springframework.test.context.ContextConfiguration;
|
import org.springframework.test.context.ContextConfiguration;
|
||||||
import org.springframework.test.context.junit4.SpringRunner;
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
import org.springframework.transaction.PlatformTransactionManager;
|
import org.springframework.transaction.PlatformTransactionManager;
|
||||||
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
import com.mongodb.client.MongoClient;
|
||||||
import com.mongodb.client.model.Filters;
|
import com.mongodb.client.model.Filters;
|
||||||
import com.mongodb.client.model.Projections;
|
import com.mongodb.client.model.Projections;
|
||||||
|
|
||||||
@@ -59,16 +60,16 @@ public class TransitionServiceTests {
|
|||||||
static final String DB_NAME = "spring-data-tx-examples";
|
static final String DB_NAME = "spring-data-tx-examples";
|
||||||
|
|
||||||
@Autowired TransitionService transitionService;
|
@Autowired TransitionService transitionService;
|
||||||
@Autowired com.mongodb.MongoClient client;
|
@Autowired MongoClient client;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@ComponentScan
|
@ComponentScan
|
||||||
@EnableMongoRepositories
|
@EnableMongoRepositories
|
||||||
@EnableTransactionManagement
|
@EnableTransactionManagement
|
||||||
static class Config extends AbstractMongoConfiguration {
|
static class Config extends AbstractMongoClientConfiguration {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
PlatformTransactionManager transactionManager(MongoDbFactory dbFactory) {
|
PlatformTransactionManager transactionManager(MongoDatabaseFactory dbFactory) {
|
||||||
return new MongoTransactionManager(dbFactory);
|
return new MongoTransactionManager(dbFactory);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -45,11 +45,12 @@ import org.junit.AssumptionViolatedException;
|
|||||||
import org.junit.rules.ExternalResource;
|
import org.junit.rules.ExternalResource;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import org.springframework.util.ObjectUtils;
|
import org.springframework.util.ObjectUtils;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
import com.mongodb.client.MongoClient;
|
||||||
import com.mongodb.MongoClientURI;
|
import com.mongodb.client.MongoClients;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link org.junit.rules.TestRule} for a MongoDB server resource that is started/stopped along the test lifecycle.
|
* {@link org.junit.rules.TestRule} for a MongoDB server resource that is started/stopped along the test lifecycle.
|
||||||
@@ -240,7 +241,7 @@ public class EmbeddedMongo extends ExternalResource {
|
|||||||
String connectionString();
|
String connectionString();
|
||||||
|
|
||||||
default MongoClient mongoClient() {
|
default MongoClient mongoClient() {
|
||||||
return new MongoClient(new MongoClientURI(connectionString()));
|
return MongoClients.create(connectionString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,19 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
package example.springdata.mongodb.util;
|
package example.springdata.mongodb.util;
|
||||||
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.Map.Entry;
|
|
||||||
|
|
||||||
import com.mongodb.*;
|
|
||||||
import de.flapdoodle.embed.process.config.IRuntimeConfig;
|
|
||||||
import de.flapdoodle.embed.process.config.io.ProcessOutput;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import de.flapdoodle.embed.mongo.Command;
|
import de.flapdoodle.embed.mongo.Command;
|
||||||
import de.flapdoodle.embed.mongo.MongodExecutable;
|
import de.flapdoodle.embed.mongo.MongodExecutable;
|
||||||
import de.flapdoodle.embed.mongo.MongodProcess;
|
import de.flapdoodle.embed.mongo.MongodProcess;
|
||||||
@@ -37,7 +24,34 @@ import de.flapdoodle.embed.mongo.MongosProcess;
|
|||||||
import de.flapdoodle.embed.mongo.MongosStarter;
|
import de.flapdoodle.embed.mongo.MongosStarter;
|
||||||
import de.flapdoodle.embed.mongo.config.IMongodConfig;
|
import de.flapdoodle.embed.mongo.config.IMongodConfig;
|
||||||
import de.flapdoodle.embed.mongo.config.IMongosConfig;
|
import de.flapdoodle.embed.mongo.config.IMongosConfig;
|
||||||
|
import de.flapdoodle.embed.mongo.config.Net;
|
||||||
import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
|
import de.flapdoodle.embed.mongo.config.RuntimeConfigBuilder;
|
||||||
|
import de.flapdoodle.embed.process.config.IRuntimeConfig;
|
||||||
|
import de.flapdoodle.embed.process.config.io.ProcessOutput;
|
||||||
|
import lombok.SneakyThrows;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Map.Entry;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
import org.bson.Document;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import com.mongodb.BasicDBList;
|
||||||
|
import com.mongodb.BasicDBObject;
|
||||||
|
import com.mongodb.DBObject;
|
||||||
|
import com.mongodb.MongoClientSettings;
|
||||||
|
import com.mongodb.ServerAddress;
|
||||||
|
import com.mongodb.client.FindIterable;
|
||||||
|
import com.mongodb.client.MongoClient;
|
||||||
|
import com.mongodb.client.MongoClients;
|
||||||
|
import com.mongodb.client.MongoCursor;
|
||||||
|
import com.mongodb.client.MongoDatabase;
|
||||||
|
|
||||||
class MongosSystemForTestFactory {
|
class MongosSystemForTestFactory {
|
||||||
|
|
||||||
@@ -113,16 +127,14 @@ class MongosSystemForTestFactory {
|
|||||||
mongodProcessList.add(process);
|
mongodProcessList.add(process);
|
||||||
}
|
}
|
||||||
Thread.sleep(1000);
|
Thread.sleep(1000);
|
||||||
MongoClientOptions mo = MongoClientOptions.builder()
|
MongoClientSettings mo = MongoClientSettings.builder()
|
||||||
.connectTimeout(10)
|
.applyToSocketSettings(builder -> builder.connectTimeout(10, TimeUnit.SECONDS)).applyToClusterSettings(
|
||||||
|
builder -> builder.hosts(Collections.singletonList(toAddress(mongoConfigList.get(0).net()))))
|
||||||
.build();
|
.build();
|
||||||
MongoClient mongo = new MongoClient(new ServerAddress(mongoConfigList.get(0).net()
|
MongoClient mongo = MongoClients.create(mo);
|
||||||
.getServerAddress().getHostName(), mongoConfigList.get(0).net()
|
MongoDatabase mongoAdminDB = mongo.getDatabase(ADMIN_DATABASE_NAME);
|
||||||
.getPort()), mo);
|
|
||||||
DB mongoAdminDB = mongo.getDB(ADMIN_DATABASE_NAME);
|
|
||||||
|
|
||||||
CommandResult cr = mongoAdminDB
|
Document cr = mongoAdminDB.runCommand(new Document("isMaster", 1));
|
||||||
.command(new BasicDBObject("isMaster", 1));
|
|
||||||
logger.info("isMaster: {}", cr);
|
logger.info("isMaster: {}", cr);
|
||||||
|
|
||||||
// Build BSON object replica set settings
|
// Build BSON object replica set settings
|
||||||
@@ -141,19 +153,19 @@ class MongosSystemForTestFactory {
|
|||||||
replicaSetSetting.put("members", members);
|
replicaSetSetting.put("members", members);
|
||||||
logger.info(replicaSetSetting.toString());
|
logger.info(replicaSetSetting.toString());
|
||||||
// Initialize replica set
|
// Initialize replica set
|
||||||
cr = mongoAdminDB.command(new BasicDBObject("replSetInitiate",
|
cr = mongoAdminDB.runCommand(new Document("replSetInitiate",
|
||||||
replicaSetSetting));
|
replicaSetSetting));
|
||||||
logger.info("replSetInitiate: {}", cr);
|
logger.info("replSetInitiate: {}", cr);
|
||||||
|
|
||||||
Thread.sleep(5000);
|
Thread.sleep(5000);
|
||||||
cr = mongoAdminDB.command(new BasicDBObject("replSetGetStatus", 1));
|
cr = mongoAdminDB.runCommand(new Document("replSetGetStatus", 1));
|
||||||
logger.info("replSetGetStatus: {}", cr);
|
logger.info("replSetGetStatus: {}", cr);
|
||||||
|
|
||||||
// Check replica set status before to proceed
|
// Check replica set status before to proceed
|
||||||
while (!isReplicaSetStarted(cr)) {
|
while (!isReplicaSetStarted(cr)) {
|
||||||
logger.info("Waiting for 3 seconds...");
|
logger.info("Waiting for 3 seconds...");
|
||||||
Thread.sleep(1000);
|
Thread.sleep(1000);
|
||||||
cr = mongoAdminDB.command(new BasicDBObject("replSetGetStatus", 1));
|
cr = mongoAdminDB.runCommand(new Document("replSetGetStatus", 1));
|
||||||
logger.info("replSetGetStatus: {}", cr);
|
logger.info("replSetGetStatus: {}", cr);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,16 +173,16 @@ class MongosSystemForTestFactory {
|
|||||||
mongo = null;
|
mongo = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isReplicaSetStarted(BasicDBObject setting) {
|
private boolean isReplicaSetStarted(Document setting) {
|
||||||
if (setting.get("members") == null) {
|
if (setting.get("members") == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
BasicDBList members = (BasicDBList) setting.get("members");
|
List members = (List) setting.get("members");
|
||||||
for (Object m : members.toArray()) {
|
for (Object m : members) {
|
||||||
BasicDBObject member = (BasicDBObject) m;
|
Document member = (Document) m;
|
||||||
logger.info(member.toString());
|
logger.info(member.toString());
|
||||||
int state = member.getInt("state");
|
int state = member.getInteger("state", 0);
|
||||||
logger.info("state: {}", state);
|
logger.info("state: {}", state);
|
||||||
// 1 - PRIMARY, 2 - SECONDARY, 7 - ARBITER
|
// 1 - PRIMARY, 2 - SECONDARY, 7 - ARBITER
|
||||||
if (state != 1 && state != 2 && state != 7) {
|
if (state != 1 && state != 2 && state != 7) {
|
||||||
@@ -202,14 +214,13 @@ class MongosSystemForTestFactory {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void configureMongos() throws Exception {
|
private void configureMongos() throws Exception {
|
||||||
CommandResult cr;
|
Document cr;
|
||||||
MongoClientOptions options = MongoClientOptions.builder()
|
MongoClientSettings options = MongoClientSettings.builder()
|
||||||
.connectTimeout(10)
|
.applyToSocketSettings(builder -> builder.connectTimeout(10, TimeUnit.SECONDS))
|
||||||
|
.applyToClusterSettings(builder -> builder.hosts(Collections.singletonList(toAddress(this.config.net()))))
|
||||||
.build();
|
.build();
|
||||||
try (MongoClient mongo = new MongoClient(
|
try (MongoClient mongo = MongoClients.create(options)) {
|
||||||
new ServerAddress(this.config.net().getServerAddress()
|
MongoDatabase mongoAdminDB = mongo.getDatabase(ADMIN_DATABASE_NAME);
|
||||||
.getHostName(), this.config.net().getPort()), options)) {
|
|
||||||
DB mongoAdminDB = mongo.getDB(ADMIN_DATABASE_NAME);
|
|
||||||
|
|
||||||
// Add shard from the replica set list
|
// Add shard from the replica set list
|
||||||
for (Entry<String, List<IMongodConfig>> entry : this.replicaSets
|
for (Entry<String, List<IMongodConfig>> entry : this.replicaSets
|
||||||
@@ -226,46 +237,47 @@ class MongosSystemForTestFactory {
|
|||||||
+ ":" + mongodConfig.net().getPort();
|
+ ":" + mongodConfig.net().getPort();
|
||||||
}
|
}
|
||||||
logger.info("Execute add shard command: {}", command);
|
logger.info("Execute add shard command: {}", command);
|
||||||
cr = mongoAdminDB.command(new BasicDBObject("addShard", command));
|
cr = mongoAdminDB.runCommand(new Document("addShard", command));
|
||||||
logger.info(cr.toString());
|
logger.info(cr.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info("Execute list shards.");
|
logger.info("Execute list shards.");
|
||||||
cr = mongoAdminDB.command(new BasicDBObject("listShards", 1));
|
cr = mongoAdminDB.runCommand(new Document("listShards", 1));
|
||||||
logger.info(cr.toString());
|
logger.info(cr.toString());
|
||||||
|
|
||||||
// Enabled sharding at database level
|
// Enabled sharding at database level
|
||||||
logger.info("Enabled sharding at database level");
|
logger.info("Enabled sharding at database level");
|
||||||
cr = mongoAdminDB.command(new BasicDBObject("enableSharding",
|
cr = mongoAdminDB.runCommand(new Document("enableSharding",
|
||||||
this.shardDatabase));
|
this.shardDatabase));
|
||||||
logger.info(cr.toString());
|
logger.info(cr.toString());
|
||||||
|
|
||||||
// Create index in sharded collection
|
// Create index in sharded collection
|
||||||
logger.info("Create index in sharded collection");
|
logger.info("Create index in sharded collection");
|
||||||
DB db = mongo.getDB(this.shardDatabase);
|
MongoDatabase db = mongo.getDatabase(this.shardDatabase);
|
||||||
db.getCollection(this.shardCollection).createIndex(this.shardKey);
|
db.getCollection(this.shardCollection).createIndex(new Document(this.shardKey, 1));
|
||||||
|
|
||||||
// Shard the collection
|
// Shard the collection
|
||||||
logger.info("Shard the collection: {}.{}", this.shardDatabase, this.shardCollection);
|
logger.info("Shard the collection: {}.{}", this.shardDatabase, this.shardCollection);
|
||||||
DBObject cmd = new BasicDBObject();
|
Document cmd = new Document();
|
||||||
cmd.put("shardCollection", this.shardDatabase + "." + this.shardCollection);
|
cmd.put("shardCollection", this.shardDatabase + "." + this.shardCollection);
|
||||||
cmd.put("key", new BasicDBObject(this.shardKey, 1));
|
cmd.put("key", new BasicDBObject(this.shardKey, 1));
|
||||||
cr = mongoAdminDB.command(cmd);
|
cr = mongoAdminDB.runCommand(cmd);
|
||||||
logger.info(cr.toString());
|
logger.info(cr.toString());
|
||||||
|
|
||||||
logger.info("Get info from config/shards");
|
logger.info("Get info from config/shards");
|
||||||
DBCursor cursor = mongo.getDB("config").getCollection("shards").find();
|
FindIterable<Document> cursor = mongo.getDatabase("config").getCollection("shards").find();
|
||||||
while (cursor.hasNext()) {
|
MongoCursor<Document> iterator = cursor.iterator();
|
||||||
DBObject item = cursor.next();
|
while (iterator.hasNext()) {
|
||||||
|
Document item = iterator.next();
|
||||||
logger.info(item.toString());
|
logger.info(item.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Mongo getMongo() throws UnknownHostException, MongoException {
|
@SneakyThrows
|
||||||
return new MongoClient(new ServerAddress(mongosProcess.getConfig().net()
|
private static ServerAddress toAddress(Net net) {
|
||||||
.getServerAddress(), mongosProcess.getConfig().net().getPort()));
|
return new ServerAddress(net.getServerAddress(), net.getPort());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
|
|||||||
@@ -17,10 +17,9 @@ package example.springdata.multistore;
|
|||||||
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
|
||||||
import com.mongodb.MongoClient;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test configuration to connect to a MongoDB named "test" and using a {@link MongoClient}. Also enables Spring Data
|
* Test configuration to connect to a MongoDB named "test" and using a {@code MongoClient}. Also enables Spring Data
|
||||||
* repositories for MongoDB.
|
* repositories for MongoDB.
|
||||||
*
|
*
|
||||||
* @author Oliver Gierke
|
* @author Oliver Gierke
|
||||||
|
|||||||
Reference in New Issue
Block a user