DATAMONGO-2138 - GenericQuery wraps Query with type parameter

TypedQuery needs to carry the entity type in a generic type parameter.
Giving Query a type parameter would break backwards compatibility.
Solution: Both Query and TypedQuery will implement GenericQuery.

Author: TjeuKayim

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

@@ -46,7 +46,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class Query {
+public class Query implements GenericQuery {
 
 	private static final String RESTRICTED_TYPES_KEY = "_$RESTRICTED_TYPES";
 
@@ -475,6 +475,11 @@ protected List<CriteriaDefinition> getCriteria() {
 		return new ArrayList<>(this.criteria.values());
 	}
 
+	@Override
+	public Query getQuery() {
+		return this;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Object#toString()

spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/GenericQuery.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2018 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.query
+
+/**
+ * Wraps [Query] with type parameter.
+ *
+ * @param T Type of Entity that is queried, used for type-safe queries.
+ *
+ * @author Tjeu Kayim
+ */
+interface GenericQuery<in T : Any> {
+	val query: Query
+}