diff --git a/dmp-backend/.settings/org.eclipse.wst.common.component b/dmp-backend/.settings/org.eclipse.wst.common.component
index 676f4f5bc..9c7a1cfe1 100644
--- a/dmp-backend/.settings/org.eclipse.wst.common.component
+++ b/dmp-backend/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,6 @@
-
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index e4adb35eb..b48f387d6 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -143,10 +143,10 @@
- com.fasterxml.jackson.datatype
- jackson-datatype-hibernate5
- 2.8.4
-
+ com.fasterxml.jackson.datatype
+ jackson-datatype-hibernate5
+ 2.8.4
+
@@ -166,13 +166,22 @@
${org.apache.tomcat.tomcat-jdbc.version}
provided
-
+
+
junit
junit
${org.junit.version}
test
+
+
+ com.google.code.gson
+ gson
+ 2.8.2
+ test
+
+
diff --git a/dmp-backend/src/main/java/configs/WebConfiguration.java b/dmp-backend/src/main/java/configs/WebConfiguration.java
new file mode 100644
index 000000000..3f5245123
--- /dev/null
+++ b/dmp-backend/src/main/java/configs/WebConfiguration.java
@@ -0,0 +1,37 @@
+package configs;
+
+import java.util.List;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
+import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module.Feature;
+
+@Configuration
+@EnableWebMvc
+public class WebConfiguration extends WebMvcConfigurerAdapter {
+
+ @Override
+ public void configureMessageConverters(List> converters) {
+
+ Hibernate5Module module = new Hibernate5Module();
+ module.enable(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS);
+ ObjectMapper objectMapper = new ObjectMapper()
+// .setSerializationInclusion(Include.NON_NULL)
+// .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+ .registerModule(new Hibernate5Module())
+ ;
+
+ converters.add(new MappingJackson2HttpMessageConverter(objectMapper));
+
+ System.out.println("Using custom json serializer loaded with module Hibernate5Module");
+
+ }
+}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/entities/DMP.java b/dmp-backend/src/main/java/entities/DMP.java
index 951b95cf0..3f3bfab4f 100644
--- a/dmp-backend/src/main/java/entities/DMP.java
+++ b/dmp-backend/src/main/java/entities/DMP.java
@@ -35,9 +35,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
@Entity
@Table(name="\"DMP\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DMP implements Serializable {
@@ -64,7 +62,7 @@ public class DMP implements Serializable {
private Set dataset;
- @ManyToOne()
+ @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "\"Project\"")
private Project project;
@@ -73,7 +71,7 @@ public class DMP implements Serializable {
@Column(name = "\"ProfileData\"", columnDefinition = "xml", nullable = true)
private String profileData;
- @OneToOne(fetch = FetchType.LAZY)
+ @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "\"Profile\"")
private DMPProfile profile;
diff --git a/dmp-backend/src/main/java/entities/DMPOrganisation.java b/dmp-backend/src/main/java/entities/DMPOrganisation.java
index 5b3d7d69d..7f4c9a899 100644
--- a/dmp-backend/src/main/java/entities/DMPOrganisation.java
+++ b/dmp-backend/src/main/java/entities/DMPOrganisation.java
@@ -22,9 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DMPOrganisation\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DMPOrganisation implements Serializable {
diff --git a/dmp-backend/src/main/java/entities/DMPProfile.java b/dmp-backend/src/main/java/entities/DMPProfile.java
index fdf8354fc..012197425 100644
--- a/dmp-backend/src/main/java/entities/DMPProfile.java
+++ b/dmp-backend/src/main/java/entities/DMPProfile.java
@@ -2,14 +2,15 @@ package entities;
import java.io.Serializable;
+import java.util.Set;
import java.util.UUID;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.OneToMany;
import javax.persistence.OneToOne;
import javax.persistence.Table;
@@ -25,9 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DMPProfile\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DMPProfile implements Serializable {
private static final long serialVersionUID = 3213099144442689808L;
@@ -42,8 +41,8 @@ public class DMPProfile implements Serializable {
private UUID id;
- @OneToOne(fetch = FetchType.LAZY, mappedBy = "profile")
- private DMP dmp;
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "profile")
+ private Set dmps;
@Column(name = "\"Label\"")
@@ -77,15 +76,13 @@ public class DMPProfile implements Serializable {
this.definition = definition;
}
- public DMP getDmp() {
- return dmp;
+ public Set getDmps() {
+ return dmps;
}
- public void setDmp(DMP dmp) {
- this.dmp = dmp;
+ public void setDmps(Set dmps) {
+ this.dmps = dmps;
}
-
-
}
diff --git a/dmp-backend/src/main/java/entities/DMPResearcher.java b/dmp-backend/src/main/java/entities/DMPResearcher.java
index 5d17ee075..55b1fdd3c 100644
--- a/dmp-backend/src/main/java/entities/DMPResearcher.java
+++ b/dmp-backend/src/main/java/entities/DMPResearcher.java
@@ -22,9 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DMPResearcher\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DMPResearcher implements Serializable {
private static final long serialVersionUID = 135449857355252959L;
diff --git a/dmp-backend/src/main/java/entities/DataRepository.java b/dmp-backend/src/main/java/entities/DataRepository.java
index f46fb4fa4..4515498ea 100644
--- a/dmp-backend/src/main/java/entities/DataRepository.java
+++ b/dmp-backend/src/main/java/entities/DataRepository.java
@@ -26,9 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DataRepository\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DataRepository implements Serializable {
diff --git a/dmp-backend/src/main/java/entities/Dataset.java b/dmp-backend/src/main/java/entities/Dataset.java
index a1a519faa..3df2ec01f 100644
--- a/dmp-backend/src/main/java/entities/Dataset.java
+++ b/dmp-backend/src/main/java/entities/Dataset.java
@@ -30,14 +30,12 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity(name = "Dataset")
@Table(name="\"Dataset\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class Dataset implements Serializable {
private static final long serialVersionUID = 3575723814399553259L;
- public Dataset () {}
+ //public Dataset () {}
@Id
@@ -50,12 +48,12 @@ public class Dataset implements Serializable {
private String label;
- @ManyToOne(fetch = FetchType.LAZY)
+ @ManyToOne(fetch = FetchType.EAGER)
// @Cascade(value=org.hibernate.annotations.CascadeType.ALL)
@JoinColumn(name = "\"DMP\"", nullable = true)
private DMP dmp;
-
+
@Column(name = "\"Uri\"")
private String uri;
@@ -64,7 +62,7 @@ public class Dataset implements Serializable {
private String properties;
- @ManyToOne(fetch = FetchType.LAZY)
+ @ManyToOne(fetch = FetchType.EAGER)
//@Cascade(value=org.hibernate.annotations.CascadeType.ALL)
@JoinColumn(name = "\"Profile\"", nullable = true)
private DatasetProfile profile;
diff --git a/dmp-backend/src/main/java/entities/DatasetDataRepository.java b/dmp-backend/src/main/java/entities/DatasetDataRepository.java
index d625471d4..a98ee5645 100644
--- a/dmp-backend/src/main/java/entities/DatasetDataRepository.java
+++ b/dmp-backend/src/main/java/entities/DatasetDataRepository.java
@@ -22,9 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DatasetDataRepository\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DatasetDataRepository implements Serializable {
diff --git a/dmp-backend/src/main/java/entities/DatasetProfile.java b/dmp-backend/src/main/java/entities/DatasetProfile.java
index 346612149..535dd10b8 100644
--- a/dmp-backend/src/main/java/entities/DatasetProfile.java
+++ b/dmp-backend/src/main/java/entities/DatasetProfile.java
@@ -24,9 +24,7 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators;
@Entity
@Table(name="\"DatasetProfile\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DatasetProfile implements Serializable {
diff --git a/dmp-backend/src/main/java/entities/DatasetProfileRuleset.java b/dmp-backend/src/main/java/entities/DatasetProfileRuleset.java
index 40be7b1ba..ce239854c 100644
--- a/dmp-backend/src/main/java/entities/DatasetProfileRuleset.java
+++ b/dmp-backend/src/main/java/entities/DatasetProfileRuleset.java
@@ -27,9 +27,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DatasetProfileRuleset\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DatasetProfileRuleset implements Serializable {
private static final long serialVersionUID = 4249565129050898613L;
@@ -44,7 +42,7 @@ public class DatasetProfileRuleset implements Serializable {
private UUID id;
- @OneToOne(fetch = FetchType.EAGER, mappedBy = "ruleset")
+ @OneToOne(fetch = FetchType.LAZY, mappedBy = "ruleset")
private DatasetProfile datasetProfile;
diff --git a/dmp-backend/src/main/java/entities/DatasetProfileViewstyle.java b/dmp-backend/src/main/java/entities/DatasetProfileViewstyle.java
index 64011c2fc..feaf65d42 100644
--- a/dmp-backend/src/main/java/entities/DatasetProfileViewstyle.java
+++ b/dmp-backend/src/main/java/entities/DatasetProfileViewstyle.java
@@ -26,9 +26,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DatasetProfileViewstyle\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DatasetProfileViewstyle implements Serializable {
private static final long serialVersionUID = -3251295258160291468L;
@@ -43,7 +41,7 @@ public class DatasetProfileViewstyle implements Serializable {
private UUID id;
- @OneToOne(fetch = FetchType.EAGER, mappedBy = "viewstyle")
+ @OneToOne(fetch = FetchType.LAZY, mappedBy = "viewstyle")
private DatasetProfile datasetProfile;
@Column(name = "\"Label\"")
diff --git a/dmp-backend/src/main/java/entities/DatasetRegistry.java b/dmp-backend/src/main/java/entities/DatasetRegistry.java
index 58ba36446..3574ae8f5 100644
--- a/dmp-backend/src/main/java/entities/DatasetRegistry.java
+++ b/dmp-backend/src/main/java/entities/DatasetRegistry.java
@@ -22,9 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DatasetRegistry\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DatasetRegistry implements Serializable {
private static final long serialVersionUID = -5594183793725819187L;
diff --git a/dmp-backend/src/main/java/entities/DatasetService.java b/dmp-backend/src/main/java/entities/DatasetService.java
index f3ffd3fb1..e8267048c 100644
--- a/dmp-backend/src/main/java/entities/DatasetService.java
+++ b/dmp-backend/src/main/java/entities/DatasetService.java
@@ -22,9 +22,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"DatasetService\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class DatasetService implements Serializable {
private static final long serialVersionUID = 1469161193939096037L;
diff --git a/dmp-backend/src/main/java/entities/Organisation.java b/dmp-backend/src/main/java/entities/Organisation.java
index a720e32f2..1f1afae6f 100644
--- a/dmp-backend/src/main/java/entities/Organisation.java
+++ b/dmp-backend/src/main/java/entities/Organisation.java
@@ -28,9 +28,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"Organisation\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class Organisation implements Serializable {
diff --git a/dmp-backend/src/main/java/entities/Project.java b/dmp-backend/src/main/java/entities/Project.java
index 4d2c5a7ae..03d6fbe3a 100644
--- a/dmp-backend/src/main/java/entities/Project.java
+++ b/dmp-backend/src/main/java/entities/Project.java
@@ -32,8 +32,6 @@ import com.fasterxml.jackson.databind.SerializationFeature;
@Entity
@Table(name="\"Project\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class Project implements Serializable {
diff --git a/dmp-backend/src/main/java/entities/Registry.java b/dmp-backend/src/main/java/entities/Registry.java
index 3fff1a0df..28532f610 100644
--- a/dmp-backend/src/main/java/entities/Registry.java
+++ b/dmp-backend/src/main/java/entities/Registry.java
@@ -28,9 +28,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"Registry\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class Registry implements Serializable {
private static final long serialVersionUID = -277572262583178090L;
diff --git a/dmp-backend/src/main/java/entities/Researcher.java b/dmp-backend/src/main/java/entities/Researcher.java
index 1ef03aaa6..0cedb72a6 100644
--- a/dmp-backend/src/main/java/entities/Researcher.java
+++ b/dmp-backend/src/main/java/entities/Researcher.java
@@ -28,9 +28,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"Researcher\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class Researcher implements Serializable {
diff --git a/dmp-backend/src/main/java/entities/Service.java b/dmp-backend/src/main/java/entities/Service.java
index b69de373b..1474aa890 100644
--- a/dmp-backend/src/main/java/entities/Service.java
+++ b/dmp-backend/src/main/java/entities/Service.java
@@ -30,16 +30,12 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"Service\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class Service implements Serializable {
- private static final long serialVersionUID = 7243446610500174060L;
+ private static final long serialVersionUID = 163279108676904730L;
+
- public Service () {}
-
-
@Id
@GeneratedValue
@GenericGenerator(name = "uuid2", strategy = "uuid2")
@@ -65,7 +61,7 @@ public class Service implements Serializable {
private String definition;
- @OneToMany(fetch = FetchType.EAGER, cascade=CascadeType.ALL)
+ @OneToMany(fetch = FetchType.LAZY)
@JoinTable(name="\"DatasetService\"",
joinColumns={@JoinColumn(name="\"Service\"", referencedColumnName="\"ID\"")},
inverseJoinColumns={@JoinColumn(name="\"Dataset\"", referencedColumnName="\"ID\"")}
diff --git a/dmp-backend/src/main/java/entities/UserInfo.java b/dmp-backend/src/main/java/entities/UserInfo.java
index 945ef9392..99bc289a7 100644
--- a/dmp-backend/src/main/java/entities/UserInfo.java
+++ b/dmp-backend/src/main/java/entities/UserInfo.java
@@ -32,9 +32,7 @@ import entities.security.UserAuth;
@Entity
@Table(name="\"UserInfo\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class UserInfo implements Serializable{
private static final long serialVersionUID = 1225151430484658395L;
diff --git a/dmp-backend/src/main/java/entities/UserProject.java b/dmp-backend/src/main/java/entities/UserProject.java
index bbb0708a6..7c01c692b 100644
--- a/dmp-backend/src/main/java/entities/UserProject.java
+++ b/dmp-backend/src/main/java/entities/UserProject.java
@@ -20,9 +20,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"UserProject\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class UserProject implements Serializable{
private static final long serialVersionUID = -4467370784003784660L;
diff --git a/dmp-backend/src/main/java/entities/security/UserAuth.java b/dmp-backend/src/main/java/entities/security/UserAuth.java
index f8f7b2766..6051d9995 100644
--- a/dmp-backend/src/main/java/entities/security/UserAuth.java
+++ b/dmp-backend/src/main/java/entities/security/UserAuth.java
@@ -18,9 +18,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
@Entity
@Table(name="\"UserAuth\"")
-//@Proxy(lazy = false)
-//@JsonInclude(Include.NON_NULL)
-@JsonIdentityInfo(generator=ObjectIdGenerators.UUIDGenerator.class, property="id")
+@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id")
public class UserAuth {
@Id
diff --git a/dmp-backend/src/main/java/helpers/SerializerProvider.java b/dmp-backend/src/main/java/helpers/SerializerProvider.java
index be9380a19..ce27c02b6 100644
--- a/dmp-backend/src/main/java/helpers/SerializerProvider.java
+++ b/dmp-backend/src/main/java/helpers/SerializerProvider.java
@@ -2,18 +2,27 @@ package helpers;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
+import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module.Feature;
public class SerializerProvider {
- private static ObjectMapper objectMapper = new ObjectMapper()
-// .setSerializationInclusion(Include.NON_NULL)
-// .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
- .registerModule(new Hibernate5Module())
- ;
+ private static ObjectMapper objectMapper = null;
+ static {
+
+ Hibernate5Module module = new Hibernate5Module();
+ module.enable(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS);
+ objectMapper = new ObjectMapper()
+// .setSerializationInclusion(Include.NON_NULL)
+// .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+ .registerModule(new Hibernate5Module())
+ ;
+
+ }
+
public static ObjectMapper getJsonSerializer() {
return objectMapper;
}
diff --git a/dmp-backend/src/main/java/rest/entities/DMPs.java b/dmp-backend/src/main/java/rest/entities/DMPs.java
index 2f2fa668a..84da97f2b 100644
--- a/dmp-backend/src/main/java/rest/entities/DMPs.java
+++ b/dmp-backend/src/main/java/rest/entities/DMPs.java
@@ -134,6 +134,7 @@ public class DMPs {
}
catch(Exception ex) {
+ ex.printStackTrace();
return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR);
}
}
@@ -252,6 +253,20 @@ public class DMPs {
*/
+
+ @RequestMapping(method = RequestMethod.POST, value = { "/dmp/getdatasets" }, consumes = "application/json", produces="application/json")
+ public @ResponseBody ResponseEntity