TASK-6780 - Port Patch 3.2.1 -> 4.0.0 - Xetabase 2.2.1 -> 3.0.0

biodata-models/src/main/java/org/opencb/biodata/models/clinical/interpretation/Interpretation.java

@@ -28,29 +28,29 @@
 
 public class Interpretation {
 
-    private String id;
-    private String uuid;
-    private String description;
-    private String clinicalAnalysisId;
+    protected String id;
+    protected String uuid;
+    protected String name;
+    protected String description;
+    protected String clinicalAnalysisId;
 
     /**
      * Interpretation algorithm tool used to generate this interpretation.
      */
-    private ClinicalAnalyst analyst;
-    private InterpretationMethod method;
+    protected ClinicalAnalyst analyst;
+    protected InterpretationMethod method;
 
-    private List<ClinicalVariant> primaryFindings;
-    private List<ClinicalVariant> secondaryFindings;
+    protected List<ClinicalVariant> primaryFindings;
+    protected List<ClinicalVariant> secondaryFindings;
 
-    private List<ClinicalComment> comments;
+    protected List<ClinicalComment> comments;
 
-    private InterpretationStats stats;
+    protected InterpretationStats stats;
 
-    private boolean locked;
-    private Status status;
-    private String creationDate;
-    private String modificationDate;
-    private int version;
+    protected boolean locked;
+    protected String creationDate;
+    protected String modificationDate;
+    protected int version;
 
     /**
      * Users can add custom information in this field.
@@ -61,12 +61,23 @@ public class Interpretation {
     public Interpretation() {
     }
 
+    @Deprecated
     public Interpretation(String id, String uuid, String description, String clinicalAnalysisId, ClinicalAnalyst analyst,
                           InterpretationMethod method, List<ClinicalVariant> primaryFindings, List<ClinicalVariant> secondaryFindings,
                           List<ClinicalComment> comments, InterpretationStats stats, Status status, String creationDate,
                           String modificationDate, boolean locked, int version, Map<String, Object> attributes) {
+        this(id, uuid, id, description, clinicalAnalysisId, analyst, method, primaryFindings, secondaryFindings,
+                comments, stats, locked, creationDate, modificationDate, version, attributes);
+    }
+
+    public Interpretation(String id, String uuid, String name, String description, String clinicalAnalysisId,
+                          ClinicalAnalyst analyst, InterpretationMethod method, List<ClinicalVariant> primaryFindings,
+                          List<ClinicalVariant> secondaryFindings, List<ClinicalComment> comments,
+                          InterpretationStats stats, boolean locked, String creationDate, String modificationDate,
+                          int version, Map<String, Object> attributes) {
         this.id = id;
         this.uuid = uuid;
+        this.name = name;
         this.description = description;
         this.clinicalAnalysisId = clinicalAnalysisId;
         this.analyst = analyst;
@@ -75,10 +86,9 @@ public Interpretation(String id, String uuid, String description, String clinica
         this.secondaryFindings = secondaryFindings;
         this.comments = comments;
         this.stats = stats;
-        this.status = status;
+        this.locked = locked;
         this.creationDate = creationDate;
         this.modificationDate = modificationDate;
-        this.locked = locked;
         this.version = version;
         this.attributes = attributes;
     }
@@ -88,6 +98,7 @@ public String toString() {
         final StringBuilder sb = new StringBuilder("Interpretation{");
         sb.append("id='").append(id).append('\'');
         sb.append(", uuid='").append(uuid).append('\'');
+        sb.append(", name='").append(name).append('\'');
         sb.append(", description='").append(description).append('\'');
         sb.append(", clinicalAnalysisId='").append(clinicalAnalysisId).append('\'');
         sb.append(", analyst=").append(analyst);
@@ -96,7 +107,6 @@ public String toString() {
         sb.append(", secondaryFindings=").append(secondaryFindings);
         sb.append(", comments=").append(comments);
         sb.append(", stats=").append(stats);
-        sb.append(", status=").append(status);
         sb.append(", creationDate='").append(creationDate).append('\'');
         sb.append(", modificationDate='").append(modificationDate).append('\'');
         sb.append(", locked='").append(locked).append('\'');
@@ -124,6 +134,15 @@ public Interpretation setUuid(String uuid) {
         return this;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public Interpretation setName(String name) {
+        this.name = name;
+        return this;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -196,15 +215,6 @@ public Interpretation setStats(InterpretationStats stats) {
         return this;
     }
 
-    public Status getStatus() {
-        return status;
-    }
-
-    public Interpretation setStatus(Status status) {
-        this.status = status;
-        return this;
-    }
-
     public String getCreationDate() {
         return creationDate;
     }

biodata-models/src/main/java/org/opencb/biodata/models/common/Status.java

@@ -19,17 +19,22 @@
 public class Status {
 
     protected String id;
-    protected String name;
     protected String description;
     protected String date;
 
     public Status() {
-        this("", "", "", "");
+        this("", "", "");
     }
 
+    public Status(String id, String description, String date) {
+        this.id = id;
+        this.description = description;
+        this.date = date;
+    }
+
+    @Deprecated
     public Status(String id, String name, String description, String date) {
         this.id = id;
-        this.name = name;
         this.description = description;
         this.date = date;
     }
@@ -38,7 +43,6 @@ public Status(String id, String name, String description, String date) {
     public String toString() {
         final StringBuilder sb = new StringBuilder("Status{");
         sb.append("id='").append(id).append('\'');
-        sb.append(", name='").append(name).append('\'');
         sb.append(", description='").append(description).append('\'');
         sb.append(", date='").append(date).append('\'');
         sb.append('}');
@@ -53,15 +57,13 @@ public boolean equals(Object o) {
         Status status = (Status) o;
 
         if (!id.equals(status.id)) return false;
-        if (name != null ? !name.equals(status.name) : status.name != null) return false;
         if (description != null ? !description.equals(status.description) : status.description != null) return false;
         return date != null ? date.equals(status.date) : status.date == null;
     }
 
     @Override
     public int hashCode() {
         int result = id.hashCode();
-        result = 31 * result + (name != null ? name.hashCode() : 0);
         result = 31 * result + (description != null ? description.hashCode() : 0);
         result = 31 * result + (date != null ? date.hashCode() : 0);
         return result;
@@ -76,12 +78,13 @@ public Status setId(String id) {
         return this;
     }
 
+    @Deprecated
     public String getName() {
-        return name;
+        return id;
     }
 
+    @Deprecated
     public Status setName(String name) {
-        this.name = name;
         return this;
     }