DATAMONGO-1643 - Polishing.

Fix documentation for namespace types. Remove unused ReflectiveDBCollectionInvoker. Simplify tests, align bean name to mongoClient. Remove injection of Mongo in favor of injecting MongoTemplate.

Remove throws declaration from AbstractMongoConfiguration.mongoClient(). MongoClient creation does not throw checked exceptions so throwing an Exception is no longer required. Replace Mongo by MongoClient in reference documentation.

Original pull request: spring-projects#451.

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java

@@ -29,7 +29,7 @@
 
 /**
  * Base class for Spring Data MongoDB configuration using JavaConfig.
- * 
+ *
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Thomas Darimont
@@ -39,22 +39,21 @@
  * @see MongoConfigurationSupport
  */
 @Configuration
-public abstract class AbstractMongoConfiguration extends MongoConfigurationSupport {
+public abstract class
+AbstractMongoConfiguration extends MongoConfigurationSupport {
 
 	/**
 	 * Return the {@link MongoClient} instance to connect to. Annotate with {@link Bean} in case you want to expose a
 	 * {@link MongoClient} instance to the {@link org.springframework.context.ApplicationContext}.
-	 * 
+	 *
 	 * @return
-	 * @throws Exception
 	 */
-	public abstract MongoClient mongoClient() throws Exception;
+	public abstract MongoClient mongoClient();
 
 	/**
 	 * Creates a {@link MongoTemplate}.
-	 * 
+	 *
 	 * @return
-	 * @throws Exception
 	 */
 	@Bean
 	public MongoTemplate mongoTemplate() throws Exception {
@@ -64,14 +63,13 @@ public MongoTemplate mongoTemplate() throws Exception {
 	/**
 	 * Creates a {@link SimpleMongoDbFactory} to be used by the {@link MongoTemplate}. Will use the {@link MongoClient}
 	 * instance configured in {@link #mongo()}.
-	 * 
-	 * @see #mongo()
+	 *
+	 * @see #mongoClient()
 	 * @see #mongoTemplate()
 	 * @return
-	 * @throws Exception
 	 */
 	@Bean
-	public MongoDbFactory mongoDbFactory() throws Exception {
+	public MongoDbFactory mongoDbFactory() {
 		return new SimpleMongoDbFactory(mongoClient(), getDatabaseName());
 	}
 
@@ -95,7 +93,7 @@ protected String getMappingBasePackage() {
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
 	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
-	 * 
+	 *
 	 * @see #customConversions()
 	 * @see #mongoMappingContext()
 	 * @see #mongoDbFactory()

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ public abstract class MongoConfigurationSupport {
 
 	/**
 	 * Return the name of the database to connect to.
-	 * 
+	 *
 	 * @return must not be {@literal null}.
 	 */
 	protected abstract String getDatabaseName();
@@ -72,7 +72,7 @@ public abstract class MongoConfigurationSupport {
 	 * configuration class' (the concrete class, not this one here) by default. So if you have a
 	 * {@code com.acme.AppConfig} extending {@link MongoConfigurationSupport} the base package will be considered
 	 * {@code com.acme} unless the method is overridden to implement alternate behavior.
-	 * 
+	 *
 	 * @return the base packages to scan for mapped {@link Document} classes or an empty collection to not enable scanning
 	 *         for entities.
 	 * @since 1.10
@@ -85,8 +85,8 @@ protected Collection<String> getMappingBasePackages() {
 
 	/**
 	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
-	 * 
-	 * @see #getMappingBasePackage()
+	 *
+	 * @see #getMappingBasePackages()
 	 * @return
 	 * @throws ClassNotFoundException
 	 */

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReflectiveDBCollectionInvoker.java

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <xsd:schema xmlns="http://www.springframework.org/schema/data/mongo"
 						xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-						xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 						xmlns:beans="http://www.springframework.org/schema/beans"
 						xmlns:tool="http://www.springframework.org/schema/tool"
-						xmlns:context="http://www.springframework.org/schema/context"
 						xmlns:repository="http://www.springframework.org/schema/data/repository"
 						targetNamespace="http://www.springframework.org/schema/data/mongo"
 						elementFormDefault="qualified" attributeFormDefault="unqualified">
@@ -38,13 +36,13 @@ Defines a MongoDbFactory for connecting to a specific database
 			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
+The name of the MongoDbFactory definition (by default "mongoDbFactory").]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The reference to a Mongo instance. If not configured a default com.mongodb.Mongo instance will be created.
+The reference to a MongoClient instance. If not configured a default com.mongodb.MongoClient instance will be created.
 					]]>
 					</xsd:documentation>
 				</xsd:annotation>
@@ -120,7 +118,7 @@ The MongoClientURI string.]]></xsd:documentation>
 					<xsd:annotation>
 						<xsd:documentation><![CDATA[
 		Top-level element that contains one or more custom converters to be used for mapping
-		domain objects to and from Mongo's DBObject]]>
+		domain objects to and from Mongo's Document]]>
 						</xsd:documentation>
 					</xsd:annotation>
 					<xsd:complexType>
@@ -211,7 +209,7 @@ Defines a JMX Model MBeans for monitoring a MongoDB server'.
 			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The name of the Mongo object that determines what server to monitor. (by default "mongo").]]></xsd:documentation>
+The name of the MongoClient object that determines what server to monitor. (by default "mongoClient").]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 		</xsd:complexType>
@@ -350,7 +348,7 @@ The Mongo driver options
 		<xsd:attribute name="id" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The name of the mongo definition (by default "mongoClient").]]></xsd:documentation>
+The name of the MongoClient definition (by default "mongoClient").]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="port" type="xsd:string" use="optional">
@@ -406,7 +404,7 @@ The minimum number of connections per host.
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override.
+The number of connections allowed per host.  Will block if run out.	 Default is 100.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -422,7 +420,7 @@ then 50 threads can block more than that and an exception will be thrown.
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes).
+The max wait time of a blocking thread for a connection. Default is 120000 ms (2 minutes).
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -575,20 +573,20 @@ The SSLSocketFactory to use for the SSL connection. If none is configured here,
 	<xsd:element name="template">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
