diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org')
2 files changed, 9 insertions, 0 deletions
diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Conflict.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Conflict.java index a7b1ff3bf4..80186f876b 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Conflict.java +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/Conflict.java @@ -20,12 +20,16 @@ package org.openecomp.conflicts.types; +import com.google.common.annotations.VisibleForTesting; import org.openecomp.sdc.datatypes.model.ElementType; public class Conflict<T> extends ConflictInfo { private T yours; private T theirs; + @VisibleForTesting + Conflict() {} + public Conflict(String id, ElementType type, String name) { super(id, type, name); } diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ConflictInfo.java b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ConflictInfo.java index 3f6788538b..af4111c1dd 100644 --- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ConflictInfo.java +++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/src/main/java/org/openecomp/conflicts/types/ConflictInfo.java @@ -20,6 +20,7 @@ package org.openecomp.conflicts.types; +import com.google.common.annotations.VisibleForTesting; import org.openecomp.sdc.datatypes.model.ElementType; public class ConflictInfo { @@ -27,6 +28,10 @@ public class ConflictInfo { private ElementType type; private String name; + @VisibleForTesting + ConflictInfo() { + } + public ConflictInfo(String id, ElementType type, String name) { this.id = id; this.type = type; |