From 63df30b7d1be218b04136d8d606489446274d466 Mon Sep 17 00:00:00 2001
From: fedoreno <fedoreno>
Date: Sat, 19 Mar 2016 00:53:04 +0000
Subject: [PATCH] SSDM-3348: fixing dto inconsistencies
SVN: 35949
---
.../asapi/v3/dto/common/id/ObjectTechId.java | 2 +-
.../common/search/AbstractDateObjectValue.java | 2 +-
.../search/AbstractFieldSearchCriteria.java | 4 ++--
.../v3/dto/common/search/AbstractValue.java | 8 +-------
.../search/DateEarlierThanOrEqualToValue.java | 9 +++++++--
.../common/search/DateFieldSearchCriteria.java | 2 +-
.../search/DateLaterThanOrEqualToValue.java | 5 +++++
.../DateObjectEarlierThanOrEqualToValue.java | 5 +++++
.../common/search/DateObjectEqualToValue.java | 5 +++++
.../DateObjectLaterThanOrEqualToValue.java | 7 ++++++-
.../dto/common/search/NumberEqualToValue.java | 2 +-
.../search/NumberFieldSearchCriteria.java | 2 +-
.../v3/dto/common/search/SearchResult.java | 6 ++++++
.../search/StringFieldSearchCriteria.java | 2 +-
.../asapi/v3/dto/common/search/TimeZone.java | 3 +++
.../create/CreateExperimentsOperation.java | 17 ++++++++++++++++-
.../CreateExperimentsOperationResult.java | 16 +++++++++++++++-
.../sample/create/CreateSamplesOperation.java | 7 ++++++-
...t.java => CreateSamplesOperationResult.java} | 13 +++++++++----
.../v3/dto/sample/create/SampleCreation.java | 2 +-
.../sample/update/UpdateSamplesOperation.java | 7 ++++++-
21 files changed, 99 insertions(+), 27 deletions(-)
rename openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/{CreateSamplesResult.java => CreateSamplesOperationResult.java} (78%)
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java
index 8e7766bac02..ae0e96ebc64 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java
@@ -76,7 +76,7 @@ public class ObjectTechId implements IObjectId
@Override
public String toString()
{
- return getTechId().toString();
+ return String.valueOf(getTechId());
}
@Override
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
index 1e91dc37538..1a6991543b1 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
@@ -33,7 +33,7 @@ public abstract class AbstractDateObjectValue extends AbstractValue<Date> implem
protected String getFormattedValue()
{
- return getValue().toString();
+ return String.valueOf(getValue());
}
}
\ No newline at end of file
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java
index 41b801275aa..c6e2aa09a51 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java
@@ -24,9 +24,9 @@ public abstract class AbstractFieldSearchCriteria<T> extends AbstractSearchCrite
private static final long serialVersionUID = 1L;
- private String fieldName;
+ private final String fieldName;
- private SearchFieldType fieldType;
+ private final SearchFieldType fieldType;
private T fieldValue;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java
index 6d18064ef45..a64b009729c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java
@@ -49,13 +49,7 @@ abstract class AbstractValue<T> implements Serializable
@Override
public String toString()
{
- if (getValue() != null)
- {
- return getValue().toString();
- } else
- {
- return null;
- }
+ return String.valueOf(getValue());
}
}
\ No newline at end of file
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java
index 60e8e4abc10..11b20777b38 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java
@@ -26,8 +26,13 @@ public class DateEarlierThanOrEqualToValue extends AbstractDateValue
{
private static final long serialVersionUID = 1L;
-
- DateEarlierThanOrEqualToValue(String value)
+
+ private DateEarlierThanOrEqualToValue()
+ {
+ super(null);
+ }
+
+ public DateEarlierThanOrEqualToValue(String value)
{
super(value);
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java
index 49c60082edc..0d4fb9aba55 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java
@@ -25,7 +25,7 @@ import java.util.List;
import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.common.search.DateFieldSearchCriteria")
-public class DateFieldSearchCriteria extends AbstractFieldSearchCriteria<IDate>
+public abstract class DateFieldSearchCriteria extends AbstractFieldSearchCriteria<IDate>
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java
index 11549f48b37..25bb4adef96 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java
@@ -26,6 +26,11 @@ public class DateLaterThanOrEqualToValue extends AbstractDateValue
{
private static final long serialVersionUID = 1L;
+
+ private DateLaterThanOrEqualToValue()
+ {
+ super(null);
+ }
DateLaterThanOrEqualToValue(String value)
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java
index 979f59b5345..ec55a3abb1f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java
@@ -25,6 +25,11 @@ public class DateObjectEarlierThanOrEqualToValue extends AbstractDateObjectValue
{
private static final long serialVersionUID = 1L;
+ private DateObjectEarlierThanOrEqualToValue()
+ {
+ super(null);
+ }
+
public DateObjectEarlierThanOrEqualToValue(Date value)
{
super(value);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java
index 5f619a491ec..b284dd9a9cd 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java
@@ -25,6 +25,11 @@ public class DateObjectEqualToValue extends AbstractDateObjectValue
{
private static final long serialVersionUID = 1L;
+ private DateObjectEqualToValue()
+ {
+ super(null);
+ }
+
public DateObjectEqualToValue(Date value)
{
super(value);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.java
index b9db5b45ab3..545217032c8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanOrEqualToValue.java
@@ -25,7 +25,12 @@ public class DateObjectLaterThanOrEqualToValue extends AbstractDateObjectValue
{
private static final long serialVersionUID = 1L;
- DateObjectLaterThanOrEqualToValue(Date value)
+ DateObjectLaterThanOrEqualToValue()
+ {
+ super(null);
+ }
+
+ public DateObjectLaterThanOrEqualToValue(Date value)
{
super(value);
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java
index 80c59481898..a654038bc16 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java
@@ -27,7 +27,7 @@ public class NumberEqualToValue extends AbstractNumberValue
private static final long serialVersionUID = 1L;
- public NumberEqualToValue()
+ private NumberEqualToValue()
{
super(null);
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
index 2dc7e899029..f10d939e9be 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
@@ -19,7 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.common.search.NumberFieldSearchCriteria")
-public class NumberFieldSearchCriteria extends AbstractFieldSearchCriteria<AbstractNumberValue>
+public abstract class NumberFieldSearchCriteria extends AbstractFieldSearchCriteria<AbstractNumberValue>
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
index 270ec9007e9..30d87720cc9 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
@@ -34,6 +34,12 @@ public class SearchResult<OBJECT> implements Serializable
private int totalCount;
+ @SuppressWarnings("unused")
+ private SearchResult()
+ {
+ this(null, 0);
+ }
+
public SearchResult(List<OBJECT> objects, int totalCount)
{
this.objects = objects;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java
index c207394b4f4..eb0301374a8 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java
@@ -19,7 +19,7 @@ package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.common.search.StringFieldSearchCriteria")
-public class StringFieldSearchCriteria extends AbstractFieldSearchCriteria<AbstractStringValue>
+public abstract class StringFieldSearchCriteria extends AbstractFieldSearchCriteria<AbstractStringValue>
{
private static final long serialVersionUID = 1L;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java
index ee94ad67a39..6b800489e5f 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java
@@ -29,6 +29,9 @@ public class TimeZone implements ITimeZone
private static final long serialVersionUID = 1L;
private int hourOffset;
+
+ @SuppressWarnings("unused")
+ private TimeZone() {}
public TimeZone(int hourOffset)
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java
index 7872312ca35..49b0b96242e 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java
@@ -27,7 +27,22 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.experiment.create.CreateExperimentsOperation")
public class CreateExperimentsOperation implements IOperation
{
+ private List<ExperimentCreation> creations;
- private List<ExperimentCreation> newExperiments;
+ @SuppressWarnings("unused")
+ private CreateExperimentsOperation()
+ {
+
+ }
+
+ public CreateExperimentsOperation(List<ExperimentCreation> creations)
+ {
+ this.creations = creations;
+ }
+
+ public List<ExperimentCreation> getCreations()
+ {
+ return creations;
+ }
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java
index 662e44cfd71..72506a694f9 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java
@@ -28,7 +28,21 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.experiment.create.CreateExperimentsOperationResult")
public class CreateExperimentsOperationResult implements IOperationResult
{
+ private List<ExperimentPermId> permIds;
- private List<ExperimentPermId> newExperimentIds;
+ @SuppressWarnings("unused")
+ private CreateExperimentsOperationResult()
+ {
+
+ }
+
+ public CreateExperimentsOperationResult(List<ExperimentPermId> permIds)
+ {
+ this.permIds = permIds;
+ }
+ public List<ExperimentPermId> getPermIds()
+ {
+ return permIds;
+ }
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java
index aa6029676d5..f892dc2d009 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java
@@ -27,8 +27,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.sample.create.CreateSamplesOperation")
public class CreateSamplesOperation implements IOperation
{
-
private List<SampleCreation> creations;
+
+ @SuppressWarnings("unused")
+ private CreateSamplesOperation()
+ {
+
+ }
public CreateSamplesOperation(List<SampleCreation> creations)
{
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesResult.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperationResult.java
similarity index 78%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesResult.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperationResult.java
index ac04601b7cc..c4bc6fb3a12 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesResult.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperationResult.java
@@ -25,13 +25,18 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("as.dto.sample.create.CreateSamplesResult")
-public class CreateSamplesResult implements IOperationResult
+@JsonObject("as.dto.sample.create.CreateSamplesOperationResult")
+public class CreateSamplesOperationResult implements IOperationResult
{
-
private List<SamplePermId> permIds;
+
+ @SuppressWarnings("unused")
+ private CreateSamplesOperationResult()
+ {
+
+ }
- public CreateSamplesResult(List<SamplePermId> permIds)
+ public CreateSamplesOperationResult(List<SamplePermId> permIds)
{
this.permIds = permIds;
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
index 7d9d746120c..81b16eeba71 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
@@ -64,7 +64,7 @@ public class SampleCreation implements Serializable, ICreationIdHolder
private CreationId creationId;
private boolean autoGeneratedCode;
-
+
public IEntityTypeId getTypeId()
{
return typeId;
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java
index 38f72dd1406..25ad2260394 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java
@@ -27,8 +27,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
@JsonObject("as.dto.sample.update.UpdateSamplesOperation")
public class UpdateSamplesOperation implements IOperation
{
-
private List<SampleUpdate> updates;
+
+ @SuppressWarnings("unused")
+ private UpdateSamplesOperation()
+ {
+
+ }
public UpdateSamplesOperation(List<SampleUpdate> updates)
{
--
GitLab