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

Improved solution

This commit is contained in:
luca.frosini 2023-10-26 15:31:08 +02:00
parent d1d9ae4a4a
commit ff0c6aec9d
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/gcube/informationsystem/knowledge/ModelKnowledge.java
View File

@ -12,6 +12,7 @@ import java.util.Set;
import org.gcube.informationsystem.base.reference.AccessType; import org.gcube.informationsystem.base.reference.AccessType;
import org.gcube.informationsystem.base.reference.entities.EntityElement; import org.gcube.informationsystem.base.reference.entities.EntityElement;
import org.gcube.informationsystem.base.reference.relations.RelationElement;
import org.gcube.informationsystem.model.reference.entities.Facet; import org.gcube.informationsystem.model.reference.entities.Facet;
import org.gcube.informationsystem.model.reference.entities.Resource; import org.gcube.informationsystem.model.reference.entities.Resource;
import org.gcube.informationsystem.model.reference.relations.ConsistsOf; import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
@ -113,11 +114,16 @@ public class ModelKnowledge<T, NI extends NodeInformation<T>> {
} }
} }
protected void addMetadataUsage(T t) { protected void addEntityMetadataUsage(T t) {
Type type = TypeMapper.createTypeDefinition(EntityElement.class); Type type = TypeMapper.createTypeDefinition(EntityElement.class);
addPropertyUsage(t, type.getProperties()); addPropertyUsage(t, type.getProperties());
} }
protected void addRelationMetadataUsage(T t) {
Type type = TypeMapper.createTypeDefinition(RelationElement.class);
addPropertyUsage(t, type.getProperties());
}
protected void addPropagationConstraintUsage(T t) { protected void addPropagationConstraintUsage(T t) {
Type type = TypeMapper.createTypeDefinition(Relation.class); Type type = TypeMapper.createTypeDefinition(Relation.class);
addPropertyUsage(t, type.getProperties()); addPropertyUsage(t, type.getProperties());
@ -167,14 +173,18 @@ public class ModelKnowledge<T, NI extends NodeInformation<T>> {
* We want to have a reference to all Base type * We want to have a reference to all Base type
*/ */
if(typeName.compareTo(Resource.NAME)==0) { if(typeName.compareTo(Resource.NAME)==0) {
addMetadataUsage(t); addEntityMetadataUsage(t);
} }
break; break;
case FACET: case FACET:
FacetType facetType = (FacetType) t; FacetType facetType = (FacetType) t;
/*
* Metadata is defined in parent type i.e. EntityElement.
* We want to have a reference to all Base type
*/
if(typeName.compareTo(Facet.NAME)==0) { if(typeName.compareTo(Facet.NAME)==0) {
addMetadataUsage(t); addEntityMetadataUsage(t);
} }
addPropertyUsage(t, facetType.getProperties()); addPropertyUsage(t, facetType.getProperties());
@ -182,8 +192,12 @@ public class ModelKnowledge<T, NI extends NodeInformation<T>> {
case IS_RELATED_TO: case IS_RELATED_TO:
IsRelatedToType isRelatedToType = (IsRelatedToType) t; IsRelatedToType isRelatedToType = (IsRelatedToType) t;
/*
* Metadata is defined in parent type i.e. RelationElement.
* We want to have a reference to all Base type
*/
if(typeName.compareTo(IsRelatedTo.NAME)==0) { if(typeName.compareTo(IsRelatedTo.NAME)==0) {
addMetadataUsage(t); addRelationMetadataUsage(t);
addPropagationConstraintUsage(t); addPropagationConstraintUsage(t);
} }
addPropertyUsage(t, isRelatedToType.getProperties()); addPropertyUsage(t, isRelatedToType.getProperties());
@ -191,8 +205,12 @@ public class ModelKnowledge<T, NI extends NodeInformation<T>> {
case CONSISTS_OF: case CONSISTS_OF:
ConsistsOfType consistsOfType = (ConsistsOfType) t; ConsistsOfType consistsOfType = (ConsistsOfType) t;
/*
* Metadata is defined in parent type i.e. RelationElement.
* We want to have a reference to all Base type
*/
if(typeName.compareTo(ConsistsOf.NAME)==0) { if(typeName.compareTo(ConsistsOf.NAME)==0) {
addMetadataUsage(t); addRelationMetadataUsage(t);
addPropagationConstraintUsage(t); addPropagationConstraintUsage(t);
} }
addPropertyUsage(t, consistsOfType.getProperties()); addPropertyUsage(t, consistsOfType.getProperties());

4
src/test/java/org/gcube/informationsystem/knowledge/ModelKnowledgeTest.java
View File

@ -96,11 +96,11 @@ public class ModelKnowledgeTest{
if(type.getAccessType()!=AccessType.PROPERTY) { if(type.getAccessType()!=AccessType.PROPERTY) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<LinkedEntity> usage = (List<LinkedEntity>) usageKnowledge.getUsage(typeName); List<LinkedEntity> usage = (List<LinkedEntity>) usageKnowledge.getUsage(typeName);
logger.info("{}- {}{} {}", stringBuffer.toString(), typeName, level==0 ? " (ROOT) " : "", usage!=null ? "known usage from definitions " + usage : "No known usage from definitions"); logger.info("{}- {}{} {}", stringBuffer.toString(), typeName, level==0 ? " (ROOT) " : "", usage!=null ? "known static usage " + usage : "No known static usage");
}else { }else {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
List<Map.Entry<String,PropertyDefinition>> usage = (List<Entry<String, PropertyDefinition>>) usageKnowledge.getUsage(typeName); List<Map.Entry<String,PropertyDefinition>> usage = (List<Entry<String, PropertyDefinition>>) usageKnowledge.getUsage(typeName);
logger.info("{}- {}{} {}", stringBuffer.toString(), typeName, level==0 ? " (ROOT) " : "", usage!=null ? "known usage from definitions " + usage : "No known usage from definitions"); logger.info("{}- {}{} {}", stringBuffer.toString(), typeName, level==0 ? " (ROOT) " : "", usage!=null ? "known static usage " + usage : "No known static usage");
} }
} }
}); });