From e7dc7bf9299ac321d631c9c118053b75d3934e80 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Thu, 24 Jul 2014 07:41:00 +0000
Subject: [PATCH] SSDM-254 : V3 AS API - merge the new API branch to trunk -
stabilize tests in trunk after the merge
SVN: 32132
---
.../api/v3/dto/search/AbstractCompositeSearchCriterion.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/AbstractCompositeSearchCriterion.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/AbstractCompositeSearchCriterion.java
index 69924f7fedc..1a19f58333c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/AbstractCompositeSearchCriterion.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/AbstractCompositeSearchCriterion.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
-@JsonObject("AbstractStringValue")
+@JsonObject("AbstractCompositeSearchCriterion")
public abstract class AbstractCompositeSearchCriterion extends AbstractSearchCriterion
{
--
GitLab