Skip to content

Commit d6fa166

Browse files
committed
Make abstract class package private to hide implementation details
Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>
1 parent 62192a4 commit d6fa166

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44

55
package io.securecodebox.persistence.defectdojo.model;
66

7-
import java.util.Map;
87
import lombok.EqualsAndHashCode;
98

109
@EqualsAndHashCode // FIXME: Implement hashCode/equals in inheritance is problematic https://www.artima.com/articles/how-to-write-an-equality-method-in-java (see https://github.com/secureCodeBox/defectdojo-client-java/issues/23)
11-
// FIXME: Class should be package private because implementation detail
12-
abstract public class BaseModel {
13-
public abstract boolean equalsQueryString(Map<String, Object> queryParams);
10+
abstract class BaseModel implements Model {
11+
// Class can be removed we remove @EqualsAndHashCode.
1412
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package io.securecodebox.persistence.defectdojo.model;
2+
3+
import java.util.Map;
4+
5+
/**
6+
* Interface for all models
7+
*/
8+
public interface Model {
9+
boolean equalsQueryString(Map<String, Object> queryParams);
10+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import io.securecodebox.persistence.defectdojo.exception.LoopException;
1515
import io.securecodebox.persistence.defectdojo.http.Foo;
1616
import io.securecodebox.persistence.defectdojo.http.ProxyConfigFactory;
17-
import io.securecodebox.persistence.defectdojo.model.BaseModel;
1817
import io.securecodebox.persistence.defectdojo.model.Engagement;
18+
import io.securecodebox.persistence.defectdojo.model.Model;
1919
import io.securecodebox.persistence.defectdojo.model.Response;
2020
import lombok.Getter;
2121
import org.springframework.http.HttpEntity;
@@ -35,7 +35,7 @@
3535
import java.util.*;
3636

3737
// FIXME: Should be package private bc implementation detail.
38-
abstract public class GenericDefectDojoService<T extends BaseModel> {
38+
public abstract class GenericDefectDojoService<T extends Model> {
3939
protected Config config;
4040

4141
protected ObjectMapper objectMapper;

0 commit comments

Comments
 (0)