From c302a012607511e9cdbcc46b68b6b937c460d861 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Mon, 7 Dec 2015 17:12:17 +0000
Subject: [PATCH] SSDM-2783 : V3 AS API - package structure
SVN: 35237
---
.../objectWithNameThatExistsOnlyInV3.json | 2 +-
.../generic/shared/api/v3/json/GenericObjectMapperTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/common/json/AbstractGenericObjectMapperTestResources/objectWithNameThatExistsOnlyInV3.json b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/common/json/AbstractGenericObjectMapperTestResources/objectWithNameThatExistsOnlyInV3.json
index a79a8f1b5df..4fb6fddf02b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/common/json/AbstractGenericObjectMapperTestResources/objectWithNameThatExistsOnlyInV3.json
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/common/json/AbstractGenericObjectMapperTestResources/objectWithNameThatExistsOnlyInV3.json
@@ -1,4 +1,4 @@
{
- "@type" : "dto.id.sample.SamplePermId",
+ "@type" : "dto.sample.id.SamplePermId",
"permId" : "TEST_PERM_ID"
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v3/json/GenericObjectMapperTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v3/json/GenericObjectMapperTest.java
index 649dd16356a..50d12c1d4db 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v3/json/GenericObjectMapperTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v3/json/GenericObjectMapperTest.java
@@ -46,7 +46,7 @@ public class GenericObjectMapperTest extends AbstractGenericObjectMapperTest
public void testObjectWithNameThatExistsOnlyInV3IsDeserializedAsV3() throws Exception
{
SamplePermId permId = deserialize("objectWithNameThatExistsOnlyInV3.json");
- Assert.assertEquals("ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.sample.SamplePermId", permId.getClass().getName());
+ Assert.assertEquals("ch.ethz.sis.openbis.generic.as.api.v3.dto.sample.id.SamplePermId", permId.getClass().getName());
Assert.assertEquals("TEST_PERM_ID", permId.getPermId());
}
--
GitLab