#36 Remove DefectDojo prefix since most types does not follow this pattern

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

Author: Weltraumschaf

README.md

@@ -16,7 +16,7 @@ The client is supposed to be compatible with DefectDojo 1.10 and later, older ve
 
 ```java
 import com.fasterxml.jackson.core.JsonProcessingException;
-import io.securecodebox.persistence.defectdojo.config.DefectDojoConfig;
+import io.securecodebox.persistence.defectdojo.config.Config;
 import io.securecodebox.persistence.defectdojo.service.ProductTypeService;
 
 import java.net.URISyntaxException;
@@ -39,4 +39,4 @@ public class DefectDojoClientTest {
 ```
 
 ## Testing a modified client
-To build a gradle project that depends on this client one can use `./gradlew build --include-build <path_to_this_folder>`. Gradle will then build the project with this local version of the the client.
+To build a gradle project that depends on this client one can use `./gradlew build --include-build <path_to_this_folder>`. Gradle will then build the project with this local version of the the client.

…/defectdojo/config/DefectDojoConfig.java …ersistence/defectdojo/config/Config.javasrc/main/java/io/securecodebox/persistence/defectdojo/config/DefectDojoConfig.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/config/Config.java src/main/java/io/securecodebox/persistence/defectdojo/config/DefectDojoConfig.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/config/Config.java

@@ -14,7 +14,7 @@
 @Getter
 @ToString
 @AllArgsConstructor
-public class DefectDojoConfig {
+public class Config {
     private final String url;
 
     private final String apiKey;
@@ -31,11 +31,11 @@ public class DefectDojoConfig {
      */
     private final Long userId;
 
-    public DefectDojoConfig(String url, String apiKey, String username, int maxPageCountForGets) {
+    public Config(String url, String apiKey, String username, int maxPageCountForGets) {
         this(url, apiKey, username, maxPageCountForGets, null);
     }
 
-    public static DefectDojoConfig fromEnv() {
+    public static Config fromEnv() {
         String url = System.getenv("DEFECTDOJO_URL");
         String username = System.getenv("DEFECTDOJO_USERNAME");
         String apiKey = System.getenv("DEFECTDOJO_APIKEY");
@@ -45,6 +45,6 @@ public static DefectDojoConfig fromEnv() {
         if (System.getenv("DEFECTDOJO_MAX_PAGE_COUNT_FOR_GETS") != null) {
             maxPageCountForGets = Integer.parseInt(System.getenv("DEFECTDOJO_MAX_PAGE_COUNT_FOR_GETS"));
         }
-        return new DefectDojoConfig(url, apiKey, username, maxPageCountForGets, userId);
+        return new Config(url, apiKey, username, maxPageCountForGets, userId);
     }
 }

…o/exception/DefectDojoLoopException.java …/defectdojo/exception/LoopException.javasrc/main/java/io/securecodebox/persistence/defectdojo/exception/DefectDojoLoopException.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/exception/LoopException.java src/main/java/io/securecodebox/persistence/defectdojo/exception/DefectDojoLoopException.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/exception/LoopException.java

@@ -5,12 +5,12 @@
 
 package io.securecodebox.persistence.defectdojo.exception;
 
-public class DefectDojoLoopException extends RuntimeException {
-  public DefectDojoLoopException(String message) {
+public class LoopException extends RuntimeException {
+  public LoopException(String message) {
     super(message);
   }
 
-  public DefectDojoLoopException(String message, Throwable cause) {
+  public LoopException(String message, Throwable cause) {
     super(message, cause);
   }
 }

…tion/DefectDojoPersistenceException.java …dojo/exception/PersistenceException.javasrc/main/java/io/securecodebox/persistence/defectdojo/exception/DefectDojoPersistenceException.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/exception/PersistenceException.java src/main/java/io/securecodebox/persistence/defectdojo/exception/DefectDojoPersistenceException.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/exception/PersistenceException.java

@@ -5,12 +5,12 @@
 
 package io.securecodebox.persistence.defectdojo.exception;
 
-public class DefectDojoPersistenceException extends RuntimeException {
-    public DefectDojoPersistenceException(String message) {
+public class PersistenceException extends RuntimeException {
+    public PersistenceException(String message) {
         super(message);
     }
 
-    public DefectDojoPersistenceException(String message, Throwable cause) {
+    public PersistenceException(String message, Throwable cause) {
         super(message, cause);
     }
 }

…ce/defectdojo/model/DefectDojoModel.java …sistence/defectdojo/model/BaseModel.javasrc/main/java/io/securecodebox/persistence/defectdojo/model/DefectDojoModel.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/model/BaseModel.java src/main/java/io/securecodebox/persistence/defectdojo/model/DefectDojoModel.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/model/BaseModel.java

@@ -9,6 +9,7 @@
 import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode // FIXME: Implement hashCode/equals in inheritance is problematic (https://www.artima.com/articles/how-to-write-an-equality-method-in-java)
-abstract public class DefectDojoModel {
+// #FIXME: Should be package private because implementation detail
+abstract public class BaseModel {
   public abstract boolean equalsQueryString(Map<String, Object> queryParams);
 }

src/main/java/io/securecodebox/persistence/defectdojo/model/Endpoint.java

@@ -17,7 +17,7 @@
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class Endpoint extends DefectDojoModel {
+public class Endpoint extends BaseModel {
   @JsonProperty
   Long id;
 

src/main/java/io/securecodebox/persistence/defectdojo/model/Engagement.java

@@ -18,7 +18,7 @@
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class Engagement extends DefectDojoModel {
+public class Engagement extends BaseModel {
   @JsonProperty("branch_tag")
   public String branch;
 

src/main/java/io/securecodebox/persistence/defectdojo/model/Finding.java

@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.securecodebox.persistence.defectdojo.exception.DefectDojoPersistenceException;
+import io.securecodebox.persistence.defectdojo.exception.PersistenceException;
 import lombok.*;
 
 import java.time.LocalDateTime;
@@ -22,7 +22,7 @@
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class Finding extends DefectDojoModel {
+public class Finding extends BaseModel {
     @JsonProperty
     Long id;
 
@@ -123,7 +123,7 @@ public String getNumericalSeverity() {
             case Informational:
                 return "S4";
             default:
-                throw new DefectDojoPersistenceException("Unknown severity: '" + this.severity + "'");
+                throw new PersistenceException("Unknown severity: '" + this.severity + "'");
         }
     }
 

…sistence/defectdojo/model/DojoGroup.java …/persistence/defectdojo/model/Group.javasrc/main/java/io/securecodebox/persistence/defectdojo/model/DojoGroup.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/model/Group.java src/main/java/io/securecodebox/persistence/defectdojo/model/DojoGroup.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/model/Group.java

@@ -17,7 +17,7 @@
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class DojoGroup extends DefectDojoModel {
+public class Group extends BaseModel {
     @JsonProperty
     Long id;
 

…ce/defectdojo/model/DojoGroupMember.java …stence/defectdojo/model/GroupMember.javasrc/main/java/io/securecodebox/persistence/defectdojo/model/DojoGroupMember.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/model/GroupMember.java src/main/java/io/securecodebox/persistence/defectdojo/model/DojoGroupMember.java renamed to src/main/java/io/securecodebox/persistence/defectdojo/model/GroupMember.java

@@ -16,7 +16,7 @@
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class DojoGroupMember extends DefectDojoModel {
+public class GroupMember extends BaseModel {
     @JsonProperty
     Long id;