diff --git a/pom.xml b/pom.xml
index fd6996f..abd8dc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,12 +51,7 @@
1.14.8
-
- javax.json
- javax.json-api
- 1.1
-
-
+
@@ -68,13 +63,7 @@
4.11
-
-
- org.glassfish
- javax.json
- 1.1
- test
-
+
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/BasicJSONObject.java b/src/main/java/org/gcube/application/geoportal/common/model/BasicJSONObject.java
index ed6e9b3..3ba4e81 100644
--- a/src/main/java/org/gcube/application/geoportal/common/model/BasicJSONObject.java
+++ b/src/main/java/org/gcube/application/geoportal/common/model/BasicJSONObject.java
@@ -1,149 +1,7 @@
package org.gcube.application.geoportal.common.model;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
+public class BasicJSONObject {
-import javax.json.JsonArray;
-import javax.json.JsonNumber;
-import javax.json.JsonObject;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@AllArgsConstructor
-@NoArgsConstructor
-public class BasicJSONObject implements JsonObject {
-
- @Getter
- private JsonObject theObject;
- public String toJson() {
- return getTheObject().toString();
- }
-
-
- @Override
- public int size() {
- return getTheObject().size();
- }
-
- @Override
- public boolean isEmpty() {
- return getTheObject().isEmpty();
- }
-
- @Override
- public boolean containsKey(Object key) {
- return getTheObject().containsKey(key);
- }
-
- @Override
- public boolean containsValue(Object value) {
- return getTheObject().containsValue(value);
- }
-
- @Override
- public JsonValue get(Object key) {
- return getTheObject().get(key);
- }
-
- @Override
- public JsonValue put(String key, JsonValue value) {
- return getTheObject().put(key, value);
- }
-
- @Override
- public JsonValue remove(Object key) {
- return getTheObject().remove(key);
- }
-
- @Override
- public void putAll(Map extends String, ? extends JsonValue> m) {
- getTheObject().putAll(m);
- }
-
- @Override
- public void clear() {
- getTheObject().clear();
- }
-
- @Override
- public Set keySet() {
- return getTheObject().keySet();
- }
-
- @Override
- public Collection values() {
- return getTheObject().values();
- }
-
- @Override
- public Set> entrySet() {
- return getTheObject().entrySet();
- }
-
- @Override
- public JsonArray getJsonArray(String name) {
- return getTheObject().getJsonArray(name);
- }
-
- @Override
- public JsonObject getJsonObject(String name) {
- return getTheObject().getJsonObject(name);
- }
-
- @Override
- public JsonNumber getJsonNumber(String name) {
- return getTheObject().getJsonNumber(name);
- }
-
- @Override
- public JsonString getJsonString(String name) {
- return getTheObject().getJsonString(name);
- }
-
- @Override
- public String getString(String name) {
- return getTheObject().getString(name);
- }
-
- @Override
- public String getString(String name, String defaultValue) {
- return getTheObject().getString(name, defaultValue);
- }
-
- @Override
- public int getInt(String name) {
- return getTheObject().getInt(name);
- }
-
- @Override
- public int getInt(String name, int defaultValue) {
- return getTheObject().getInt(name, defaultValue);
- }
-
- @Override
- public boolean getBoolean(String name) {
- return getTheObject().getBoolean(name);
- }
-
- @Override
- public boolean getBoolean(String name, boolean defaultValue) {
- return getTheObject().getBoolean(name, defaultValue);
- }
-
- @Override
- public boolean isNull(String name) {
- return getTheObject().isNull(name);
- }
-
- @Override
- public ValueType getValueType() {
- return getTheObject().getValueType();
- }
}
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/profile/DefaultCompiler.java b/src/main/java/org/gcube/application/geoportal/common/model/profile/DefaultCompiler.java
index 43a4caf..019f08a 100644
--- a/src/main/java/org/gcube/application/geoportal/common/model/profile/DefaultCompiler.java
+++ b/src/main/java/org/gcube/application/geoportal/common/model/profile/DefaultCompiler.java
@@ -1,14 +1,7 @@
package org.gcube.application.geoportal.common.model.profile;
-import javax.json.JsonObject;
+public class DefaultCompiler {
-import org.gcube.application.geoportal.common.model.BasicJSONObject;
-
-public class DefaultCompiler extends BasicJSONObject{
-
- public DefaultCompiler(JsonObject theObject) {
- super(theObject);
- // TODO Auto-generated constructor stub
- }
+
}
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/profile/Field.java b/src/main/java/org/gcube/application/geoportal/common/model/profile/Field.java
index 36a375e..dd59a37 100644
--- a/src/main/java/org/gcube/application/geoportal/common/model/profile/Field.java
+++ b/src/main/java/org/gcube/application/geoportal/common/model/profile/Field.java
@@ -1,18 +1,10 @@
package org.gcube.application.geoportal.common.model.profile;
-import javax.json.JsonObject;
-
-import org.gcube.application.geoportal.common.model.BasicJSONObject;
-
import lombok.Getter;
@Getter
-public class Field extends BasicJSONObject{
+public class Field {
- public Field(JsonObject theObject) {
- super(theObject);
- // TODO Auto-generated constructor stub
- }
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/profile/FieldMapping.java b/src/main/java/org/gcube/application/geoportal/common/model/profile/FieldMapping.java
index b8cfb3e..be913ee 100644
--- a/src/main/java/org/gcube/application/geoportal/common/model/profile/FieldMapping.java
+++ b/src/main/java/org/gcube/application/geoportal/common/model/profile/FieldMapping.java
@@ -1,14 +1,7 @@
package org.gcube.application.geoportal.common.model.profile;
-import javax.json.JsonObject;
+public class FieldMapping {
-import org.gcube.application.geoportal.common.model.BasicJSONObject;
-
-public class FieldMapping extends BasicJSONObject {
-
- public FieldMapping(JsonObject theObject) {
- super(theObject);
- // TODO Auto-generated constructor stub
- }
+
}
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/profile/IndexDefinition.java b/src/main/java/org/gcube/application/geoportal/common/model/profile/IndexDefinition.java
index 8d8cd0c..67ee4dd 100644
--- a/src/main/java/org/gcube/application/geoportal/common/model/profile/IndexDefinition.java
+++ b/src/main/java/org/gcube/application/geoportal/common/model/profile/IndexDefinition.java
@@ -1,15 +1,7 @@
package org.gcube.application.geoportal.common.model.profile;
-import javax.json.JsonObject;
+public class IndexDefinition {
-import org.gcube.application.geoportal.common.model.BasicJSONObject;
-
-public class IndexDefinition extends BasicJSONObject {
-
- public IndexDefinition(JsonObject theObject) {
- super(theObject);
- // TODO Auto-generated constructor stub
- }
}
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/profile/IsoMapper.java b/src/main/java/org/gcube/application/geoportal/common/model/profile/IsoMapper.java
index 54a7739..1cbd4b8 100644
--- a/src/main/java/org/gcube/application/geoportal/common/model/profile/IsoMapper.java
+++ b/src/main/java/org/gcube/application/geoportal/common/model/profile/IsoMapper.java
@@ -1,15 +1,7 @@
package org.gcube.application.geoportal.common.model.profile;
-import javax.json.JsonObject;
-
-import org.gcube.application.geoportal.common.model.BasicJSONObject;
-
-public class IsoMapper extends BasicJSONObject{
-
- public IsoMapper(JsonObject theObject) {
- super(theObject);
- // TODO Auto-generated constructor stub
- }
+public class IsoMapper {
+ private String className;
}
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/profile/Profile.java b/src/main/java/org/gcube/application/geoportal/common/model/profile/Profile.java
index 4a11367..258c5ab 100644
--- a/src/main/java/org/gcube/application/geoportal/common/model/profile/Profile.java
+++ b/src/main/java/org/gcube/application/geoportal/common/model/profile/Profile.java
@@ -2,40 +2,16 @@ package org.gcube.application.geoportal.common.model.profile;
import java.util.List;
-import javax.json.JsonObject;
-
-import org.gcube.application.geoportal.common.faults.JsonParseException;
-import org.gcube.application.geoportal.common.model.BasicJSONObject;
+import javax.xml.bind.annotation.XmlRootElement;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor
-public class Profile extends BasicJSONObject{
+@XmlRootElement
+public class Profile{
-
-
- public Profile(JsonObject theObject) throws JsonParseException {
- super(theObject);
- name=theObject.getString("name");
- id=theObject.getString("_id");
-// JsonArray jsonFields=theObject.getJsonArray("fields");
-// if(jsonFields==null)
-// fields=null;
-// else {
-// fields=new ArrayList();
-// for(int i= 0; i fields;
diff --git a/src/main/java/org/gcube/application/geoportal/common/model/profile/Serialization.java b/src/main/java/org/gcube/application/geoportal/common/model/profile/Serialization.java
deleted file mode 100644
index 774c793..0000000
--- a/src/main/java/org/gcube/application/geoportal/common/model/profile/Serialization.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.gcube.application.geoportal.common.model.profile;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-
-import org.gcube.application.geoportal.common.faults.JsonParseException;
-import org.gcube.application.geoportal.common.model.BasicJSONObject;
-
-public class Serialization {
-
-
- public static ArrayList asArray(JsonArray array,Class clazz) throws JsonParseException{
- try {
- ArrayList toReturn=new ArrayList();
- if(array!=null)
- for(int i=0;i0);
diff --git a/src/test/resources/Concessione.json b/src/test/resources/Concessione.json
new file mode 100644
index 0000000..cb62c34
--- /dev/null
+++ b/src/test/resources/Concessione.json
@@ -0,0 +1 @@
+{"id":13,"recordType":"CONCESSIONE","version":"1.0.0","licenzaID":"CC-BY","policy":"OPEN","nome":"Italia, forse","folderId":null,"lastUpdateTime":[2020,11,19,18,48,36,32000000],"lastUpdateUser":"NO NAME","creationTime":[2020,11,19,18,48,36,32000000],"creationUser":"NO NAME","introduzione":"This is my project","descrizioneContenuto":"It contains this and that","authors":["Some one","Some, oneelse"],"contributore":"Contrib 1","titolari":["Some one","Some, oneelse"],"responsabile":"Someone","editore":"Editore","fontiFinanziamento":["Big pharma","Pentagon"],"soggetto":["Research Excavation","Archeology"],"risorseCorrelate":[],"dataInizioProgetto":[2020,11,19,18,48,17,994000000],"dataFineProgetto":[2020,11,19,18,48,18,3000000],"titolareLicenza":"Qualcun altro","titolareCopyright":"Chiedilo in giro","paroleChiaveLibere":["Robba","Stuff"],"paroleChiaveICCD":["vattelapesca","somthing something"],"centroidLat":43.0,"centroidLong":9.0,"relazioneScavo":null,"immaginiRappresentative":[],"posizionamentoScavo":null,"pianteFineScavo":[],"genericContent":[]}
\ No newline at end of file