DATAMONGO-1444 - Cleanups.

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java

@@ -176,12 +176,12 @@ class GeoNearExecution implements ReactiveMongoQueryExecution {
 		@Override
 		public Object execute(Query query, Class<?> type, String collection) {
 
-			Flux<GeoResult<?>> results = doExecuteQuery(query, type, collection);
+			Flux<GeoResult<Object>> results = doExecuteQuery(query, type, collection);
 			return isStreamOfGeoResult() ? results : results.map(GeoResult::getContent);
 		}
 
 		@SuppressWarnings("unchecked")
-		protected Flux<GeoResult<?>> doExecuteQuery(Query query, Class<?> type, String collection) {
+		protected Flux<GeoResult<Object>> doExecuteQuery(Query query, Class<?> type, String collection) {
 
 			Point nearLocation = accessor.getGeoNearLocation();
 			NearQuery nearQuery = NearQuery.near(nearLocation);

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

@@ -41,13 +41,13 @@
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import example.first.First;
-import example.second.Second;
-
 import com.mongodb.Mongo;
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoClients;
 
+import example.first.First;
+import example.second.Second;
+
 /**
  * Unit tests for {@link AbstractReactiveMongoConfiguration}.
  * 
@@ -103,6 +103,9 @@ public void containsMongoDbFactoryButNoMongoBean() {
 		context.close();
 	}
 
+	/**
+	 * @see DATAMONGO-1444
+	 */
 	@Test
 	public void returnsUninitializedMappingContext() throws Exception {
 
@@ -180,7 +183,7 @@ protected String getDatabaseName() {
 		}
 
 		@Override
-		public MongoClient mongoClient() throws Exception {
+		public MongoClient mongoClient() {
 			return MongoClients.create();
 		}
 
@@ -208,7 +211,7 @@ protected String getDatabaseName() {
 		}
 
 		@Override
-		public MongoClient mongoClient() throws Exception {
+		public MongoClient mongoClient() {
 			return MongoClients.create();
 		}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateExecuteTests.java

@@ -82,9 +82,6 @@ public void tearDown() {
 		operations.dropCollection("execute_index_test").block();
 	}
 
-	/**
-	 * @see DATAMONGO-1444
-	 */
 	/**
 	 * @see DATAMONGO-1444
 	 */