Skip to content

Commit 9879f8d

Browse files
committed
Merge remote-tracking branch 'origin/4.0.x' into 4.1.x
2 parents afe911f + e1beffa commit 9879f8d

File tree

3 files changed

+28
-8
lines changed

3 files changed

+28
-8
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ pipeline {
2727
steps {
2828
timeout( time: 180, unit: 'MINUTES' ) {
2929
checkout scm
30-
mavenBuild( "jdk21", "clean install -Dmaven.test.failure.ignore=true javadoc:javadoc", "maven3", true)
30+
mavenBuild( "jdk21", "clean install -Dmaven.test.failure.ignore=true javadoc:javadoc -Djacoco.skip=true", "maven3", false)
3131
}
3232
}
3333
}
34-
stage("Build / Test / Javadoc - JDK24") {
34+
stage("Build / Test / Javadoc - JDK25") {
3535
agent { node { label 'linux-light' } }
3636
steps {
3737
timeout( time: 180, unit: 'MINUTES' ) {
3838
checkout scm
39-
mavenBuild( "jdk24", "clean install -Dmaven.test.failure.ignore=true javadoc:javadoc -Djacoco.skip=true", "maven3", false)
39+
mavenBuild( "jdk25", "clean install -Dmaven.test.failure.ignore=true javadoc:javadoc", "maven3", true)
4040
}
4141
}
4242
}

README.md

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ A [ReactiveStreams](http://www.reactive-streams.org/) wrapper around [Jetty](htt
66

77
## Versions
88

9-
| Jetty ReactiveStream HttpClient Versions | Min Java Version | Jetty Version | Status |
10-
|------------------------------------------|------------------|---------------|--------------------------------------------------------------------------------------------------------------|
11-
| `4.1.x` | Java 17 | Jetty 12.1.x | Development |
12-
| `4.0.x` | Java 17 | Jetty 12.0.x | Stable |
9+
| Jetty ReactiveStream HttpClient Versions | Min Java Version | Jetty Version | Status |
10+
|------------------------------------------|------------------|---------------|--------------------------------------------|
11+
| `4.1.x` | Java 17 | Jetty 12.1.x | Stable |
12+
| `4.0.x` | Java 17 | Jetty 12.0.x | Stable |
1313
| `3.0.x` | Java 11 | Jetty 11.0.x | End of Community Support (see [#461](https://github.com/jetty-project/jetty-reactive-httpclient/issues/461)) |
1414
| `2.0.x` | Java 11 | Jetty 10.0.x | End of Community Support (see [#461](https://github.com/jetty-project/jetty-reactive-httpclient/issues/461)) |
1515
| `1.1.x` | Java 8 | Jetty 9.4.x | End of Community Support (see [#153](https://github.com/jetty-project/jetty-reactive-httpclient/issues/153)) |
@@ -77,6 +77,26 @@ int status = Single.fromPublisher(publisher)
7777
.blockingGet();
7878
```
7979

80+
### Project Reactor Usage
81+
82+
```java
83+
// Create and start Jetty's HttpClient.
84+
HttpClient httpClient = new HttpClient();
85+
httpClient.start();
86+
87+
// Build a Reactor WebClient with Jetty's HttpClient.
88+
WebClient client = WebClient.builder()
89+
.clientConnector(new JettyClientHttpConnector(httpClient))
90+
.build();
91+
92+
// Issue a GET request.
93+
String responseContent = client.get()
94+
.uri("http://localhost:8080/path")
95+
.retrieve()
96+
.bodyToMono(String.class)
97+
.block();
98+
```
99+
80100
### Response Content Processing
81101

82102
The response content is processed by passing a `BiFunction` to `ReactiveRequest.response()`.

src/test/java/org/eclipse/jetty/reactive/client/RxJava2Test.java renamed to src/test/java/org/eclipse/jetty/reactive/client/RxJavaTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
import static org.junit.jupiter.api.Assertions.assertEquals;
7070
import static org.junit.jupiter.api.Assertions.assertTrue;
7171

72-
public class RxJava2Test extends AbstractTest {
72+
public class RxJavaTest extends AbstractTest {
7373
@Test
7474
@Tag("external")
7575
public void testExternalServer() throws Exception {

0 commit comments

Comments
 (0)