From b68f38479a94bb6da88a1430b29c95dcc51c4410 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Fri, 22 Jan 2016 14:33:11 +0000
Subject: [PATCH] SSDM-2362 : V3 AS API - global search - fix openbis_api tests

SVN: 35543
---
 .../asapi/v3/helper/generators/Generator.java |  4 +--
 .../v3/dto/global/GlobalSearchObject.java     |  8 ++---
 .../generic/sharedapi/v3/dictionary.txt       | 32 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/Generator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/Generator.java
index 00904a26ac9..ecbca07ac31 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/Generator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/Generator.java
@@ -43,6 +43,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.ExperimentPermId;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.ExternalDms;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.fetchoptions.ExternalDmsFetchOptions;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.fetchoptions.GlobalSearchObjectFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.GlobalSearchObjectKind;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.HistoryEntry;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.fetchoptions.HistoryEntryFetchOptions;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
@@ -76,7 +77,6 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.id.TagPermId;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.Vocabulary;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.fetchoptions.VocabularyFetchOptions;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.fetchoptions.VocabularyTermFetchOptions;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 
 public class Generator extends AbstractGenerator
 {
@@ -582,7 +582,7 @@ public class Generator extends AbstractGenerator
     {
         DtoGenerator gen = new DtoGenerator("global", "GlobalSearchObject", GlobalSearchObjectFetchOptions.class);
 
-        gen.addSimpleField(EntityKind.class, "entityKind");
+        gen.addSimpleField(GlobalSearchObjectKind.class, "entityKind");
         gen.addSimpleField(EntityTypePermId.class, "entityTypeId");
         gen.addSimpleField(IObjectId.class, "objectId");
         gen.addStringField("registratorEmail");
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/GlobalSearchObject.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/GlobalSearchObject.java
index 1a99620b91c..09f15e9a04b 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/GlobalSearchObject.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/GlobalSearchObject.java
@@ -20,13 +20,13 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSet;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.fetchoptions.GlobalSearchObjectFetchOptions;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.GlobalSearchObjectKind;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.Project;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.Sample;
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
 import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException;
 import ch.systemsx.cisd.base.annotation.JsonObject;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.io.Serializable;
@@ -43,7 +43,7 @@ public class GlobalSearchObject implements Serializable
     private GlobalSearchObjectFetchOptions fetchOptions;
 
     @JsonProperty
-    private EntityKind entityKind;
+    private GlobalSearchObjectKind entityKind;
 
     @JsonProperty
     private EntityTypePermId entityTypeId;
@@ -93,13 +93,13 @@ public class GlobalSearchObject implements Serializable
 
     // Method automatically generated with DtoGenerator
     @JsonIgnore
-    public EntityKind getEntityKind()
+    public GlobalSearchObjectKind getEntityKind()
     {
         return entityKind;
     }
 
     // Method automatically generated with DtoGenerator
-    public void setEntityKind(EntityKind entityKind)
+    public void setEntityKind(GlobalSearchObjectKind entityKind)
     {
         this.entityKind = entityKind;
     }
diff --git a/openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt b/openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt
index 7d169ec5985..63bed30eeb9 100644
--- a/openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt
+++ b/openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt
@@ -960,4 +960,34 @@ SCRIPT
 UPDATE
 VOCABULARY
 VOCABULARY_TERM
-
+getDataSet
+getEntityKind
+getEntityTypeId
+getMatchingField
+getMatchingText
+getMaterial
+getRegistratorEmail
+GlobalSearchCriteria
+GlobalSearchObject
+GlobalSearchObjectFetchOptions
+GlobalSearchObjectKind
+GlobalSearchObjectKindCriteria
+GlobalSearchObjectSortOptions
+GlobalSearchTextCriteria
+hasDataSet
+hasMaterial
+in
+searchGlobally
+setDataSet
+setEntityKind
+setEntityTypeId
+setMatchingField
+setMatchingText
+setMaterial
+setObjectId
+setRegistratorEmail
+withDataSetUsing
+withMaterial
+withMaterialUsing
+withObjectKind
+withText
-- 
GitLab