diff --git a/src/main/java/org/kpmp/spatialViewerDataset/SpatialViewerDataset.java b/src/main/java/org/kpmp/spatialViewerDataset/SpatialViewerDataset.java index a71a9a1..67c4fdf 100644 --- 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 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 getRelatedFiles(); - String getPrimaryAdjudicatedCategory(); + Set getRedcapId(); - String getKdigoStage(); + Set getAge(); - String getBaselineEgfr(); + Set getProtocol(); - String getProteinuria(); + Set getSex(); - String getA1c(); + Set getTissueSource(); - String getAlbuminuria(); + Set getEnrollmentCategory(); - String getDiabetesDuration(); + Set getPrimaryAdjudicatedCategory(); - String getDiabetesHistory(); + Set getKdigoStage(); - String getHypertensionDuration(); + Set getBaselineEgfr(); - String getHypertensionHistory(); + Set getProteinuria(); - String getRace(); + Set getA1c(); - String getOnRaasBlockade(); + Set getAlbuminuria(); + + Set getDiabetesHistory(); + + Set getDiabetesDuration(); + + Set getHypertensionHistory(); + + Set getHypertensionDuration(); + + Set getOnRaasBlockade(); + + Set getRace(); + + Set 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 index 7b1c857..5db2597 100644 --- 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;