LMS-1988 Remove use of "OrNull" from the IDataSet interface.

SVN: 19776

datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java

@@ -94,12 +94,12 @@ public class DataSet<T extends DataSetInformation> implements IDataSet
         setExperiment(exp.getExperiment());
     }
 
-    public ISampleImmutable getSampleOrNull()
+    public ISampleImmutable getSample()
     {
         return sampleOrNull;
     }
 
-    public void setSampleOrNull(ISampleImmutable sampleOrNull)
+    public void setSample(ISampleImmutable sampleOrNull)
     {
         this.sampleOrNull = sampleOrNull;