From b8356e3d804ea56be78e200a2a0cc0f9af8cdfdd Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Mon, 18 Jun 2012 12:35:47 +0000
Subject: [PATCH] SP-111 / BIS-49: JSON-RPC - properly handle circular
 dependencies

SVN: 25760
---
 .../cisd/common/api/server/json/JsonDeserializationTest.java   | 1 +
 .../cisd/common/api/server/json/JsonSerializationTest.java     | 1 +
 .../json/{ => object}/ObjectWithNestedMapsInMapFactory.java    | 3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/{ => object}/ObjectWithNestedMapsInMapFactory.java (94%)

diff --git a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonDeserializationTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonDeserializationTest.java
index 8ccbca07479..2589b2254c5 100644
--- a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonDeserializationTest.java
+++ b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonDeserializationTest.java
@@ -45,6 +45,7 @@ import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInList
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypes;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypes.ObjectNested;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypes.ObjectNestedChild;
+import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInMapFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypesFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithPrimitiveTypes;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithPrimitiveTypesFactory;
diff --git a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonSerializationTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonSerializationTest.java
index 764187d692f..cc8addf70c2 100644
--- a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonSerializationTest.java
+++ b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/JsonSerializationTest.java
@@ -31,6 +31,7 @@ import ch.systemsx.cisd.common.api.server.json.object.ObjectWithEnumTypesFactory
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithIgnoredPropertiesFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInCollectionFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInListFactory;
+import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedMapsInMapFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithNestedTypesFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithPrimitiveTypesFactory;
 import ch.systemsx.cisd.common.api.server.json.object.ObjectWithPrivateAccessFactory;
diff --git a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/ObjectWithNestedMapsInMapFactory.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
similarity index 94%
rename from openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/ObjectWithNestedMapsInMapFactory.java
rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
index 575774c3a75..907d0a1a8a0 100644
--- a/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/ObjectWithNestedMapsInMapFactory.java
+++ b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/api/server/json/object/ObjectWithNestedMapsInMapFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common.api.server.json;
+package ch.systemsx.cisd.common.api.server.json.object;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,6 @@ import java.util.Map;
 import ch.systemsx.cisd.common.api.server.json.common.ObjectCounter;
 import ch.systemsx.cisd.common.api.server.json.common.ObjectFactory;
 import ch.systemsx.cisd.common.api.server.json.common.ObjectType;
-import ch.systemsx.cisd.common.api.server.json.object.ObjectWithContainerTypesFactory;
 
 /**
  * @author pkupczyk
-- 
GitLab