-Defines a MongoDbFactory for connecting to a specific database
+Defines a MongoTemplate.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
+The name of the MongoTemplate definition (by default "mongoTemplate").]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The reference to a Mongoconverter instance.
+The reference to a MappingMongoConverter instance.
 					]]>
 					</xsd:documentation>
 					<xsd:appinfo>
@@ -628,20 +626,20 @@ The reference to a Mongoconverter instance.
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
-Defines a MongoDbFactory for connecting to a specific database
+Defines a GridFsTemplate.
 			]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexType>
 			<xsd:attribute name="id" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The name of the mongo definition (by default "mongoDbFactory").]]></xsd:documentation>
+The name of the GridFsTemplate definition (by default "gridFsTemplate").]]></xsd:documentation>
 				</xsd:annotation>
 			</xsd:attribute>
 			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
-The reference to a Mongoconverter instance.
+The reference to a MappingMongoConverter instance.
 					]]>
 					</xsd:documentation>
 					<xsd:appinfo>

spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-2.0.xsd

@@ -21,13 +21,13 @@
 
 /**
  * Sample configuration class in default package.
- * 
+ *
  * @author Oliver Gierke
  */
 @Configuration
 public class ConfigClassInDefaultPackage extends AbstractMongoConfiguration {
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#getDatabaseName()
 	 */
@@ -36,12 +36,12 @@ protected String getDatabaseName() {
 		return "default";
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#mongo()
 	 */
 	@Override
-	public MongoClient mongoClient() throws Exception {
+	public MongoClient mongoClient() {
 		return new MongoClient();
 	}
 }

spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java

@@ -51,7 +51,7 @@ protected String getDatabaseName() {
 		}
 
 		@Override
-		public MongoClient mongoClient() throws Exception {
+		public MongoClient mongoClient() {
 			return new MongoClient();
 		}
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.java

@@ -157,7 +157,7 @@ protected String getDatabaseName() {
 		}
 
 		@Override
-		public MongoClient mongoClient() throws Exception {
+		public MongoClient mongoClient() {
 			return new MongoClient();
 		}
 
@@ -185,7 +185,7 @@ protected String getDatabaseName() {
 		}
 
 		@Override
-		public MongoClient mongoClient() throws Exception {
+		public MongoClient mongoClient() {
 			return new MongoClient();
 		}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java

@@ -64,7 +64,7 @@ protected String getDatabaseName() {
 		}
 
 		@Override
-		public MongoClient mongoClient() throws Exception {
+		public MongoClient mongoClient() {
 			return new MongoClient();
 		}
 
@@ -119,7 +119,7 @@ static class SimpleConfigWithRepositories extends SimpleConfig {}
 	static class SimpleConfig extends AbstractMongoConfiguration {
 
 		@Override
-		public MongoClient mongoClient() throws Exception {
+		public MongoClient mongoClient() {
 			return new MongoClient();
 		}