add methods to spatial viewer dataset and organize them

KPMP · Nov 11, 2024 · 21550c3 · 21550c3
1 parent 468e2d8
commit 21550c3
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 53 deletions.
diff --git a/src/main/java/org/kpmp/spatialViewerDataset/SpatialViewerDataset.java b/src/main/java/org/kpmp/spatialViewerDataset/SpatialViewerDataset.java
@@ -2,80 +2,81 @@
 
 import org.kpmp.file.File;
 import java.util.List;
+import java.util.Set;
 
 public interface SpatialViewerDataset {
 
-    List<File> getRelatedFiles();
-
-    String getLevel();
-
-    String getSpectrackSampleId();
-
-    String getEnrollmentCategory();
+    int getFileId();  
 
-    String getTissueSource();
-
-    String getSex();
-
-    String getSampleType();
-
-    String getAge();
-
-    String getRedcapId();
-
     int getParticipantId();
-
-    String getDataType();
-
-    String getImageType();
-
+
     String getConfigType();
-
-    String getProtocol();
-
-    Long getFileSize();
-
-    String getPackageId();
-
-    String getFileName();
 
-    String getFileNameSort();
+    String getImageType();
 
-    int getParticipantIdSort();
+    String getDataType();
 
-    String getImageTypeSort();
-
     String getDlFileId();
-
-    int getFileId();  
-
-    String getExternalLink();
 
-    Double getReleaseVersion();
+    String getFileName();
+
+    String getPackageId();
+
+    Long getFileSize();
+
+    String getSpectrackSampleId();
+
+    String getLevel();
+
+    String getReleaseVersion();
+
+    List<File> getRelatedFiles();
 
-    String getPrimaryAdjudicatedCategory();
+    Set<String> getRedcapId();
 
-    String getKdigoStage();
+    Set<String> getAge();
 
-    String getBaselineEgfr();
+    Set<String> getProtocol();
 
-    String getProteinuria();
+    Set<String> getSex();
 
-    String getA1c();
+    Set<String> getTissueSource();
 
-    String getAlbuminuria();
+    Set<String> getEnrollmentCategory();
 
-    String getDiabetesDuration();
+    Set<String> getPrimaryAdjudicatedCategory();
 
-    String getDiabetesHistory();
+    Set<String> getKdigoStage();
 
-    String getHypertensionDuration();
+    Set<String> getBaselineEgfr();
 
-    String getHypertensionHistory();
+    Set<String> getProteinuria();
 
-    String getRace();
+    Set<String> getA1c();
 
-    String getOnRaasBlockade();
+    Set<String> getAlbuminuria();
+
+    Set<String> getDiabetesHistory();
+
+    Set<String> getDiabetesDuration();
+
+    Set<String> getHypertensionHistory();
+
+    Set<String> getHypertensionDuration();
+
+    Set<String> getOnRaasBlockade();
+
+    Set<String> getRace();
+
+    Set<String> getSampleType();
+
+    String getFileNameSort();
+
+    int getParticipantIdSort();
+
+    String getImageTypeSort();
+
+    String getExternalLink();
 
 }
 
diff --git a/src/main/java/org/kpmp/spatialViewerDataset/SpatialViewerDatasetDisplay.java b/src/main/java/org/kpmp/spatialViewerDataset/SpatialViewerDatasetDisplay.java
@@ -5,11 +5,10 @@
 import org.kpmp.file.File;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.collect.Sets.SetView;
 
 import jakarta.persistence.Transient;
 
-public class SpatialViewerDatasetDisplay {
+public class SpatialViewerDatasetDisplay implements SpatialViewerDataset {
     private static final int UUID_LENGTH = 37;
     private int fileId;
     private int participantId;