From 82ad1b0fadf09d43f3429ef0bd88d4224aa32772 Mon Sep 17 00:00:00 2001 From: Sven Strittmatter Date: Fri, 16 Feb 2024 15:02:46 +0100 Subject: [PATCH 1/7] #121 Reformatting Signed-off-by: Sven Strittmatter --- pom.xml | 767 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 384 insertions(+), 383 deletions(-) diff --git a/pom.xml b/pom.xml index e138e583..34a8bd5f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,390 +1,391 @@ - - 4.0.0 - - io.securecodebox - defectdojo-client - 3.0.0-SNAPSHOT - jar - DefectDojo Client Java - - This library helps with interacting with the REST API of DefectDojo. - - https://github.com/secureCodeBox/defectdojo-client-java - - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - secureCodeBox - https://www.securecodebox.io/ - - - - ${maven.version} - - - - scm:git:https://github.com/secureCodeBox/defectdojo-client-java.git - scm:git:https://github.com/secureCodeBox/defectdojo-client-java.git - https://github.com/secureCodeBox/defectdojo-client-java.git - HEAD - - - - - jannik.hollenbach - Jannik Hollenbach - jannik.hollenbach@iteratec.com - - - robert.felber - Robert Felber - robert.felber@iteratec.com - - - johannes.zahn - Johannes Zahn - johannes.zahn@iteratec.com - - - sven.strittmatter - Sven Strittmatter - sven.strittmatter@iteratec.com - - - heiko.kiesel - Heiko Kiesel - heiko.kiesel@iteratec.com - - - - - 3.5.0 - UTF-8 - UTF-8 - 17 - 17 - ${project.build.directory}/jacoco.exec - - - 2.16.1 - 5.3.29 - 5.10.0 - - - - - - org.junit - junit-bom - 5.10.2 - pom - import - - - - + + 4.0.0 + + io.securecodebox + defectdojo-client + 3.0.0-SNAPSHOT + jar + DefectDojo Client Java + + This library helps with interacting with the REST API of DefectDojo. + + https://github.com/secureCodeBox/defectdojo-client-java + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + secureCodeBox + https://www.securecodebox.io/ + + + + ${maven.version} + + + + scm:git:https://github.com/secureCodeBox/defectdojo-client-java.git + scm:git:https://github.com/secureCodeBox/defectdojo-client-java.git + https://github.com/secureCodeBox/defectdojo-client-java.git + HEAD + + + + + jannik.hollenbach + Jannik Hollenbach + jannik.hollenbach@iteratec.com + + + robert.felber + Robert Felber + robert.felber@iteratec.com + + + johannes.zahn + Johannes Zahn + johannes.zahn@iteratec.com + + + sven.strittmatter + Sven Strittmatter + sven.strittmatter@iteratec.com + + + heiko.kiesel + Heiko Kiesel + heiko.kiesel@iteratec.com + + + + + 3.5.0 + UTF-8 + UTF-8 + 17 + 17 + ${project.build.directory}/jacoco.exec + + + 2.16.1 + 5.3.29 + 5.10.0 + + + - - - org.springframework - spring-web - ${org.springframework.version} - - - org.apache.httpcomponents - httpclient - 4.5.14 - - - com.fasterxml.jackson.core - jackson-core - ${com.fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${com.fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${com.fasterxml.jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${com.fasterxml.jackson.version} - - - org.slf4j - slf4j-api - 2.0.11 - - - org.projectlombok - lombok - 1.18.30 - provided - - - - - org.junit.jupiter - junit-jupiter - test - - - org.springframework - spring-test - ${org.springframework.version} - test - - - org.hamcrest - java-hamcrest - 2.0.0.0 - test - - - org.mockito - mockito-core - ${org.mockito.version} - test - - - org.mockito - mockito-junit-jupiter - ${org.mockito.version} - test - - - uk.org.webcompere - system-stubs-jupiter - 2.1.6 - test - - - nl.jqno.equalsverifier - equalsverifier - 3.15.6 - test - + org.junit + junit-bom + 5.10.2 + pom + import + - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - release - - - - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - - - --pinentry-mode - loopback - - - - - - - - - - - - - - - maven-compiler-plugin - 3.12.1 - - ${project.build.version.source} - ${project.build.version.target} - ${project.build.sourceEncoding} - true - true - -Xlint:unchecked - - - - - maven-source-plugin - 3.3.0 - - - - attach-sources - - jar-no-fork - - - - - - - maven-enforcer-plugin - 3.4.1 - - - enforce - - - - - - - ${project.build.version.target} - - - ${maven.version} - - - - - - enforce - - - - - - - maven-release-plugin - 3.0.1 - - - mvnw - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.11 - - - pre-unit-test - - prepare-agent - - process-test-classes - - - ${sonar.jacoco.reportPath} - - - - - report - prepare-package - - report - - - - - - - maven-surefire-plugin - 3.2.5 - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://oss.sonatype.org/ - true - - - - - maven-javadoc-plugin - 3.6.3 - - - attach-javadocs - - jar - - - - - - Copyright © {currentYear} the secureCodeBox Authors. All Rights Reserved. - - - ${project.name} - ${project.version} - ${project.name} - ${project.version} - private - ${project.build.sourceEncoding} - ${project.build.sourceEncoding} - ${project.build.version.source} - - - https://docs.oracle.com/en/java/javase/17/docs/api/ - - false - - - - - + + + + + + org.springframework + spring-web + ${org.springframework.version} + + + org.apache.httpcomponents + httpclient + 4.5.14 + + + com.fasterxml.jackson.core + jackson-core + ${com.fasterxml.jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${com.fasterxml.jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${com.fasterxml.jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${com.fasterxml.jackson.version} + + + org.slf4j + slf4j-api + 2.0.11 + + + + org.projectlombok + lombok + 1.18.30 + provided + + + + + org.junit.jupiter + junit-jupiter + test + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.hamcrest + java-hamcrest + 2.0.0.0 + test + + + org.mockito + mockito-core + ${org.mockito.version} + test + + + org.mockito + mockito-junit-jupiter + ${org.mockito.version} + test + + + uk.org.webcompere + system-stubs-jupiter + 2.1.6 + test + + + nl.jqno.equalsverifier + equalsverifier + 3.15.6 + test + + + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + release + - - maven-surefire-plugin - - - - maven-source-plugin - - - - maven-javadoc-plugin - - - - org.jacoco - jacoco-maven-plugin - - - - org.sonatype.plugins - nexus-staging-maven-plugin - + + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + --pinentry-mode + loopback + + + + + - + + + + + + + + + maven-compiler-plugin + 3.12.1 + + ${project.build.version.source} + ${project.build.version.target} + ${project.build.sourceEncoding} + true + true + -Xlint:unchecked + + + + + maven-source-plugin + 3.3.0 + + + + attach-sources + + jar-no-fork + + + + + + + maven-enforcer-plugin + 3.4.1 + + + enforce + + + + + + + ${project.build.version.target} + + + ${maven.version} + + + + + + enforce + + + + + + + maven-release-plugin + 3.0.1 + + + mvnw + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + pre-unit-test + + prepare-agent + + process-test-classes + + + ${sonar.jacoco.reportPath} + + + + + report + prepare-package + + report + + + + + + + maven-surefire-plugin + 3.2.5 + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://oss.sonatype.org/ + true + + + + + maven-javadoc-plugin + 3.6.3 + + + attach-javadocs + + jar + + + + + + Copyright © {currentYear} the secureCodeBox Authors. All Rights Reserved. + + + ${project.name} - ${project.version} + ${project.name} - ${project.version} + private + ${project.build.sourceEncoding} + ${project.build.sourceEncoding} + ${project.build.version.source} + + + https://docs.oracle.com/en/java/javase/17/docs/api/ + + false + + + + + + + + maven-surefire-plugin + + + + maven-source-plugin + + + + maven-javadoc-plugin + + + + org.jacoco + jacoco-maven-plugin + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + From 1f2137ae4661d57738e6b6dfb4071e15f44b49f1 Mon Sep 17 00:00:00 2001 From: Sven Strittmatter Date: Fri, 16 Feb 2024 15:04:08 +0100 Subject: [PATCH 2/7] #121 Add PRevious Reformatting Commit to Blame Ignore Signed-off-by: Sven Strittmatter --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 2e93774e..33cd8b20 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -8,3 +8,5 @@ #23 Reformat Java code ef59f4c921adec23c3f4f927053a5e98246d8ff9 +#121 Reformat pom.xml +82ad1b0fadf09d43f3429ef0bd88d4224aa32772 From da6b0419af1f3e92120ed377789584cba4e784f7 Mon Sep 17 00:00:00 2001 From: Sven Strittmatter Date: Fri, 16 Feb 2024 15:06:24 +0100 Subject: [PATCH 3/7] #121 Add Lombok to Compiler's Annotation Processors Signed-off-by: Sven Strittmatter --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34a8bd5f..3f25857f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,7 @@ 2.16.1 5.3.29 5.10.0 + 1.18.30 @@ -131,7 +132,7 @@ org.projectlombok lombok - 1.18.30 + ${lombok.version} provided @@ -234,6 +235,13 @@ true true -Xlint:unchecked + + + org.projectlombok + lombok + ${lombok.version} + + From c29f4c2dabdc99927dedac507462c566f45a50f3 Mon Sep 17 00:00:00 2001 From: Sven Strittmatter Date: Fri, 16 Feb 2024 15:07:26 +0100 Subject: [PATCH 4/7] Mark My Copied Backup as Depricated to Prevent Accidemntally Use Signed-off-by: Sven Strittmatter --- .../persistence/defectdojo/service/ImportScanService2.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/io/securecodebox/persistence/defectdojo/service/ImportScanService2.java b/src/main/java/io/securecodebox/persistence/defectdojo/service/ImportScanService2.java index e87b7451..28d809b3 100644 --- a/src/main/java/io/securecodebox/persistence/defectdojo/service/ImportScanService2.java +++ b/src/main/java/io/securecodebox/persistence/defectdojo/service/ImportScanService2.java @@ -30,7 +30,10 @@ /** * Copied the version before I did refactoring for easier compare of duplicated code + * + * @deprecated Will be removed when refactoring is finished */ +@Deprecated(forRemoval = true) public class ImportScanService2 { private final Config config; From 3d76d32d58f98a30f17dc5d1ae39ef1dba3e8e78 Mon Sep 17 00:00:00 2001 From: Sven Strittmatter Date: Fri, 16 Feb 2024 15:14:19 +0100 Subject: [PATCH 5/7] #121 USe Logging Facade Instead of System.out Signed-off-by: Sven Strittmatter --- .../io/securecodebox/persistence/defectdojo/http/Foo.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/securecodebox/persistence/defectdojo/http/Foo.java b/src/main/java/io/securecodebox/persistence/defectdojo/http/Foo.java index 7f5a25f9..a44b06c9 100644 --- a/src/main/java/io/securecodebox/persistence/defectdojo/http/Foo.java +++ b/src/main/java/io/securecodebox/persistence/defectdojo/http/Foo.java @@ -6,6 +6,7 @@ import io.securecodebox.persistence.defectdojo.config.Config; import lombok.NonNull; +import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; @@ -24,6 +25,7 @@ /** * Placeholder to move duplicated code, will be named better later */ +@Slf4j public final class Foo { private final Config config; private final ProxyConfig proxyConfig; @@ -44,8 +46,7 @@ public HttpHeaders generateAuthorizationHeaders() { headers.set(HttpHeaders.AUTHORIZATION, "Token " + this.config.getApiKey()); if (proxyConfig.isComplete()) { - // FIXME: System.out logging is a real bad code smell. Standard loging should be used. - System.out.println("Setting Proxy Auth Header..."); + log.info("Setting Proxy Auth Header..."); headers.set(HttpHeaders.PROXY_AUTHORIZATION, "Basic " + encodeProxyCredentials(proxyConfig)); } From 9d4be9da6fa7219d5499d8e89397b15871cd4a9c Mon Sep 17 00:00:00 2001 From: Sven Strittmatter Date: Fri, 16 Feb 2024 15:14:53 +0100 Subject: [PATCH 6/7] #121 The Readme Referenced Old Class Name Signed-off-by: Sven Strittmatter --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cb5600b7..9b59f365 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ public class DefectDojoClientTest { public static void main(String[] args) throws URISyntaxException, JsonProcessingException { // Configure DefectDojo URl and APIv2 Key - var conf = new DefectDojoConfig("https://defectdojo.example.com", "f8...."); + var conf = new Config("https://defectdojo.example.com", "f8...."); var productTypeService = new ProductTypeService(conf); var productTypes = productTypeService.search(); From b941ab87411b663fe87a19611024c436c7cd380f Mon Sep 17 00:00:00 2001 From: Sven Strittmatter Date: Fri, 16 Feb 2024 15:16:19 +0100 Subject: [PATCH 7/7] #121 Remove Unused Imports Signed-off-by: Sven Strittmatter --- .../persistence/defectdojo/service/ProductGroupService.java | 2 +- .../persistence/defectdojo/service/ProductService.java | 2 +- .../persistence/defectdojo/service/ProductTypeService.java | 2 +- .../persistence/defectdojo/service/UserProfileService.java | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductGroupService.java b/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductGroupService.java index 9dcb9b69..4b57db78 100644 --- a/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductGroupService.java +++ b/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductGroupService.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import io.securecodebox.persistence.defectdojo.config.Config; -import io.securecodebox.persistence.defectdojo.model.ProductGroup; import io.securecodebox.persistence.defectdojo.model.PaginatedResult; +import io.securecodebox.persistence.defectdojo.model.ProductGroup; public class ProductGroupService extends GenericDefectDojoService { public ProductGroupService(Config config) { diff --git a/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductService.java b/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductService.java index 6be654a8..0aae2f2b 100644 --- a/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductService.java +++ b/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductService.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import io.securecodebox.persistence.defectdojo.config.Config; -import io.securecodebox.persistence.defectdojo.model.Product; import io.securecodebox.persistence.defectdojo.model.PaginatedResult; +import io.securecodebox.persistence.defectdojo.model.Product; public class ProductService extends GenericDefectDojoService { diff --git a/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductTypeService.java b/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductTypeService.java index 55da6c47..0039a92a 100644 --- a/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductTypeService.java +++ b/src/main/java/io/securecodebox/persistence/defectdojo/service/ProductTypeService.java @@ -7,8 +7,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import io.securecodebox.persistence.defectdojo.config.Config; -import io.securecodebox.persistence.defectdojo.model.ProductType; import io.securecodebox.persistence.defectdojo.model.PaginatedResult; +import io.securecodebox.persistence.defectdojo.model.ProductType; public class ProductTypeService extends GenericDefectDojoService { diff --git a/src/main/java/io/securecodebox/persistence/defectdojo/service/UserProfileService.java b/src/main/java/io/securecodebox/persistence/defectdojo/service/UserProfileService.java index 2db18d77..0083dd55 100644 --- a/src/main/java/io/securecodebox/persistence/defectdojo/service/UserProfileService.java +++ b/src/main/java/io/securecodebox/persistence/defectdojo/service/UserProfileService.java @@ -10,7 +10,6 @@ import io.securecodebox.persistence.defectdojo.model.PaginatedResult; import io.securecodebox.persistence.defectdojo.model.UserProfile; -import java.util.ArrayList; import java.util.List; public final class UserProfileService extends GenericDefectDojoService {