From 4f73701a712f6856153927fc581eac0287ea772b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 2 Sep 2019 14:05:57 +0200 Subject: [PATCH 1/2] DATACMNS-1576 - Prepare branch --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9c3a137769..735d015016 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-commons - 2.2.0.BUILD-SNAPSHOT + 2.2.0.DATACMNS-1576-SNAPSHOT Spring Data Core From 05bf3853e17d9dcbe2f6c303da466856dc843a3b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 2 Sep 2019 14:06:26 +0200 Subject: [PATCH 2/2] DATACMNS-1576 - Fix JavaDoc on CustomConversions. --- .../data/convert/CustomConversions.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/convert/CustomConversions.java b/src/main/java/org/springframework/data/convert/CustomConversions.java index 8b304585fd..a52e0a249a 100644 --- a/src/main/java/org/springframework/data/convert/CustomConversions.java +++ b/src/main/java/org/springframework/data/convert/CustomConversions.java @@ -236,8 +236,8 @@ public Optional> getCustomWriteTarget(Class sourceType) { } /** - * Returns the target type we can readTargetWriteLocl an inject of the given source type to. The returned type might - * be a subclass of the given expected type though. If {@code expectedTargetType} is {@literal null} we will simply + * Returns the target type we can read an inject of the given source type to. The returned type might + * be a subclass of the given expected type though. If {@code requestedTargetType} is {@literal null} we will simply * return the first target type matching or {@literal null} if no conversion can be found. * * @param sourceType must not be {@literal null} @@ -255,7 +255,7 @@ public Optional> getCustomWriteTarget(Class sourceType, Class req } /** - * Returns whether we have a custom conversion registered to readTargetWriteLocl into a Mongo native type. The + * Returns whether we have a custom conversion registered to read {@code sourceType} into a native type. The * returned type might be a subclass of the given expected type though. * * @param sourceType must not be {@literal null} @@ -269,8 +269,8 @@ public boolean hasCustomWriteTarget(Class sourceType) { } /** - * Returns whether we have a custom conversion registered to readTargetWriteLocl an object of the given source type - * into an object of the given Mongo native target type. + * Returns whether we have a custom conversion registered to read an object of the given source type + * into an object of the given native target type. * * @param sourceType must not be {@literal null}. * @param targetType must not be {@literal null}. @@ -285,7 +285,7 @@ public boolean hasCustomWriteTarget(Class sourceType, Class targetType) { } /** - * Returns whether we have a custom conversion registered to readTargetReadLock the given source into the given target + * Returns whether we have a custom conversion registered to read the given source into the given target * type. * * @param sourceType must not be {@literal null} @@ -301,8 +301,8 @@ public boolean hasCustomReadTarget(Class sourceType, Class targetType) { } /** - * Returns the actual target type for the given {@code sourceType} and {@code requestedTargetType}. Note that the - * returned {@link Class} could be an assignable type to the given {@code requestedTargetType}. + * Returns the actual target type for the given {@code sourceType} and {@code targetType}. Note that the + * returned {@link Class} could be an assignable type to the given {@code targetType}. * * @param sourceType must not be {@literal null}. * @param targetType must not be {@literal null}. @@ -314,7 +314,7 @@ private Class getCustomReadTarget(Class sourceType, Class targetType) { } /** - * Inspects the given {@link ConvertiblePair}s for ones that have a source compatible type as source. Additionally + * Inspects the given {@link ConvertiblePair ConvertiblePairs} for ones that have a source compatible type as source. Additionally * checks assignability of the target type if one is given. * * @param sourceType must not be {@literal null}.