Skip to content

Commit 32f6a05

Browse files
authored
Javadoc and other java 1_8 compatible changes in 50x back to main. (#1328)
Closes #1327.
1 parent c88a35c commit 32f6a05

File tree

10 files changed

+16
-14
lines changed

10 files changed

+16
-14
lines changed

src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
190190
/**
191191
* Set the {@link EntityCallbacks} instance to use when invoking
192192
* {@link org.springframework.data.mapping.callback.EntityCallback callbacks} like the {@link BeforeConvertCallback}.
193-
* <p/>
193+
* <p>
194194
* Overrides potentially existing {@link EntityCallbacks}.
195195
*
196196
* @param entityCallbacks must not be {@literal null}.

src/main/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
200200
* Set the {@link ReactiveEntityCallbacks} instance to use when invoking
201201
* {@link org.springframework.data.mapping.callback.ReactiveEntityCallbacks callbacks} like the
202202
* {@link ReactiveBeforeConvertCallback}.
203-
* <p/>
203+
* <p>
204204
* Overrides potentially existing {@link EntityCallbacks}.
205205
*
206206
* @param reactiveEntityCallbacks must not be {@literal null}.

src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseDocument.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public CouchbaseDocument setContent(final JsonObject payload) {
215215

216216
/**
217217
* Returns the expiration time of the document.
218-
* <p/>
218+
* <p>
219219
* If the expiration time is 0, then the document will be persisted until deleted manually ("forever").
220220
*
221221
* @return the expiration time of the document.
@@ -226,9 +226,9 @@ public int getExpiration() {
226226

227227
/**
228228
* Set the expiration time of the document.
229-
* <p/>
229+
* <p>
230230
* If the expiration time is 0, then the document will be persisted until deleted manually ("forever").
231-
* <p/>
231+
* <p>
232232
* Expiration should be expressed as seconds if <= 30 days (30 x 24 x 60 x 60 seconds), or as an expiry date (UTC,
233233
* UNIX time ie. seconds form the Epoch) if > 30 days.
234234
*

src/main/java/org/springframework/data/couchbase/core/mapping/CouchbaseList.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,8 @@ public final boolean isEmpty() {
186186

187187
/**
188188
* Verifies that only values of a certain and supported type can be stored.
189-
* <p/>
190189
* <p>
191190
* If this is not the case, a {@link IllegalArgumentException} is thrown.
192-
* </p>
193191
*
194192
* @param value the object to verify its type.
195193
*/

src/main/java/org/springframework/data/couchbase/repository/auditing/CouchbaseAuditingRegistrar.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.lang.annotation.Annotation;
2020

2121
import org.springframework.beans.factory.config.BeanDefinition;
22+
import org.springframework.beans.factory.support.AbstractBeanDefinition;
2223
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
2324
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
2425
import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -70,7 +71,11 @@ protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingCon
7071
Assert.notNull(configuration, "AuditingConfiguration must not be null!");
7172

7273
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
73-
builder.addConstructorArgReference(BeanNames.COUCHBASE_MAPPING_CONTEXT);
74+
75+
BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(PersistentEntitiesFactoryBean.class);
76+
definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
77+
78+
builder.addConstructorArgValue(definition.getBeanDefinition());
7479
return configureDefaultAuditHandlerAttributes(configuration, builder);
7580
}
7681

src/main/java/org/springframework/data/couchbase/repository/query/support/N1qlUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors
2+
* Copyright 2012-2022 the original author or authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
2626
import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
2727
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
2828
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
29+
import org.springframework.data.couchbase.core.mapping.Field;
2930
import org.springframework.data.couchbase.core.query.N1QLExpression;
3031
import org.springframework.data.couchbase.core.query.N1QLQuery;
3132
import org.springframework.data.couchbase.repository.query.CouchbaseEntityInformation;

src/main/java/org/springframework/data/couchbase/repository/support/ViewPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public ViewMetadataProvider getViewMetadataProvider() {
6262

6363
/**
6464
* {@link MethodInterceptor} to inspect the currently invoked {@link Method} for a {@link View} annotation.
65-
* <p/>
65+
* <p>
6666
* If a View annotation is found, it will bind it to a locally held ThreadLocal for later lookup in the
6767
* SimpleCouchbaseRepository class.
6868
*

src/test/java/org/springframework/data/couchbase/util/ClusterInvocationProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
* <p>
3232
* Note that the internals on what and how the containers are managed is up to the {@link TestCluster} implementation,
3333
* and if it is unmanaged than this very well be mostly a "stub".
34-
* </p>
3534
*
3635
* @since 2.0.0
3736
*/

src/test/java/org/springframework/data/couchbase/util/TestClusterConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public Optional<X509Certificate> clusterCert() {
7979
* Finds the first node with a given service enabled in the config.
8080
* <p>
8181
* This method can be used to find bootstrap nodes and similar.
82-
* </p>
8382
*
8483
* @param service the service to find.
8584
* @return a node config if found, empty otherwise.

src/test/java/org/springframework/data/couchbase/util/Util.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class Util {
3333
* Waits and sleeps for a little bit of time until the given condition is met.
3434
*
3535
* <p>Sleeps 1ms between "false" invocations. It will wait at most one minute to prevent hanging forever in case
36-
* the condition never becomes true.</p>
36+
* the condition never becomes true.
3737
*
3838
* @param supplier return true once it should stop waiting.
3939
*/
@@ -83,7 +83,7 @@ public static boolean threadRunning(final String name) {
8383
* Reads a file from the resources folder (in the same path as the requesting test class).
8484
*
8585
* <p>The class will be automatically loaded relative to the namespace and converted
86-
* to a string.</p>
86+
* to a string.
8787
*
8888
* @param filename the filename of the resource.
8989
* @param clazz the reference class.

0 commit comments

Comments
 (0)