#36 Reformatting

Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>

Author: Weltraumschaf

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

@@ -99,7 +99,7 @@ public static Config fromEnv() {
                 maxPageCountForGets = Integer.parseInt(findEnvVar(EnvVars.DEFECTDOJO_MAX_PAGE_COUNT_FOR_GETS));
             } catch (final NumberFormatException e) {
                 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)),
-                    e);
+                        e);
             }
         } else {
             maxPageCountForGets = DEFAULT_MAX_PAGE_COUNT_FOR_GETS;

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

@@ -62,10 +62,7 @@ public RestTemplate createRestTemplate() {
         if (proxyConfig.isComplete()) {
             // Configuring Proxy Authentication explicitly as it isn't done by default for spring rest templates :(
             final var credentials = new BasicCredentialsProvider();
-            credentials.setCredentials(
-                createAuthScope(),
-                createCredentials()
-            );
+            credentials.setCredentials(createAuthScope(), createCredentials());
 
             final var builder = HttpClientBuilder.create();
             builder.useSystemProperties();

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

@@ -42,9 +42,9 @@
  */
 class DefaultImportScanService implements ImportScanService {
     private static final List<HttpMessageConverter<?>> HTTP_MESSAGE_CONVERTERS = List.of(
-        new FormHttpMessageConverter(),
-        new ResourceHttpMessageConverter(),
-        new MappingJackson2HttpMessageConverter());
+            new FormHttpMessageConverter(),
+            new ResourceHttpMessageConverter(),
+            new MappingJackson2HttpMessageConverter());
     @Getter
     private final String defectDojoUrl;
     @Getter
@@ -130,11 +130,11 @@ public String getFilename() {
     ImportScanResponse exchangeRequest(String endpoint, HttpEntity<?> payload) {
         final var restTemplate = this.createRestTemplate();
         return restTemplate.exchange(
-                generateApiUrl(endpoint),
-                HttpMethod.POST,
-                payload,
-                ImportScanResponse.class)
-            .getBody();
+                        generateApiUrl(endpoint),
+                        HttpMethod.POST,
+                        payload,
+                        ImportScanResponse.class)
+                .getBody();
     }
 
     String generateApiUrl(final String endpoint) {
@@ -187,10 +187,10 @@ boolean shouldConfigureProxySettings() {
     ClientHttpRequestFactory createRequestFactoryWithProxyAuthConfig() {
         final var credentials = new BasicCredentialsProvider();
         credentials.setCredentials(
-            new AuthScope(proxyConfig.getHost(), proxyConfig.getPort()),
-            new UsernamePasswordCredentials(
-                proxyConfig.getUser(),
-                proxyConfig.getPassword())
+                new AuthScope(proxyConfig.getHost(), proxyConfig.getPort()),
+                new UsernamePasswordCredentials(
+                        proxyConfig.getUser(),
+                        proxyConfig.getPassword())
         );
 
         final var clientBuilder = HttpClientBuilder.create();

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

@@ -40,7 +40,7 @@ abstract public class GenericDefectDojoService<T extends BaseModel> {
 
     protected ObjectMapper objectMapper;
     protected ObjectMapper searchStringMapper;
-    
+
     @Getter
     protected RestTemplate restTemplate;
 
@@ -56,7 +56,7 @@ public GenericDefectDojoService(Config config) {
         this.searchStringMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         this.searchStringMapper.coercionConfigFor(Engagement.Status.class).setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsNull);
         this.searchStringMapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
-        
+
         this.restTemplate = this.setupRestTemplate();
     }
 

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

@@ -118,7 +118,7 @@ public ImportScanResponse reimportScan(ScanFile scanFile, long testId, long lead
     }
 
     //overloading with optional parameter
-     public ImportScanResponse importScan(ScanFile scanFile, long engagementId, long lead, String currentDate, ScanType scanType, long testType, LinkedMultiValueMap<String, Object> additionalValues) {
+    public ImportScanResponse importScan(ScanFile scanFile, long engagementId, long lead, String currentDate, ScanType scanType, long testType, LinkedMultiValueMap<String, Object> additionalValues) {
         additionalValues.add("engagement", Long.toString(engagementId));
 
         return this.createFindings(scanFile, "import-scan", lead, currentDate, scanType, testType, additionalValues);

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

@@ -6,6 +6,7 @@
 
 import io.securecodebox.persistence.defectdojo.config.Config;
 import lombok.NonNull;
+import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.Credentials;
 import org.junit.jupiter.api.Disabled;
@@ -22,24 +23,24 @@
 class FooTest {
     private final Config config = new Config("url", "apikey");
     private final ProxyConfig proxyConfig = ProxyConfig.builder()
-        .user("user")
-        .password("pw")
-        .host("host")
-        .port(42)
-        .build();
+            .user("user")
+            .password("pw")
+            .host("host")
+            .port(42)
+            .build();
     private final Foo sut = new Foo(config, proxyConfig);
 
     @Test
     void generateAuthorizationHeaders_withoutProxyAuth() {
         final var innerSut = new Foo(config, ProxyConfig.NULL);
 
         assertAll(
-            () -> assertThat(
-                innerSut.generateAuthorizationHeaders().get(HttpHeaders.AUTHORIZATION),
-                contains("Token apikey")),
-            () -> assertThat(
-                innerSut.generateAuthorizationHeaders().get(HttpHeaders.PROXY_AUTHORIZATION),
-                not(contains("Basic dXNlcjpwdw==")))
+                () -> assertThat(
+                        innerSut.generateAuthorizationHeaders().get(HttpHeaders.AUTHORIZATION),
+                        contains("Token apikey")),
+                () -> assertThat(
+                        innerSut.generateAuthorizationHeaders().get(HttpHeaders.PROXY_AUTHORIZATION),
+                        not(contains("Basic dXNlcjpwdw==")))
         );
     }
 
@@ -48,21 +49,21 @@ void generateAuthorizationHeaders_withProxyAuth() {
         final var innerSut = new Foo(config, proxyConfig);
 
         assertAll(
-            () -> assertThat(
-                innerSut.generateAuthorizationHeaders().get(HttpHeaders.AUTHORIZATION),
-                contains("Token apikey")),
-            () -> assertThat(
-                innerSut.generateAuthorizationHeaders().get(HttpHeaders.PROXY_AUTHORIZATION),
-                contains("Basic dXNlcjpwdw=="))
+                () -> assertThat(
+                        innerSut.generateAuthorizationHeaders().get(HttpHeaders.AUTHORIZATION),
+                        contains("Token apikey")),
+                () -> assertThat(
+                        innerSut.generateAuthorizationHeaders().get(HttpHeaders.PROXY_AUTHORIZATION),
+                        contains("Basic dXNlcjpwdw=="))
         );
     }
 
     @Test
     void encodeProxyCredentials() {
         final var proxyConfig = ProxyConfig.builder()
-            .user("bärtram")
-            .password("gohze8Ae")
-            .build();
+                .user("bärtram")
+                .password("gohze8Ae")
+                .build();
 
         assertThat(Foo.encodeProxyCredentials(proxyConfig), is("YsOkcnRyYW06Z29oemU4QWU="));
     }
@@ -72,8 +73,8 @@ void createAuthScope() {
         final var result = sut.createAuthScope();
 
         assertAll(
-            () -> assertThat(result.getHost(), is(proxyConfig.getHost())),
-            () -> assertThat(result.getPort(), is(proxyConfig.getPort()))
+                () -> assertThat(result.getHost(), is(proxyConfig.getHost())),
+                () -> assertThat(result.getPort(), is(proxyConfig.getPort()))
         );
     }
 
@@ -82,8 +83,10 @@ void createCredentials() {
         final var result = sut.createCredentials();
 
         assertAll(
-            () -> assertThat(result.getUserPrincipal().getName(), is(proxyConfig.getUser())),
-            () -> assertThat(result.getPassword(), is(proxyConfig.getPassword()))
+                () -> assertThat(result.getUserPrincipal().getName(), is(proxyConfig.getUser())),
+                () -> assertThat(result.getPassword(), is(proxyConfig.getPassword()))
+        );
+    }
 
     @Test
     void createHttpHost() {