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

Reorganizing classes

This commit is contained in:
Luca Frosini 2024-06-06 18:03:24 +02:00
parent 87c02997d0
commit 141cf6c19a
10 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyVariableDefinitionImpl.java → src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyVariableDefinitionImpl.java
View File

@ -1,10 +1,10 @@
package org.gcube.informationsystem.base.impl.properties;
package org.gcube.informationsystem.model.impl.properties;
import java.util.Objects;
import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
import org.gcube.informationsystem.base.reference.properties.PropertyVariableDefinition;
import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
import org.gcube.informationsystem.model.reference.properties.PropertyVariableDefinition;
/**
* @author Luca Frosini (ISTI - CNR)

5
src/main/java/org/gcube/informationsystem/base/impl/properties/PropertyVariableImpl.java → src/main/java/org/gcube/informationsystem/model/impl/properties/PropertyVariableImpl.java
View File

@ -1,4 +1,4 @@
package org.gcube.informationsystem.base.impl.properties;
package org.gcube.informationsystem.model.impl.properties;
import java.sql.Date;
import java.text.ParseException;
@ -12,8 +12,9 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.com.fasterxml.jackson.annotation.JsonProperty;
import org.gcube.com.fasterxml.jackson.annotation.JsonSetter;
import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.informationsystem.base.impl.properties.PropertyElementImpl;
import org.gcube.informationsystem.base.reference.Element;
import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
import org.gcube.informationsystem.types.PropertyTypeName;
import org.gcube.informationsystem.types.PropertyTypeName.BaseType;
import org.slf4j.Logger;

5
src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyVariable.java → src/main/java/org/gcube/informationsystem/model/reference/properties/PropertyVariable.java
View File

@ -1,8 +1,9 @@
package org.gcube.informationsystem.base.reference.properties;
package org.gcube.informationsystem.model.reference.properties;
import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.gcube.informationsystem.base.impl.properties.PropertyVariableImpl;
import org.gcube.informationsystem.base.reference.properties.PropertyElement;
import org.gcube.informationsystem.model.impl.properties.PropertyVariableImpl;
import org.gcube.informationsystem.types.annotations.ISProperty;
import org.gcube.informationsystem.types.reference.Change;
import org.gcube.informationsystem.types.reference.TypeMetadata;

4
src/main/java/org/gcube/informationsystem/base/reference/properties/PropertyVariableDefinition.java → src/main/java/org/gcube/informationsystem/model/reference/properties/PropertyVariableDefinition.java
View File

@ -1,8 +1,8 @@
package org.gcube.informationsystem.base.reference.properties;
package org.gcube.informationsystem.model.reference.properties;
import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.gcube.informationsystem.base.impl.properties.PropertyVariableDefinitionImpl;
import org.gcube.informationsystem.model.impl.properties.PropertyVariableDefinitionImpl;
import org.gcube.informationsystem.types.annotations.ISProperty;
import org.gcube.informationsystem.types.reference.Change;
import org.gcube.informationsystem.types.reference.TypeMetadata;

2
src/main/java/org/gcube/informationsystem/queries/templates/impl/properties/TemplateVariableImpl.java
View File

@ -5,7 +5,7 @@ package org.gcube.informationsystem.queries.templates.impl.properties;
import org.gcube.com.fasterxml.jackson.annotation.JsonInclude;
import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.informationsystem.base.impl.properties.PropertyVariableImpl;
import org.gcube.informationsystem.model.impl.properties.PropertyVariableImpl;
import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable;
import org.gcube.informationsystem.types.PropertyTypeName.BaseType;

2
src/main/java/org/gcube/informationsystem/queries/templates/reference/properties/TemplateVariable.java
View File

@ -1,7 +1,7 @@
package org.gcube.informationsystem.queries.templates.reference.properties;
import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
import org.gcube.informationsystem.queries.templates.impl.properties.TemplateVariableImpl;
import org.gcube.informationsystem.types.reference.Change;
import org.gcube.informationsystem.types.reference.Changelog;

6
src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyDefinitionImpl.java
View File

@ -4,9 +4,9 @@ import java.lang.reflect.Method;
import java.util.Objects;
import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.informationsystem.base.impl.properties.PropertyVariableDefinitionImpl;
import org.gcube.informationsystem.base.impl.properties.PropertyVariableImpl;
import org.gcube.informationsystem.base.reference.properties.PropertyVariableDefinition;
import org.gcube.informationsystem.model.impl.properties.PropertyVariableDefinitionImpl;
import org.gcube.informationsystem.model.impl.properties.PropertyVariableImpl;
import org.gcube.informationsystem.model.reference.properties.PropertyVariableDefinition;
import org.gcube.informationsystem.types.PropertyTypeName;
import org.gcube.informationsystem.types.PropertyTypeName.BaseType;
import org.gcube.informationsystem.types.annotations.ISProperty;

4
src/main/java/org/gcube/informationsystem/types/impl/properties/PropertyTypeImpl.java
View File

@ -8,8 +8,8 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore;
import org.gcube.com.fasterxml.jackson.annotation.JsonTypeName;
import org.gcube.informationsystem.base.reference.AccessType;
import org.gcube.informationsystem.base.reference.properties.PropertyElement;
import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
import org.gcube.informationsystem.base.reference.properties.PropertyVariableDefinition;
import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
import org.gcube.informationsystem.model.reference.properties.PropertyVariableDefinition;
import org.gcube.informationsystem.queries.templates.reference.properties.TemplateVariable;
import org.gcube.informationsystem.serialization.ElementMapper;
import org.gcube.informationsystem.types.impl.TypeImpl;

2
src/main/java/org/gcube/informationsystem/types/reference/properties/PropertyDefinition.java
View File

@ -2,7 +2,7 @@ package org.gcube.informationsystem.types.reference.properties;
import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.gcube.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.gcube.informationsystem.base.reference.properties.PropertyVariableDefinition;
import org.gcube.informationsystem.model.reference.properties.PropertyVariableDefinition;
import org.gcube.informationsystem.types.annotations.Final;
import org.gcube.informationsystem.types.impl.properties.PropertyDefinitionImpl;
import org.gcube.informationsystem.types.reference.Change;

2
src/test/java/org/gcube/informationsystem/types/SerializationTest.java
View File

@ -6,7 +6,6 @@ import org.gcube.informationsystem.base.reference.Element;
import org.gcube.informationsystem.base.reference.IdentifiableElement;
import org.gcube.informationsystem.base.reference.entities.EntityElement;
import org.gcube.informationsystem.base.reference.properties.PropertyElement;
import org.gcube.informationsystem.base.reference.properties.PropertyVariable;
import org.gcube.informationsystem.contexts.reference.entities.Context;
import org.gcube.informationsystem.contexts.reference.relations.IsParentOf;
import org.gcube.informationsystem.model.reference.entities.Entity;
@ -16,6 +15,7 @@ import org.gcube.informationsystem.model.reference.properties.Encrypted;
import org.gcube.informationsystem.model.reference.properties.Metadata;
import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
import org.gcube.informationsystem.model.reference.properties.Property;
import org.gcube.informationsystem.model.reference.properties.PropertyVariable;
import org.gcube.informationsystem.model.reference.relations.ConsistsOf;
import org.gcube.informationsystem.model.reference.relations.IsRelatedTo;
import org.gcube.informationsystem.model.reference.relations.Relation;