Skip to content

Commit 07aef76

Browse files
committed
#36 Decompose method to make code testable
Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>
1 parent a64fcf6 commit 07aef76

File tree

2 files changed

+18
-4
lines changed
  • src
    • main/java/io/securecodebox/persistence/defectdojo/http
    • test/java/io/securecodebox/persistence/defectdojo/http

2 files changed

+18
-4
lines changed

src/main/java/io/securecodebox/persistence/defectdojo/http/Foo.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,10 @@ static String encodeProxyCredentials(@NonNull final ProxyConfig cfg) {
6161
public RestTemplate createRestTemplate() {
6262
if (proxyConfig.isComplete()) {
6363
// Configuring Proxy Authentication explicitly as it isn't done by default for spring rest templates :(
64-
final var credentials = new BasicCredentialsProvider();
65-
credentials.setCredentials(createAuthScope(), createCredentials());
66-
6764
final var builder = HttpClientBuilder.create();
6865
builder.useSystemProperties();
6966
builder.setProxy(createHttpHost());
70-
builder.setDefaultCredentialsProvider(credentials);
67+
builder.setDefaultCredentialsProvider(createCredentialsProvider());
7168
builder.setProxyAuthenticationStrategy(new ProxyAuthenticationStrategy());
7269

7370
final var factory = new HttpComponentsClientHttpRequestFactory();
@@ -78,6 +75,12 @@ public RestTemplate createRestTemplate() {
7875
return new RestTemplate();
7976
}
8077

78+
CredentialsProvider createCredentialsProvider() {
79+
final var provider = new BasicCredentialsProvider();
80+
provider.setCredentials(createAuthScope(), createCredentials());
81+
return provider;
82+
}
83+
8184
AuthScope createAuthScope() {
8285
return new AuthScope(proxyConfig.getHost(), proxyConfig.getPort());
8386
}

src/test/java/io/securecodebox/persistence/defectdojo/http/FooTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@ void encodeProxyCredentials() {
6868
assertThat(Foo.encodeProxyCredentials(proxyConfig), is("YsOkcnRyYW06Z29oemU4QWU="));
6969
}
7070

71+
@Test
72+
void createCredentialsProvider() {
73+
final var result = sut.createCredentialsProvider();
74+
final var credentials = result.getCredentials(sut.createAuthScope());
75+
76+
assertAll(
77+
() -> assertThat(credentials.getUserPrincipal().getName(), is(proxyConfig.getUser())),
78+
() -> assertThat(credentials.getPassword(), is(proxyConfig.getPassword()))
79+
);
80+
}
81+
7182
@Test
7283
void createAuthScope() {
7384
final var result = sut.createAuthScope();

0 commit comments

Comments
 (0)