From 6197d43aeab726d5dfbfb8a51a4e1d2e3a4c9999 Mon Sep 17 00:00:00 2001 From: Michael Reiche <48999328+mikereiche@users.noreply.github.com> Date: Mon, 10 Jan 2022 10:21:36 -0800 Subject: [PATCH] Bump Couchase SDK to 324 on 50x. (#1290) Also incorporates minor changes from main. Closes #1284. --- .../data/couchbase/core/CouchbaseTemplateSupport.java | 2 +- .../data/couchbase/core/ReactiveCouchbaseTemplateSupport.java | 2 +- .../data/couchbase/core/mapping/CouchbaseList.java | 2 -- .../data/couchbase/repository/support/ViewPostProcessor.java | 2 +- .../data/couchbase/util/ClusterInvocationProvider.java | 1 - .../data/couchbase/util/TestClusterConfig.java | 1 - .../java/org/springframework/data/couchbase/util/Util.java | 4 ++-- 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java index 218c1eb2..1181bc89 100644 --- a/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java +++ b/src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java @@ -196,7 +196,7 @@ class CouchbaseTemplateSupport implements ApplicationContextAware, TemplateSuppo /** * Set the {@link EntityCallbacks} instance to use when invoking * {@link org.springframework.data.mapping.callback.EntityCallback callbacks} like the {@link BeforeConvertCallback}. - *
+ ** Overrides potentially existing {@link EntityCallbacks}. * * @param entityCallbacks must not be {@literal null}. diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java index a4ff18e6..a36b6859 100644 --- a/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java +++ b/src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java @@ -206,7 +206,7 @@ class ReactiveCouchbaseTemplateSupport implements ApplicationContextAware, React * Set the {@link ReactiveEntityCallbacks} instance to use when invoking * {@link org.springframework.data.mapping.callback.ReactiveEntityCallbacks callbacks} like the * {@link ReactiveBeforeConvertCallback}. - *
+ ** Overrides potentially existing {@link EntityCallbacks}. * * @param reactiveEntityCallbacks must not be {@literal null}. diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java index a6ba8990..d7cd4b8a 100644 --- a/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java +++ b/src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java @@ -186,10 +186,8 @@ public class CouchbaseList implements CouchbaseStorable { /** * Verifies that only values of a certain and supported type can be stored. - *
** If this is not the case, a {@link IllegalArgumentException} is thrown. - *
* * @param value the object to verify its type. */ diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java b/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java index 34851e30..c0ec3516 100644 --- a/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java +++ b/src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java @@ -62,7 +62,7 @@ public enum ViewPostProcessor implements RepositoryProxyPostProcessor { /** * {@link MethodInterceptor} to inspect the currently invoked {@link Method} for a {@link View} annotation. - * + ** If a View annotation is found, it will bind it to a locally held ThreadLocal for later lookup in the * SimpleCouchbaseRepository class. * diff --git a/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java b/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java index e4d159f6..a32bb685 100644 --- a/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java +++ b/src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java @@ -31,7 +31,6 @@ import org.junit.platform.commons.support.AnnotationSupport; *
* Note that the internals on what and how the containers are managed is up to the {@link TestCluster} implementation, * and if it is unmanaged than this very well be mostly a "stub". - *
* * @since 2.0.0 */ diff --git a/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java b/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java index 3dc867ac..bdaac406 100644 --- a/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java +++ b/src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java @@ -79,7 +79,6 @@ public class TestClusterConfig { * Finds the first node with a given service enabled in the config. ** This method can be used to find bootstrap nodes and similar. - *
* * @param service the service to find. * @return a node config if found, empty otherwise. diff --git a/src/test/java/org/springframework/data/couchbase/util/Util.java b/src/test/java/org/springframework/data/couchbase/util/Util.java index f03c1348..06710bb9 100644 --- a/src/test/java/org/springframework/data/couchbase/util/Util.java +++ b/src/test/java/org/springframework/data/couchbase/util/Util.java @@ -33,7 +33,7 @@ public class Util { * Waits and sleeps for a little bit of time until the given condition is met. * *Sleeps 1ms between "false" invocations. It will wait at most one minute to prevent hanging forever in case - * the condition never becomes true.
+ * the condition never becomes true. * * @param supplier return true once it should stop waiting. */ @@ -83,7 +83,7 @@ public class Util { * Reads a file from the resources folder (in the same path as the requesting test class). * *The class will be automatically loaded relative to the namespace and converted - * to a string.
+ * to a string. * * @param filename the filename of the resource. * @param clazz the reference class.