diff --git a/pom.xml b/pom.xml index 10c1adf1bf..96220b2178 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-mongodb-parent - 3.2.0-SNAPSHOT + 3.2.0-GH-3515-SNAPSHOT pom Spring Data MongoDB @@ -26,7 +26,7 @@ multi spring-data-mongodb - 2.5.0-SNAPSHOT + 2.5.0-DATACMNS-1835-SNAPSHOT 4.1.1 ${mongo} 1.19 diff --git a/spring-data-mongodb-benchmarks/pom.xml b/spring-data-mongodb-benchmarks/pom.xml index f0fbb601c8..72b01fff81 100644 --- a/spring-data-mongodb-benchmarks/pom.xml +++ b/spring-data-mongodb-benchmarks/pom.xml @@ -7,7 +7,7 @@ org.springframework.data spring-data-mongodb-parent - 3.2.0-SNAPSHOT + 3.2.0-GH-3515-SNAPSHOT ../pom.xml diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml index 1a17321782..52e0bacf62 100644 --- a/spring-data-mongodb-distribution/pom.xml +++ b/spring-data-mongodb-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-mongodb-parent - 3.2.0-SNAPSHOT + 3.2.0-GH-3515-SNAPSHOT ../pom.xml diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index 0248517caf..b7e5086a51 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -11,7 +11,7 @@ org.springframework.data spring-data-mongodb-parent - 3.2.0-SNAPSHOT + 3.2.0-GH-3515-SNAPSHOT ../pom.xml diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/KPropertyPath.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/KPropertyPath.kt index d88eae4e0a..f09f543548 100644 --- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/KPropertyPath.kt +++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/KPropertyPath.kt @@ -15,6 +15,7 @@ */ package org.springframework.data.mongodb.core.query +import org.springframework.data.mapping.toDotPath import kotlin.reflect.KProperty import kotlin.reflect.KProperty1 @@ -25,7 +26,9 @@ import kotlin.reflect.KProperty1 * @author Mark Paluch * @author Yoann de Martino * @since 2.2 + * @deprecated since 3.2, KPropertyPath from Spring Data Commons. */ +@Deprecated("use KPropertyPath from Spring Data Commons", replaceWith = ReplaceWith("KPropertyPath", "org.springframework.data.mapping.KPropertyPath")) class KPropertyPath( internal val parent: KProperty, internal val child: KProperty1 @@ -39,7 +42,7 @@ internal fun asString(property: KProperty<*>): String { return when (property) { is KPropertyPath<*, *> -> "${asString(property.parent)}.${property.child.name}" - else -> property.name + else -> property.toDotPath() } } @@ -54,6 +57,8 @@ internal fun asString(property: KProperty<*>): String { * @author Tjeu Kayim * @author Yoann de Martino * @since 2.2 + * @deprecated since 3.2, KPropertyPath.div from Spring Data Commons. */ +@Deprecated("use KPropertyPath.div from Spring Data Commons", replaceWith = ReplaceWith("this / other", "org.springframework.data.mapping.div")) operator fun KProperty.div(other: KProperty1) = KPropertyPath(this, other)