gCubeSystem
/
information-system-model
16
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Redesigning E/R instance definition

This commit is contained in:
Luca Frosini 2023-04-20 12:08:45 +02:00
parent 60ef7ae655
commit d170e1707d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/informationsystem/base/reference/IdentifiableElement.java
View File

@ -11,7 +11,7 @@ import org.gcube.informationsystem.model.reference.properties.Metadata;
*/
public interface IdentifiableElement extends Element {
public static final String UUID_PROPERTY = "@uuid";
public static final String UUID_PROPERTY = "uuid";
public static final String METADATA_PROPERTY = "@metadata";
public UUID getUUID();

13
src/test/java/org/gcube/informationsystem/model/impl/properties/PropagationConstraintTest.java
View File

@ -3,6 +3,7 @@ package org.gcube.informationsystem.model.impl.properties;
import java.util.Calendar;
import org.gcube.informationsystem.base.reference.Element;
import org.gcube.informationsystem.base.reference.IdentifiableElement;
import org.gcube.informationsystem.model.reference.entities.Facet;
import org.gcube.informationsystem.model.reference.entities.Resource;
import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
@ -129,15 +130,15 @@ public class PropagationConstraintTest {
"\"" + ConsistsOf.PROPAGATION_CONSTRAINT_PROPERTY + "\":"+ pcString + "," +
"\"" + ConsistsOf.METADATA_PROPERTY + "\": " + hString + "," +
"\"" + ConsistsOf.SOURCE_PROPERTY + "\":{" +
"\"@uuid\":\"4a971915-ca90-48cf-9975-63ee2dd28605\"," +
"\"@class\":\"MyEService\"," +
"\"@superClasses\":[\"EService\", \"Service\", \"Resource\"]," +
"\"" + IdentifiableElement.UUID_PROPERTY + "\":\"4a971915-ca90-48cf-9975-63ee2dd28605\"," +
"\"" + Element.CLASS_PROPERTY + "\":\"MyEService\"," +
"\"" + Element.SUPERCLASSES_PROPERTY + "\":[\"EService\", \"Service\", \"Resource\"]," +
"\"" + ConsistsOf.METADATA_PROPERTY + "\": " + hString +
"}," +
"\"" + ConsistsOf.TARGET_PROPERTY + "\":{" +
"\"@uuid\":\"3ace4bd0-e5cd-49a3-97a8-a0a9468ce6d4\"," +
"\"@class\":\"MySoftwareFacet\"," +
"\"@superClasses\":[\"SoftwareFacet\", \"Facet\"]," +
"\"" + IdentifiableElement.UUID_PROPERTY + "\":\"3ace4bd0-e5cd-49a3-97a8-a0a9468ce6d4\"," +
"\"" + Element.CLASS_PROPERTY + "\":\"MySoftwareFacet\"," +
"\"" + Element.SUPERCLASSES_PROPERTY + "\":[\"SoftwareFacet\", \"Facet\"]," +
"\"" + ConsistsOf.METADATA_PROPERTY + "\": " + hString + "," +
"\"name\":\"WhnManager\"," +
"\"group\":\"VREManagement\"," +