Skip to content

Commit

Permalink
Strip even more fluff from tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@timtebeek
timtebeek committed Aug 14, 2024
1 parent a1ed926 commit 628fac4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 54 deletions.
3 changes: 2 additions & 1 deletion .../openrewrite/java/spring/framework/HttpComponentsClientHttpRequestFactoryReadTimeout.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.openrewrite.java.search.UsesType;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.Space;
import org.openrewrite.java.tree.Statement;

import java.util.stream.Collectors;
Expand Down Expand Up @@ -68,7 +69,7 @@ public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "httpcore5", "httpclient5"))
.imports("java.util.concurrent.TimeUnit", "org.apache.hc.core5.http.io.SocketConfig")
.build().apply(getCursor(), statement.getCoordinates().after(),
varDecl.getVariables().get(0).getName(),
varDecl.getVariables().get(0).getName().withPrefix(Space.EMPTY),
expression);
}
}
Expand Down
72 changes: 19 additions & 53 deletions ...nrewrite/java/spring/framework/HttpComponentsClientHttpRequestFactoryReadTimeoutTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ class HttpComponentsClientHttpRequestFactoryReadTimeoutTest implements RewriteTe
@Override
public void defaults(RecipeSpec spec) {
spec.recipeFromResources("org.openrewrite.java.spring.framework.UpgradeSpringFramework_6_0")
.parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(), "spring-web-5", "spring-boot-3.1", "httpclient-4", "httpcore-4", "spring-beans-5"));
.parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(),
"spring-beans-5",
"spring-boot-3.1",
"spring-web-5",
"httpclient-4",
"httpcore-4"));
}

@Test
Expand All @@ -44,42 +49,22 @@ void migrateHttpComponentsClientHttpRequestFactoryReadTimeout() {
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.time.Duration;
class RestContextInitializer {
RestTemplate getRestTemplate() throws Exception {
Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create().build();
PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
public class RestContextInitializer {
private final Duration readTimeout = Duration.ofSeconds(30);
private final int maxConnections = 1;
public RestTemplate getRestTemplate() {
return new RestTemplateBuilder()
.requestFactory(() -> {
HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory();
clientHttpRequestFactory.setReadTimeout((int) readTimeout.toMillis());
// createConnectionManager()
clientHttpRequestFactory.setReadTimeout(30000);
// ... set poolingConnectionManager on HttpClient
return clientHttpRequestFactory;
})
.build();
}
private PoolingHttpClientConnectionManager createConnectionManager() {
try {
Registry<ConnectionSocketFactory> socketFactoryRegistry =
RegistryBuilder.<ConnectionSocketFactory>create()
.build();
PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
poolingConnectionManager.setMaxTotal(maxConnections);
return poolingConnectionManager;
} catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
throw new RestClientException(e.getMessage(), e);
}
}
}
""",
"""
Expand All @@ -90,44 +75,24 @@ private PoolingHttpClientConnectionManager createConnectionManager() {
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
import java.security.KeyManagementException;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.time.Duration;
import java.util.concurrent.TimeUnit;
public class RestContextInitializer {
private final Duration readTimeout = Duration.ofSeconds(30);
private final int maxConnections = 1;
class RestContextInitializer {
RestTemplate getRestTemplate() throws Exception {
Registry<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory>create().build();
PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom().setSoTimeout(30000, TimeUnit.MILLISECONDS).build());
public RestTemplate getRestTemplate() {
return new RestTemplateBuilder()
.requestFactory(() -> {
HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory();
// createConnectionManager()
// ... set poolingConnectionManager on HttpClient
return clientHttpRequestFactory;
})
.build();
}
private PoolingHttpClientConnectionManager createConnectionManager() {
try {
Registry<ConnectionSocketFactory> socketFactoryRegistry =
RegistryBuilder.<ConnectionSocketFactory>create()
.build();
PoolingHttpClientConnectionManager poolingConnectionManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
poolingConnectionManager.setDefaultSocketConfig(SocketConfig.custom().setSoTimeout((int) readTimeout.toMillis(), TimeUnit.MILLISECONDS).build());
poolingConnectionManager.setMaxTotal(maxConnections);
return poolingConnectionManager;
} catch (NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
throw new RestClientException(e.getMessage(), e);
}
}
}
"""
)
Expand All @@ -138,5 +103,6 @@ private PoolingHttpClientConnectionManager createConnectionManager() {
// - Using BasicHttpClientConnectionManager
// - Using PoolingHttpClientConnectionManagerBuilder
// - No HttpClientConnectionManager at all
// - No intermediate variable for connectionManager

}

0 comments on commit 628fac4

Please sign in to comment.