Bump to Spring Content 1.1.0.M1 and Spring Boot 2.3.0

Author: paulcwarren

.travis.yml

@@ -4,7 +4,7 @@ jdk:
  - openjdk8
 
 before_install:
- - docker run -d --name elasticsearch  -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" paulcwarren/elasticsearch:latest
+ - docker run -d -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" paulcwarren/elasticsearch:7.6.2
 
 script:
  - mvn install

spring-docs/pom.xml

@@ -14,17 +14,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.4.RELEASE</version>
+		<version>2.3.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<spring.cloud.connectors.version>1.2.4.RELEASE</spring.cloud.connectors.version>
-		<spring.content.version>1.0.0.M10</spring.content.version>
-		<dropwizard-metrics.version>3.2.6</dropwizard-metrics.version>
+		<spring.content.version>1.1.0.M1</spring.content.version>
 	</properties>
 
 	<dependencies>
@@ -135,10 +133,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-spring-service-connector</artifactId>
+			<version>2.0.7.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-cloudfoundry-connector</artifactId>
+			<version>2.0.7.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.paulcwarren</groupId>
@@ -204,14 +204,4 @@
 		</plugins>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>snapshots</id>
-			<name>nexus</name>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
 </project>

spring-docs/src/main/java/com/github/paulcwarren/springdocs/config/data/MongoCloudConfig.java

@@ -11,7 +11,7 @@
 
 @Configuration
 @EnableAutoConfiguration
-@EnableMongoRepositories(basePackages = {"com.github.paulcwarren.springdocs.repositories.mongodb"})
+@EnableMongoRepositories(basePackages = {"com.github.paulcwarren.springdocs.repositories"})
 @EntityScan(basePackages="com.github.paulcwarren.springdocs.domain")
 @Profile("mongodb-cloud")
 public class MongoCloudConfig extends AbstractCloudConfig {

spring-docs/src/main/java/com/github/paulcwarren/springdocs/config/data/MongoConfig.java

@@ -1,54 +1,47 @@
 package com.github.paulcwarren.springdocs.config.data;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
-
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.gridfs.GridFsTemplate;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
 @Configuration
 @EnableAutoConfiguration
-@EnableMongoRepositories(basePackages = {"com.github.paulcwarren.springdocs.repositories.mongodb"})
+@EnableMongoRepositories(basePackages = {"com.github.paulcwarren.springdocs.repositories"})
 @EntityScan(basePackages="com.github.paulcwarren.springdocs.domain")
 @Profile("mongodb")
-public class MongoConfig extends AbstractMongoConfiguration {
+public class MongoConfig extends AbstractMongoClientConfiguration {
 
     @Value("#{environment.SPRINGDOCS_MDB_URL}")
-    private String mongoDbUrl;
-
-    @Bean
-    public MongoTemplate mongoTemplate(MongoDbFactory mongoDbFactory) {
-        return new MongoTemplate(mongoDbFactory);
-    }
-
-    @Override
-    public MongoDbFactory mongoDbFactory() {
-
-        if (System.getenv("SPRINGDOCS_MDB_URL") != null) {
-
-            return new SimpleMongoDbFactory(new MongoClientURI(mongoDbUrl));
-        } else {
-
-            return new SimpleMongoDbFactory(new MongoClientURI("mongodb://localhost/springdocs"));
-        }
-    }
+    private String mongoDbUrl = "mongodb://localhost:27017";
 
     @Override
     protected String getDatabaseName() {
         return "springdocs";
     }
 
-    @Override
+    @Bean
     public MongoClient mongoClient() {
-        return new MongoClient();
+        return MongoClients.create(mongoDbUrl);
+    }
+
+    @Bean
+    public GridFsTemplate gridFsTemplate(MappingMongoConverter mongoConverter) {
+        return new GridFsTemplate(mongoDbFactory(), mongoConverter);
+    }
+
+    @Bean
+    public MongoDatabaseFactory mongoDbFactory() {
+        return new SimpleMongoClientDatabaseFactory(mongoClient(), getDatabaseName());
     }
 }