SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use apache 4 for ConfigurableHttpConnectionFactoryIntegrationTests

Browse Source
This commit is contained in:
spencergibb
2022-10-17 12:22:27 -04:00
parent 45cb39f896
commit 3f52d8925e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/ConfigurableHttpConnectionFactoryIntegrationTests.java
View File

@@ -29,7 +29,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.apache.hc.client5.http.classic.HttpClient;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.eclipse.jgit.transport.HttpTransport;
import org.eclipse.jgit.transport.http.HttpConnection;
import org.eclipse.jgit.transport.http.HttpConnectionFactory;
@@ -47,9 +48,7 @@ import org.springframework.cloud.config.server.config.EnvironmentRepositoryConfi
import org.springframework.cloud.config.server.proxy.ProxyHostProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.client.RestTemplate;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.allOf;
@@ -249,8 +248,11 @@ public class ConfigurableHttpConnectionFactoryIntegrationTests {
}
private void makeRequest(HttpClient httpClient, String url) {
RestTemplate restTemplate = new RestTemplate(new HttpComponentsClientHttpRequestFactory(httpClient));
restTemplate.getForObject(url, String.class);
try {
httpClient.execute(new HttpGet(url));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
private HttpClient getHttpClientForUrl(String repoUrl) throws IOException {