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

Renamed ENUM constant from old name EMBEDDED to the new one PROPERTY

This commit is contained in:
Luca Frosini 2019-10-16 12:40:28 +02:00
parent 2463f14105
commit 63c7f60666
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/gcube/informationsystem/types/Type.java
View File

@ -65,13 +65,13 @@ public class Type {
BYNARY("Bynary", 8),
EMBEDDED("Embedded", 9),
PROPERTY("Property", 9),
EMBEDDEDLIST("Embedded List", 10),
PROPERTYLIST("Property List", 10),
EMBEDDEDSET("Embedded Set", 11),
PROPERTYSET("Property Set", 11),
EMBEDDEDMAP("Embedded Map", 12),
PROPERTYMAP("Property Map", 12),
BYTE("Byte", 17),
@ -126,13 +126,13 @@ public class Type {
TYPES_BY_CLASS.put(Character.class, OType.STRING);
TYPES_BY_CLASS.put(Character.TYPE, OType.STRING);
TYPES_BY_CLASS.put(Property.class, OType.EMBEDDED);
TYPES_BY_CLASS.put(Property.class, OType.PROPERTY);
TYPES_BY_CLASS.put(List.class, OType.EMBEDDEDLIST);
TYPES_BY_CLASS.put(List.class, OType.PROPERTYLIST);
TYPES_BY_CLASS.put(Set.class, OType.EMBEDDEDSET);
TYPES_BY_CLASS.put(Set.class, OType.PROPERTYSET);
TYPES_BY_CLASS.put(Map.class, OType.EMBEDDEDMAP);
TYPES_BY_CLASS.put(Map.class, OType.PROPERTYMAP);
TYPES_BY_CLASS.put(Byte.TYPE, OType.BYTE);
TYPES_BY_CLASS.put(Byte.class, OType.BYTE);

2
src/main/java/org/gcube/informationsystem/types/TypeBinder.java
View File

@ -204,7 +204,7 @@ public class TypeBinder {
logger.trace("Looking for property type {}", method.getReturnType());
@SuppressWarnings("unchecked")
Class<? extends ISManageable> type = (Class<? extends ISManageable>) method.getReturnType();
propertyDefinition.type = OType.EMBEDDED.getIntValue();
propertyDefinition.type = OType.PROPERTY.getIntValue();
if(Property.class.isAssignableFrom(type)){
if(type != Property.class){