Skip to content

Commit 79f45be

Browse files
authored
[Streaming Indexing] Enhance RestClient with a new streaming API support (opensearch-project#14437)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent d158ec6 commit 79f45be

File tree

46 files changed

+2180
-134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2180
-134
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
88
- Fix for hasInitiatedFetching to fix allocation explain and manual reroute APIs (([#14972](https://github.com/opensearch-project/OpenSearch/pull/14972))
99
- [Workload Management] Add queryGroupId to Task ([14708](https://github.com/opensearch-project/OpenSearch/pull/14708))
1010
- Add setting to ignore throttling nodes for allocation of unassigned primaries in remote restore ([#14991](https://github.com/opensearch-project/OpenSearch/pull/14991))
11+
- [Streaming Indexing] Enhance RestClient with a new streaming API support ([#14437](https://github.com/opensearch-project/OpenSearch/pull/14437))
1112
- Add basic aggregation support for derived fields ([#14618](https://github.com/opensearch-project/OpenSearch/pull/14618))
1213
- Add ThreadContextPermission for markAsSystemContext and allow core to perform the method ([#15016](https://github.com/opensearch-project/OpenSearch/pull/15016))
1314

buildSrc/version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ reactor_netty = 1.1.21
3737
reactor = 3.5.19
3838

3939
# client dependencies
40-
httpclient5 = 5.2.1
41-
httpcore5 = 5.2.2
40+
httpclient5 = 5.2.3
41+
httpcore5 = 5.2.5
4242
httpclient = 4.5.14
4343
httpcore = 4.4.16
4444
httpasyncclient = 4.1.5

client/rest/build.gradle

+51-16
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,15 @@ dependencies {
4747
api "org.apache.httpcomponents.client5:httpclient5:${versions.httpclient5}"
4848
api "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}"
4949
api "org.apache.httpcomponents.core5:httpcore5-h2:${versions.httpcore5}"
50+
api "org.apache.httpcomponents.core5:httpcore5-reactive:${versions.httpcore5}"
5051
api "commons-codec:commons-codec:${versions.commonscodec}"
5152
api "commons-logging:commons-logging:${versions.commonslogging}"
5253
api "org.slf4j:slf4j-api:${versions.slf4j}"
5354

55+
// reactor
56+
api "io.projectreactor:reactor-core:${versions.reactor}"
57+
api "org.reactivestreams:reactive-streams:${versions.reactivestreams}"
58+
5459
testImplementation project(":client:test")
5560
testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
5661
testImplementation "junit:junit:${versions.junit}"
@@ -93,22 +98,52 @@ testingConventions {
9398
}
9499
}
95100

96-
thirdPartyAudit.ignoreMissingClasses(
97-
'org.conscrypt.Conscrypt',
98-
'org.slf4j.impl.StaticLoggerBinder',
99-
'org.slf4j.impl.StaticMDCBinder',
100-
'org.slf4j.impl.StaticMarkerBinder',
101-
//commons-logging optional dependencies
102-
'org.apache.avalon.framework.logger.Logger',
103-
'org.apache.log.Hierarchy',
104-
'org.apache.log.Logger',
105-
'org.apache.log4j.Level',
106-
'org.apache.log4j.Logger',
107-
'org.apache.log4j.Priority',
108-
//commons-logging provided dependencies
109-
'javax.servlet.ServletContextEvent',
110-
'javax.servlet.ServletContextListener'
111-
)
101+
thirdPartyAudit {
102+
ignoreMissingClasses(
103+
'org.conscrypt.Conscrypt',
104+
'org.slf4j.impl.StaticLoggerBinder',
105+
'org.slf4j.impl.StaticMDCBinder',
106+
'org.slf4j.impl.StaticMarkerBinder',
107+
//commons-logging optional dependencies
108+
'org.apache.avalon.framework.logger.Logger',
109+
'org.apache.log.Hierarchy',
110+
'org.apache.log.Logger',
111+
'org.apache.log4j.Level',
112+
'org.apache.log4j.Logger',
113+
'org.apache.log4j.Priority',
114+
//commons-logging provided dependencies
115+
'javax.servlet.ServletContextEvent',
116+
'javax.servlet.ServletContextListener',
117+
'io.micrometer.context.ContextAccessor',
118+
'io.micrometer.context.ContextRegistry',
119+
'io.micrometer.context.ContextSnapshot',
120+
'io.micrometer.context.ContextSnapshot$Scope',
121+
'io.micrometer.context.ContextSnapshotFactory',
122+
'io.micrometer.context.ContextSnapshotFactory$Builder',
123+
'io.micrometer.context.ThreadLocalAccessor',
124+
'io.micrometer.core.instrument.Clock',
125+
'io.micrometer.core.instrument.Counter',
126+
'io.micrometer.core.instrument.Counter$Builder',
127+
'io.micrometer.core.instrument.DistributionSummary',
128+
'io.micrometer.core.instrument.DistributionSummary$Builder',
129+
'io.micrometer.core.instrument.Meter',
130+
'io.micrometer.core.instrument.MeterRegistry',
131+
'io.micrometer.core.instrument.Metrics',
132+
'io.micrometer.core.instrument.Tag',
133+
'io.micrometer.core.instrument.Tags',
134+
'io.micrometer.core.instrument.Timer',
135+
'io.micrometer.core.instrument.Timer$Builder',
136+
'io.micrometer.core.instrument.Timer$Sample',
137+
'io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics',
138+
'io.micrometer.core.instrument.composite.CompositeMeterRegistry',
139+
'io.micrometer.core.instrument.search.Search',
140+
'reactor.blockhound.BlockHound$Builder',
141+
'reactor.blockhound.integration.BlockHoundIntegration'
142+
)
143+
ignoreViolations(
144+
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException'
145+
)
146+
}
112147

113148
tasks.withType(JavaCompile) {
114149
// Suppressing '[options] target value 8 is obsolete and will be removed in a future release'

client/rest/licenses/httpclient5-5.2.1.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5d753a99d299756998a08c488f2efdf9cf26198e

client/rest/licenses/httpcore5-5.2.2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dab1e18842971a45ca8942491ce005ab86a028d7

client/rest/licenses/httpcore5-h2-5.2.2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
09425df4d1365cee86a8e031a036bdca4343da4b
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f68949965075b957c12b4c1ef89fd4bab2a0fdb1

0 commit comments

Comments
 (0)