Skip to content

Commit 89367b4

Browse files
committed
* search: update to ES 9.0.0
Signed-off-by: neo <[email protected]>
1 parent 3e72695 commit 89367b4

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ project("core-ng") {
3232
apply(plugin = "lib")
3333
dependencies {
3434
api(project(":core-ng-api"))
35-
api("org.slf4j:slf4j-api:2.0.16")
35+
api("org.slf4j:slf4j-api:2.0.17")
3636
implementation("org.javassist:javassist:3.30.2-GA")
3737
implementation("com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}")
3838
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}")
@@ -48,7 +48,7 @@ project("core-ng") {
4848
testImplementation("org.assertj:assertj-core:${assertjVersion}")
4949
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}")
5050
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
51-
testRuntimeOnly("org.hsqldb:hsqldb:2.7.3")
51+
testRuntimeOnly("org.hsqldb:hsqldb:2.7.4")
5252
}
5353
}
5454

@@ -61,7 +61,7 @@ project("core-ng-test") {
6161
implementation(project(":core-ng"))
6262
implementation("org.junit.jupiter:junit-jupiter-engine:${junitVersion}")
6363
implementation("org.junit.platform:junit-platform-launcher")
64-
testRuntimeOnly("org.hsqldb:hsqldb:2.7.3")
64+
testRuntimeOnly("org.hsqldb:hsqldb:2.7.4")
6565
}
6666
}
6767

@@ -110,7 +110,7 @@ project("core-ng-search-test") {
110110
implementation("core.framework.elasticsearch.module:analysis-common:${elasticVersion}") // used by elasticsearch stemmer
111111
implementation("core.framework.elasticsearch.module:reindex:${elasticVersion}") // used by elasticsearch deleteByQuery
112112
implementation("org.apache.httpcomponents:httpasyncclient:4.1.5") // used by reindex
113-
runtimeOnly("org.apache.logging.log4j:log4j-to-slf4j:2.24.3")
113+
runtimeOnly("org.apache.logging.log4j:log4j-to-slf4j:2.19.0")
114114
}
115115
}
116116

core-ng-search-test/src/test/java/core/framework/search/impl/ElasticSearchAggregationIntegrationTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import org.junit.jupiter.api.BeforeAll;
1616
import org.junit.jupiter.api.Test;
1717
import org.junit.jupiter.api.TestInstance;
18-
import org.slf4j.Logger;
19-
import org.slf4j.LoggerFactory;
2018

2119
import java.time.ZonedDateTime;
2220
import java.util.List;
@@ -29,7 +27,6 @@
2927
*/
3028
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
3129
class ElasticSearchAggregationIntegrationTest extends IntegrationTest {
32-
private static final Logger log = LoggerFactory.getLogger(ElasticSearchAggregationIntegrationTest.class);
3330
@Inject
3431
ElasticSearch elasticSearch;
3532
@Inject

core-ng-search/src/test/java/core/framework/search/impl/ElasticSearchLogInstrumentationTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package core.framework.search.impl;
22

3+
import core.framework.util.Strings;
34
import org.junit.jupiter.api.BeforeEach;
45
import org.junit.jupiter.api.Test;
56

67
import java.nio.ByteBuffer;
8+
import java.nio.charset.StandardCharsets;
79
import java.util.List;
810

911
import static org.assertj.core.api.Assertions.assertThat;
@@ -18,13 +20,13 @@ void createElasticSearchLogInstrumentation() {
1820

1921
@Test
2022
void readBody() {
21-
ByteBuffer buffer1 = ByteBuffer.wrap("buffer1".getBytes());
22-
ByteBuffer buffer2 = ByteBuffer.wrap(" buffer2".getBytes());
23+
ByteBuffer buffer1 = ByteBuffer.wrap(Strings.bytes("buffer1"));
24+
ByteBuffer buffer2 = ByteBuffer.wrap(Strings.bytes(" buffer2"));
2325
List<ByteBuffer> buffers = List.of(buffer1, buffer2);
2426

2527
byte[] result = instrumentation.readBody(buffers);
2628

27-
assertThat(result).asString().isEqualTo("buffer1 buffer2");
29+
assertThat(result).asString(StandardCharsets.UTF_8).isEqualTo("buffer1 buffer2");
2830

2931
assertThat(buffer1.position()).isZero();
3032
assertThat(buffer2.position()).isZero();

0 commit comments

Comments
 (0)