Skip to content

Commit 78d8e8a

Browse files
authored
use Apache HttpClient 5.x ClassicRequestBuilder (#19)
* use Apache HttpClient 5.x ClassicRequestBuilder * simplify yaml
1 parent 0ccea84 commit 78d8e8a

File tree

2 files changed

+48
-2
lines changed

2 files changed

+48
-2
lines changed

src/main/resources/META-INF/rewrite/apache-httpclient-5.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,9 @@ recipeList:
275275
- org.openrewrite.java.ChangeType:
276276
oldFullyQualifiedTypeName: org.apache.hc.client5.http.RedirectStrategy
277277
newFullyQualifiedTypeName: org.apache.hc.client5.http.protocol.RedirectStrategy
278+
- org.openrewrite.java.ChangeType:
279+
oldFullyQualifiedTypeName: org.apache.hc.client5.http.classic.methods.RequestBuilder
280+
newFullyQualifiedTypeName: org.apache.hc.core5.http.io.support.ClassicRequestBuilder
278281

279282
- org.openrewrite.java.ChangePackage:
280283
oldPackageName: org.apache.http.config

src/test/java/org/openrewrite/apache/httpclient5/UpgradeApacheHttpClient5Test.java

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void importReplacementsInGroupsWithSomeSpecificMappings() {
9595
import org.apache.http.client.methods.HttpGet;
9696
import org.apache.http.client.methods.HttpUriRequest;
9797
import org.apache.http.util.EntityUtils;
98-
98+
9999
class A {
100100
void method(HttpEntity entity, String urlStr) throws Exception {
101101
HttpUriRequest getRequest = new HttpGet(urlStr);
@@ -107,7 +107,7 @@ void method(HttpEntity entity, String urlStr) throws Exception {
107107
import org.apache.hc.core5.http.HttpEntity;
108108
import org.apache.hc.client5.http.classic.methods.HttpGet;
109109
import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
110-
110+
111111
class A {
112112
void method(HttpEntity entity, String urlStr) throws Exception {
113113
HttpUriRequest getRequest = new HttpGet(urlStr);
@@ -220,4 +220,47 @@ void method() throws IOException {
220220
);
221221
}
222222

223+
@Test
224+
void convertRequestBuilderToClassicRequestBuilder() {
225+
rewriteRun(
226+
//language=java
227+
java(
228+
"""
229+
import org.apache.http.client.methods.CloseableHttpResponse;
230+
import org.apache.http.client.methods.HttpUriRequest;
231+
import org.apache.http.impl.client.CloseableHttpClient;
232+
import org.apache.http.impl.client.HttpClientBuilder;
233+
import org.apache.http.client.methods.RequestBuilder;
234+
235+
import java.io.IOException;
236+
237+
class A {
238+
void method() throws IOException {
239+
RequestBuilder requestBuilder = RequestBuilder.get("https://moderne.io");
240+
HttpUriRequest request = requestBuilder.build();
241+
CloseableHttpClient instance = HttpClientBuilder.create().build();
242+
CloseableHttpResponse response = instance.execute(request);
243+
}
244+
}
245+
""",
246+
"""
247+
import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
248+
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
249+
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
250+
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
251+
import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
252+
253+
import java.io.IOException;
254+
255+
class A {
256+
void method() throws IOException {
257+
ClassicRequestBuilder requestBuilder = ClassicRequestBuilder.get("https://moderne.io");
258+
HttpUriRequest request = requestBuilder.build();
259+
CloseableHttpClient instance = HttpClientBuilder.create().build();
260+
CloseableHttpResponse response = instance.execute(request);
261+
}
262+
}
263+
""")
264+
);
265+
}
223266
}

0 commit comments

Comments
 (0)