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

Better parsing of connection factory urls. Fixes #2254 (#2263)

Browse Source 
Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
This commit is contained in:
Ryan Baxter
2023-05-04 16:04:49 -04:00
committed by GitHub
parent 6ec9c432cb
commit 436fdf9910
2 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java
View File

@@ -221,6 +221,51 @@ public class HttpClientConfigurableHttpConnectionFactoryTest {
assertThat(actualHttpClientBuilder).isSameAs(expectedHttpClientBuilder);
}
@Test
public void applicationNameAlsoOccursInBaseURL() throws Exception {
MultipleJGitEnvironmentProperties properties = new MultipleJGitEnvironmentProperties();
properties.setUri("http://server.com/{placeholder}-test.git");
this.connectionFactory.addConfiguration(properties);
HttpConnection actualConnection = this.connectionFactory
.create(new URL("http://server.com/server-test.git" + "/some/path.properties"));
HttpClientBuilder expectedHttpClientBuilder = this.connectionFactory.httpClientBuildersByUri.values().stream()
.findFirst().get();
HttpClientBuilder actualHttpClientBuilder = getActualHttpClientBuilder(actualConnection);
assertThat(actualHttpClientBuilder).isSameAs(expectedHttpClientBuilder);
}
@Test
public void applicationNameAlsoOccursInBaseURLMultiplePlaceholders() throws Exception {
MultipleJGitEnvironmentProperties properties = new MultipleJGitEnvironmentProperties();
properties.setUri("http://server.com/{placeholder}-foo/{placeholder}-test.git");
this.connectionFactory.addConfiguration(properties);
HttpConnection actualConnection = this.connectionFactory
.create(new URL("http://server.com/hello-foo/server-test.git" + "/some/path.properties"));
HttpClientBuilder expectedHttpClientBuilder = this.connectionFactory.httpClientBuildersByUri.values().stream()
.findFirst().get();
HttpClientBuilder actualHttpClientBuilder = getActualHttpClientBuilder(actualConnection);
assertThat(actualHttpClientBuilder).isSameAs(expectedHttpClientBuilder);
}
@Test
public void applicationNameAlsoOccursLaterInPath() throws Exception {
MultipleJGitEnvironmentProperties properties = new MultipleJGitEnvironmentProperties();
properties.setUri("http://localhost/{placeholder}-testval.git");
this.connectionFactory.addConfiguration(properties);
HttpConnection actualConnection = this.connectionFactory
.create(new URL("http://localhost/val-testval.git" + "/some/path.properties"));
HttpClientBuilder expectedHttpClientBuilder = this.connectionFactory.httpClientBuildersByUri.values().stream()
.findFirst().get();
HttpClientBuilder actualHttpClientBuilder = getActualHttpClientBuilder(actualConnection);
assertThat(actualHttpClientBuilder).isSameAs(expectedHttpClientBuilder);
}
private HttpClient getActualHttpClient(HttpConnection actualConnection) {
Field clientField = ReflectionUtils.findField(actualConnection.getClass(), "client");
ReflectionUtils.makeAccessible(clientField);