SP-952 / BIS-548 : Novartis: API Access to attachements in dropboxes - rename methods

SVN: 30011

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationTransactionV2Delegate.java

@@ -366,39 +366,39 @@ public class DataSetRegistrationTransactionV2Delegate implements IDataSetRegistr
     }
 
     @Override
-    public InputStream getProjectAttachmentContent(IProjectImmutable project, String fileName, Integer versionOrNull)
+    public InputStream getAttachmentContent(IProjectImmutable project, String fileName, Integer versionOrNull)
     {
-        return transaction.getProjectAttachmentContent(project, fileName, versionOrNull);
+        return transaction.getAttachmentContent(project, fileName, versionOrNull);
     }
 
     @Override
-    public InputStream getExperimentAttachmentContent(IExperimentImmutable experiment, String fileName, Integer versionOrNull)
+    public InputStream getAttachmentContent(IExperimentImmutable experiment, String fileName, Integer versionOrNull)
     {
-        return transaction.getExperimentAttachmentContent(experiment, fileName, versionOrNull);
+        return transaction.getAttachmentContent(experiment, fileName, versionOrNull);
     }
 
     @Override
-    public InputStream getSampleAttachmentContent(ISampleImmutable sample, String fileName, Integer versionOrNull)
+    public InputStream getAttachmentContent(ISampleImmutable sample, String fileName, Integer versionOrNull)
     {
-        return transaction.getSampleAttachmentContent(sample, fileName, versionOrNull);
+        return transaction.getAttachmentContent(sample, fileName, versionOrNull);
     }
 
     @Override
-    public List<IAttachmentImmutable> listProjectAttachments(IProjectImmutable project)
+    public List<IAttachmentImmutable> listAttachments(IProjectImmutable project)
     {
-        return transaction.listProjectAttachments(project);
+        return transaction.listAttachments(project);
     }
 
     @Override
-    public List<IAttachmentImmutable> listExperimentAttachments(IExperimentImmutable experiment)
+    public List<IAttachmentImmutable> listAttachments(IExperimentImmutable experiment)
     {
-        return transaction.listExperimentAttachments(experiment);
+        return transaction.listAttachments(experiment);
     }
 
     @Override
-    public List<IAttachmentImmutable> listSampleAttachments(ISampleImmutable sample)
+    public List<IAttachmentImmutable> listAttachments(ISampleImmutable sample)
     {
-        return transaction.listSampleAttachments(sample);
+        return transaction.listAttachments(sample);
     }
 
 }

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetRegistrationTransactionV2.java

@@ -431,33 +431,33 @@ public interface IDataSetRegistrationTransactionV2
      * Returns a project attachment content. If the version is not specified then the latest version of the attachment is returned. Returns null if
      * the attachment does not exist.
      */
-    InputStream getProjectAttachmentContent(IProjectImmutable project, String fileName, Integer versionOrNull);
+    InputStream getAttachmentContent(IProjectImmutable project, String fileName, Integer versionOrNull);
 
     /**
      * Returns an experiment attachment content. If the version is not specified then the latest version of the attachment is returned. Returns null
      * if the attachment does not exist.
      */
-    InputStream getExperimentAttachmentContent(IExperimentImmutable experiment, String fileName, Integer versionOrNull);
+    InputStream getAttachmentContent(IExperimentImmutable experiment, String fileName, Integer versionOrNull);
 
     /**
      * Returns a sample attachment content. If the version is not specified then the latest version of the attachment is returned. Returns null if the
      * attachment does not exist.
      */
-    InputStream getSampleAttachmentContent(ISampleImmutable sample, String fileName, Integer versionOrNull);
+    InputStream getAttachmentContent(ISampleImmutable sample, String fileName, Integer versionOrNull);
 
     /**
      * Returns a list of project attachments with all versions. Returns null if the project does not have any attachments.
      */
-    List<IAttachmentImmutable> listProjectAttachments(IProjectImmutable project);
+    List<IAttachmentImmutable> listAttachments(IProjectImmutable project);
 
     /**
      * Returns a list of experiment attachments with all versions. Returns null if the experiment does not have any attachments.
      */
-    List<IAttachmentImmutable> listExperimentAttachments(IExperimentImmutable experiment);
+    List<IAttachmentImmutable> listAttachments(IExperimentImmutable experiment);
 
     /**
      * Returns a list of sample attachments with all versions. Returns null if the sample does not have any attachments.
      */
-    List<IAttachmentImmutable> listSampleAttachments(ISampleImmutable sample);
+    List<IAttachmentImmutable> listAttachments(ISampleImmutable sample);
 
 }

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetRegistrationTransaction.java

@@ -818,7 +818,7 @@ public class DataSetRegistrationTransaction<T extends DataSetInformation> implem
     }
 
     @Override
