Skip to content

Commit d5f8a30

Browse files
committed
Update CI Properties.
See #2048
1 parent dd9bb15 commit d5f8a30

File tree

6 files changed

+10
-31
lines changed

6 files changed

+10
-31
lines changed

ci/pipeline.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Java versions
2-
java.main.tag=17.0.15_6-jdk-focal
2+
java.main.tag=24.0.1_9-jdk-noble
33
java.next.tag=24.0.1_9-jdk-noble
44

55
# Docker container images - standard

pom.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</parent>
1919

2020
<properties>
21-
<couchbase>3.7.8</couchbase>
21+
<couchbase>3.8.0</couchbase>
2222
<springdata.commons>4.0.0-SNAPSHOT</springdata.commons>
2323
<java-module-name>spring.data.couchbase</java-module-name>
2424
<hibernate.validator>7.0.1.Final</hibernate.validator>
@@ -44,9 +44,6 @@
4444
<dependencies>
4545

4646
<dependency>
47-
<!--
48-
<groupId>io.github.openfeign.querydsl</groupId>
49-
-->
5047
<groupId>io.github.openfeign.querydsl</groupId>
5148
<artifactId>querydsl-apt</artifactId>
5249
<version>${querydsl_of}</version>
@@ -348,7 +345,7 @@
348345
</profiles>
349346

350347
<repositories>
351-
<repository>
348+
<repository>
352349
<id>spring-snapshot</id>
353350
<url>https://repo.spring.io/snapshot</url>
354351
<snapshots>

src/main/antora/modules/ROOT/pages/couchbase/fieldlevelencryption.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[[couchbase.fieldlevelencryption]]
2-
= Couchbase Field Level Encryption
2+
= Couchbase Field Level Encrytpion
33

44
Couchbase supports https://docs.couchbase.com/java-sdk/current/howtos/encrypting-using-sdk.html[Field Level Encryption]. This section documents how to use it with Spring Data Couchbase.
55

@@ -57,8 +57,8 @@ protected CryptoManager cryptoManager() {
5757

5858
1. @Encrypted defines a field as encrypted.
5959
2. @Encrypted(migration = Encrypted.Migration.FROM_UNENCRYPTED) defines a field that may or may not be encrypted when read. It will be encrypted when written.
60-
3. @Encrypted(encrypter = "<encrypterAlias>") specifies the alias of the encrypter to use for encryption. Note this is not the algorithm, but the name specified when adding the encrypter to the CryptoManager.
61-
60+
3. @Encrypted(encrypter = "<encrypterAlias>") specifies the alias of the encrypter to use for encryption. Note this is not the algorithm, but the name specified when adding the encrypter to the CryptoManager.
61+
6262
[[example]]
6363
=== Example
6464
.AbstractCouchbaseConfiguration
@@ -77,7 +77,7 @@ static class Config extends AbstractCouchbaseConfiguration {
7777
@Override public String getBucketName() { /* ... */ }
7878
7979
/* provide a cryptoManager */
80-
@Override
80+
@Override
8181
protected CryptoManager cryptoManager() {
8282
KeyStore javaKeyStore = KeyStore.getInstance("MyKeyStoreType");
8383
FileInputStream fis = new java.io.FileInputStream("keyStoreName");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ private static Method internalFind(Method[] toTest, String name, Class[] paramet
7474
continue;
7575
if(params[j] == boolean.class && parameterTypes[j] == Boolean.class )
7676
continue;
77-
if(parameterTypes[j] == null && Object.class.isAssignableFrom(params[j])) // any non-primitive
78-
continue;
7977
if (!params[j].isAssignableFrom(parameterTypes[j]))
8078
break;
8179
}

src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static java.util.Arrays.asList;
2020
import static org.junit.jupiter.api.Assertions.assertEquals;
2121
import static org.junit.jupiter.api.Assertions.assertFalse;
22-
import static org.junit.jupiter.api.Assertions.assertNull;
2322
import static org.junit.jupiter.api.Assertions.assertThrows;
2423
import static org.junit.jupiter.api.Assertions.assertTrue;
2524

@@ -142,20 +141,7 @@ void findBySimpleProperty() {
142141
Airport airport1 = reactiveAirportRepository.findById(airports.get(0).getId()).block();
143142
assertEquals(airport1.getIata(), vie.getIata());
144143
Airport airport2 = reactiveAirportRepository.findByIata(airports.get(0).getIata()).block();
145-
assertEquals(airport2.getId(), vie.getId());
146-
} finally {
147-
reactiveAirportRepository.delete(vie).block();
148-
}
149-
}
150-
151-
@Test
152-
void testNullParamToDyanmicProxyable() {
153-
Airport vie = null;
154-
try {
155-
vie = new Airport("airports::vie", "vie", "low2");
156-
reactiveAirportRepository.save(vie).block();
157-
Airport airport2 = reactiveAirportRepository.withCollection("_default").findByIata(null).block();
158-
assertNull(airport2);
144+
assertEquals(airport1.getId(), vie.getId());
159145
} finally {
160146
reactiveAirportRepository.delete(vie).block();
161147
}

src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQuerydslIntegrationTests.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,8 @@
4545
import org.springframework.data.couchbase.core.mapping.event.ValidatingCouchbaseEventListener;
4646
import org.springframework.data.couchbase.core.query.QueryCriteriaDefinition;
4747
import org.springframework.data.couchbase.domain.Airline;
48-
import org.springframework.data.couchbase.domain.AirlineCollectioned;
4948
import org.springframework.data.couchbase.domain.AirlineRepository;
5049
import org.springframework.data.couchbase.domain.QAirline;
51-
import org.springframework.data.couchbase.domain.QAirlineCollectioned;
5250
import org.springframework.data.couchbase.repository.auditing.EnableCouchbaseAuditing;
5351
import org.springframework.data.couchbase.repository.auditing.EnableReactiveCouchbaseAuditing;
5452
import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories;
@@ -432,7 +430,7 @@ void testIn() {
432430
assertEquals(" WHERE name in $1", bq(predicate));
433431
}
434432
}
435-
433+
436434
@Test
437435
void testSort(){
438436
{
@@ -497,7 +495,7 @@ void testSort(){
497495
"Order of airlines does not match");
498496
}
499497
}
500-
498+
501499

502500
@Test
503501
void testNotIn() {

0 commit comments

Comments
 (0)