gCubeSystem
/
resource-registry
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved and optimized set and list management 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@147138 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2017-04-26 09:40:34 +00:00
parent 583c63797a
commit bcd0d7c457
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/org/gcube/informationsystem/resourceregistry/er/ERManagement.java
View File

@ -61,7 +61,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.JsonNodeType; import com.fasterxml.jackson.databind.node.JsonNodeType;
import com.orientechnologies.orient.core.db.record.OTrackedList;
import com.orientechnologies.orient.core.metadata.OMetadata; import com.orientechnologies.orient.core.metadata.OMetadata;
import com.orientechnologies.orient.core.metadata.schema.OClass; import com.orientechnologies.orient.core.metadata.schema.OClass;
import com.orientechnologies.orient.core.metadata.schema.OProperty; import com.orientechnologies.orient.core.metadata.schema.OProperty;
@ -635,16 +634,19 @@ public abstract class ERManagement<ERType extends ER, El extends Element> {
return EmbeddedMangement.getEmbeddedType(value); return EmbeddedMangement.getEmbeddedType(value);
case ARRAY: case ARRAY:
List<Object> array = new ArrayList<>(); //ODocument oDocument = new ODocument();
//return oDocument.fromJSON("{ \"ARRAY\" : " + value.toString() + "}");
List<Object> list = new ArrayList<Object>();
Iterator<JsonNode> arrayElement = value.elements(); Iterator<JsonNode> arrayElement = value.elements();
while (arrayElement.hasNext()) { while (arrayElement.hasNext()) {
JsonNode arrayNode = arrayElement.next(); JsonNode arrayNode = arrayElement.next();
Object objectNode = getObjectFromElement(arrayNode); Object objectNode = getObjectFromElement(arrayNode);
if (objectNode != null) { if (objectNode != null) {
array.add(objectNode); list.add(objectNode);
} }
} }
return array; return list;
case BINARY: case BINARY:
break; break;
@ -767,7 +769,12 @@ public abstract class ERManagement<ERType extends ER, El extends Element> {
set = true; set = true;
} }
if(object instanceof ArrayList){ if(object instanceof Set){
((OrientElement) element).setProperty(key, object, OType.EMBEDDEDSET);
set = true;
}
if(object instanceof List){
((OrientElement) element).setProperty(key, object, OType.EMBEDDEDLIST); ((OrientElement) element).setProperty(key, object, OType.EMBEDDEDLIST);
set = true; set = true;
} }
@ -854,11 +861,10 @@ public abstract class ERManagement<ERType extends ER, El extends Element> {
return dateFormat.format((Date) object); return dateFormat.format((Date) object);
} }
if(object instanceof OTrackedList){ if(object instanceof Collection){
OTrackedList<?> oTrackedList = (OTrackedList<?>) object; Collection<?> collection = (Collection<?>) object;
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
for(Object o : oTrackedList){ for(Object o : collection){
Object obj = getPropertyForJson("PLACEHOLDER", o); Object obj = getPropertyForJson("PLACEHOLDER", o);
jsonArray.put(obj); jsonArray.put(obj);
} }
@ -866,17 +872,6 @@ public abstract class ERManagement<ERType extends ER, El extends Element> {
return jsonArray; return jsonArray;
} }
if(object instanceof ArrayList){
@SuppressWarnings("rawtypes")
ArrayList arrayList = (ArrayList) object;
JSONArray jsonArray = new JSONArray();
for(Object o : arrayList){
Object obj = getPropertyForJson("PLACEHOLDER", o);
jsonArray.put(obj);
}
return jsonArray;
}
return object.toString(); return object.toString();

13
src/test/java/org/gcube/informationsystem/resourceregistry/er/ERManagementTest.java
View File

@ -96,8 +96,21 @@ public class ERManagementTest extends ScopedTest {
ServiceStateFacet serviceStateFacet = new ServiceStateFacetImpl(); ServiceStateFacet serviceStateFacet = new ServiceStateFacetImpl();
serviceStateFacet.setValue("ready"); serviceStateFacet.setValue("ready");
List<Map<String, String>> list = new ArrayList<>();
Map<String, String> map1 = new HashMap<String, String>();
map1.put("Key1", "Value1");
Map<String, String> map2 = new HashMap<String, String>();
map2.put("Key2", "Value2");
list.add(map1);
list.add(map2);
serviceStateFacet.setAdditionalProperty("MY-TEST", list);
eService.addFacet(serviceStateFacet); eService.addFacet(serviceStateFacet);
LicenseFacet licenseFacet = new LicenseFacetImpl(); LicenseFacet licenseFacet = new LicenseFacetImpl();
licenseFacet.setName("EUPL"); licenseFacet.setName("EUPL");
licenseFacet licenseFacet