Skip to content

Commit 83d45b7

Browse files
committed
#36 Reformatting
Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>
1 parent 7696009 commit 83d45b7

File tree

4 files changed

+32
-29
lines changed

4 files changed

+32
-29
lines changed

src/main/java/io/securecodebox/persistence/defectdojo/config/Config.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public static Config fromEnv() {
9999
maxPageCountForGets = Integer.parseInt(findEnvVar(EnvVars.DEFECTDOJO_MAX_PAGE_COUNT_FOR_GETS));
100100
} catch (final NumberFormatException e) {
101101
throw new ConfigException(String.format("Given value for environment variable '%s' is not a valid number! Given was '%s'.", EnvVars.DEFECTDOJO_MAX_PAGE_COUNT_FOR_GETS.literal, findEnvVar(EnvVars.DEFECTDOJO_MAX_PAGE_COUNT_FOR_GETS)),
102-
e);
102+
e);
103103
}
104104
} else {
105105
maxPageCountForGets = DEFAULT_MAX_PAGE_COUNT_FOR_GETS;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public RestTemplate createRestTemplate() {
6363
// Configuring Proxy Authentication explicitly as it isn't done by default for spring rest templates :(
6464
final var credentials = new BasicCredentialsProvider();
6565
credentials.setCredentials(
66-
createAuthScope(),
67-
createCredentials()
66+
createAuthScope(),
67+
createCredentials()
6868
);
6969

7070
final var builder = HttpClientBuilder.create();

src/main/java/io/securecodebox/persistence/defectdojo/service/GenericDefectDojoService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ abstract public class GenericDefectDojoService<T extends BaseModel> {
4040

4141
protected ObjectMapper objectMapper;
4242
protected ObjectMapper searchStringMapper;
43-
43+
4444
@Getter
4545
protected RestTemplate restTemplate;
4646

@@ -56,7 +56,7 @@ public GenericDefectDojoService(Config config) {
5656
this.searchStringMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
5757
this.searchStringMapper.coercionConfigFor(Engagement.Status.class).setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsNull);
5858
this.searchStringMapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
59-
59+
6060
this.restTemplate = this.setupRestTemplate();
6161
}
6262

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

+27-24
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import io.securecodebox.persistence.defectdojo.config.Config;
88
import lombok.NonNull;
9+
import org.apache.http.HttpHost;
910
import org.apache.http.auth.AuthScope;
1011
import org.apache.http.auth.Credentials;
1112
import org.junit.jupiter.api.Disabled;
@@ -22,24 +23,24 @@
2223
class FooTest {
2324
private final Config config = new Config("url", "apikey");
2425
private final ProxyConfig proxyConfig = ProxyConfig.builder()
25-
.user("user")
26-
.password("pw")
27-
.host("host")
28-
.port(42)
29-
.build();
26+
.user("user")
27+
.password("pw")
28+
.host("host")
29+
.port(42)
30+
.build();
3031
private final Foo sut = new Foo(config, proxyConfig);
3132

3233
@Test
3334
void generateAuthorizationHeaders_withoutProxyAuth() {
3435
final var innerSut = new Foo(config, ProxyConfig.NULL);
3536

3637
assertAll(
37-
() -> assertThat(
38-
innerSut.generateAuthorizationHeaders().get(HttpHeaders.AUTHORIZATION),
39-
contains("Token apikey")),
40-
() -> assertThat(
41-
innerSut.generateAuthorizationHeaders().get(HttpHeaders.PROXY_AUTHORIZATION),
42-
not(contains("Basic dXNlcjpwdw==")))
38+
() -> assertThat(
39+
innerSut.generateAuthorizationHeaders().get(HttpHeaders.AUTHORIZATION),
40+
contains("Token apikey")),
41+
() -> assertThat(
42+
innerSut.generateAuthorizationHeaders().get(HttpHeaders.PROXY_AUTHORIZATION),
43+
not(contains("Basic dXNlcjpwdw==")))
4344
);
4445
}
4546

@@ -48,21 +49,21 @@ void generateAuthorizationHeaders_withProxyAuth() {
4849
final var innerSut = new Foo(config, proxyConfig);
4950

5051
assertAll(
51-
() -> assertThat(
52-
innerSut.generateAuthorizationHeaders().get(HttpHeaders.AUTHORIZATION),
53-
contains("Token apikey")),
54-
() -> assertThat(
55-
innerSut.generateAuthorizationHeaders().get(HttpHeaders.PROXY_AUTHORIZATION),
56-
contains("Basic dXNlcjpwdw=="))
52+
() -> assertThat(
53+
innerSut.generateAuthorizationHeaders().get(HttpHeaders.AUTHORIZATION),
54+
contains("Token apikey")),
55+
() -> assertThat(
56+
innerSut.generateAuthorizationHeaders().get(HttpHeaders.PROXY_AUTHORIZATION),
57+
contains("Basic dXNlcjpwdw=="))
5758
);
5859
}
5960

6061
@Test
6162
void encodeProxyCredentials() {
6263
final var proxyConfig = ProxyConfig.builder()
63-
.user("bärtram")
64-
.password("gohze8Ae")
65-
.build();
64+
.user("bärtram")
65+
.password("gohze8Ae")
66+
.build();
6667

6768
assertThat(Foo.encodeProxyCredentials(proxyConfig), is("YsOkcnRyYW06Z29oemU4QWU="));
6869
}
@@ -72,8 +73,8 @@ void createAuthScope() {
7273
final var result = sut.createAuthScope();
7374

7475
assertAll(
75-
() -> assertThat(result.getHost(), is(proxyConfig.getHost())),
76-
() -> assertThat(result.getPort(), is(proxyConfig.getPort()))
76+
() -> assertThat(result.getHost(), is(proxyConfig.getHost())),
77+
() -> assertThat(result.getPort(), is(proxyConfig.getPort()))
7778
);
7879
}
7980

@@ -82,8 +83,10 @@ void createCredentials() {
8283
final var result = sut.createCredentials();
8384

8485
assertAll(
85-
() -> assertThat(result.getUserPrincipal().getName(), is(proxyConfig.getUser())),
86-
() -> assertThat(result.getPassword(), is(proxyConfig.getPassword()))
86+
() -> assertThat(result.getUserPrincipal().getName(), is(proxyConfig.getUser())),
87+
() -> assertThat(result.getPassword(), is(proxyConfig.getPassword()))
88+
);
89+
}
8790

8891
@Test
8992
void createHttpHost() {

0 commit comments

Comments
 (0)