-    public List<IAttachmentImmutable> listProjectAttachments(IProjectImmutable project)
+    public List<IAttachmentImmutable> listAttachments(IProjectImmutable project)
     {
         if (project == null)
         {
@@ -830,7 +830,7 @@ public class DataSetRegistrationTransaction<T extends DataSetInformation> implem
     }
 
     @Override
-    public List<IAttachmentImmutable> listExperimentAttachments(IExperimentImmutable experiment)
+    public List<IAttachmentImmutable> listAttachments(IExperimentImmutable experiment)
     {
         if (experiment == null)
         {
@@ -842,7 +842,7 @@ public class DataSetRegistrationTransaction<T extends DataSetInformation> implem
     }
 
     @Override
-    public List<IAttachmentImmutable> listSampleAttachments(ISampleImmutable sample)
+    public List<IAttachmentImmutable> listAttachments(ISampleImmutable sample)
     {
         if (sample == null)
         {
@@ -854,7 +854,7 @@ public class DataSetRegistrationTransaction<T extends DataSetInformation> implem
     }
 
     @Override
-    public InputStream getProjectAttachmentContent(IProjectImmutable project, String fileName, Integer versionOrNull)
+    public InputStream getAttachmentContent(IProjectImmutable project, String fileName, Integer versionOrNull)
     {
         if (project == null)
         {
@@ -871,7 +871,7 @@ public class DataSetRegistrationTransaction<T extends DataSetInformation> implem
     }
 
     @Override
-    public InputStream getExperimentAttachmentContent(IExperimentImmutable experiment, String fileName, Integer versionOrNull)
+    public InputStream getAttachmentContent(IExperimentImmutable experiment, String fileName, Integer versionOrNull)
     {
         if (experiment == null)
         {
@@ -889,7 +889,7 @@ public class DataSetRegistrationTransaction<T extends DataSetInformation> implem
     }
 
     @Override
-    public InputStream getSampleAttachmentContent(ISampleImmutable sample, String fileName, Integer versionOrNull)
+    public InputStream getAttachmentContent(ISampleImmutable sample, String fileName, Integer versionOrNull)
     {
         if (sample == null)
         {

datastore_server/sourceTest/core-plugins/generic-test/1/dss/drop-boxes/attachments-test/attachments-test-handler.py

@@ -33,70 +33,70 @@ def assertAttachment(attachment, fileName, title, description, version):
 def testProjectWithoutAttachments(transaction):
     project = transaction.getProject("/CISD/DEFAULT");
 
-    attachments = transaction.listProjectAttachments(project)
+    attachments = transaction.listAttachments(project)
     assertAttachmentCount(attachments, 0)
     
-    content = transaction.getProjectAttachmentContent(project, "not-existing-attachment", None);
+    content = transaction.getAttachmentContent(project, "not-existing-attachment", None);
     assertAttachmentContentContains(content, None);
 
 def testProjectWithAttachments(transaction):
     project = transaction.getProject("/CISD/NEMO");
 
-    attachments = transaction.listProjectAttachments(project)
+    attachments = transaction.listAttachments(project)
     assertAttachmentCount(attachments, 1)
     assertAttachment(attachments[0], "projectDescription.txt", "The Project", "All about it.", 1);
 
-    content = transaction.getProjectAttachmentContent(project, "projectDescription.txt", None);
+    content = transaction.getAttachmentContent(project, "projectDescription.txt", None);
     assertAttachmentContentContains(content, "3VCP1");
     
-    content2 = transaction.getProjectAttachmentContent(project, "not-existing-attachment", None);
+    content2 = transaction.getAttachmentContent(project, "not-existing-attachment", None);
     assertAttachmentContentContains(content2, None);
 
 def testExperimentWithoutAttachments(transaction):
     experiment = transaction.getExperiment("/CISD/NEMO/EXP10");
 
-    attachments = transaction.listExperimentAttachments(experiment)
+    attachments = transaction.listAttachments(experiment)
     assertAttachmentCount(attachments, 0)
 
-    content = transaction.getExperimentAttachmentContent(experiment, "not-existing-attachment", 2);
+    content = transaction.getAttachmentContent(experiment, "not-existing-attachment", 2);
     assertAttachmentContentContains(content, None);
 
 def testExperimentWithAttachments(transaction):
     experiment = transaction.getExperiment("/CISD/NEMO/EXP1");
 
-    attachments = transaction.listExperimentAttachments(experiment)
+    attachments = transaction.listAttachments(experiment)
     assertAttachmentCount(attachments, 4)
     assertAttachment(attachments[0], "exampleExperiments.txt", None, None, 1)
     assertAttachment(attachments[1], "exampleExperiments.txt", None, None, 2)
     assertAttachment(attachments[2], "exampleExperiments.txt", None, None, 3)
     assertAttachment(attachments[3], "exampleExperiments.txt", None, None, 4)
     
-    content = transaction.getExperimentAttachmentContent(experiment, "exampleExperiments.txt", 2);
+    content = transaction.getAttachmentContent(experiment, "exampleExperiments.txt", 2);
     assertAttachmentContentContains(content, "koko");
 
-    content2 = transaction.getExperimentAttachmentContent(experiment, "not-existing-attachment", 2);
+    content2 = transaction.getAttachmentContent(experiment, "not-existing-attachment", 2);
     assertAttachmentContentContains(content2, None);
 
 def testSampleWithoutAttachments(transaction):
     sample = transaction.getSample("/CISD/3VCP5");
 
-    attachments = transaction.listSampleAttachments(sample)
+    attachments = transaction.listAttachments(sample)
     assertAttachmentCount(attachments, 0)
 
-    content = transaction.getSampleAttachmentContent(sample, "not-existing-attachment", None);
+    content = transaction.getAttachmentContent(sample, "not-existing-attachment", None);
     assertAttachmentContentContains(content, None);
 
 def testSampleWithAttachments(transaction):
     sample = transaction.getSample("/CISD/3VCP6");
 
-    attachments = transaction.listSampleAttachments(sample)
+    attachments = transaction.listAttachments(sample)
     assertAttachmentCount(attachments, 1)
     assertAttachment(attachments[0], "sampleHistory.txt", None, None, 1)
 
-    content = transaction.getSampleAttachmentContent(sample, "sampleHistory.txt", None);
+    content = transaction.getAttachmentContent(sample, "sampleHistory.txt", None);
     assertAttachmentContentContains(content, "kot")
     
-    content2 = transaction.getSampleAttachmentContent(sample, "not-existing-attachment", None);
+    content2 = transaction.getAttachmentContent(sample, "not-existing-attachment", None);
     assertAttachmentContentContains(content2, None);
 
 def process(transaction):