From 888f1141bcac6aaa64a275bd72332ddd5eb34946 Mon Sep 17 00:00:00 2001 From: Nikolaos Laskaris Date: Mon, 4 Dec 2017 12:20:21 +0200 Subject: [PATCH] fixed Created (date) issue on new DatasetProfiles - assigned global variable of ${com.fasterxml.jackson} on pom.xml --- dmp-backend/pom.xml | 11 ++++++----- .../src/main/java/entities/DatasetProfile.java | 2 +- .../src/main/java/rest/entities/DatasetProfiles.java | 4 ++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml index ee6b72f9a..b9a7f248a 100644 --- a/dmp-backend/pom.xml +++ b/dmp-backend/pom.xml @@ -17,6 +17,7 @@ 4.2.3.RELEASE 1.19.1 7.0.35 + 2.8.4 5.2.11.Final @@ -135,29 +136,29 @@ com.fasterxml.jackson.core jackson-annotations - 2.8.4 + ${com.fasterxml.jackson} com.fasterxml.jackson.core jackson-core - 2.8.4 + ${com.fasterxml.jackson} com.fasterxml.jackson.core jackson-databind - 2.8.4 + ${com.fasterxml.jackson} com.fasterxml.jackson.datatype jackson-datatype-hibernate5 - 2.8.4 + ${com.fasterxml.jackson} com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.9.0 + ${com.fasterxml.jackson} diff --git a/dmp-backend/src/main/java/entities/DatasetProfile.java b/dmp-backend/src/main/java/entities/DatasetProfile.java index d5a1d0ee8..5a0d0a69f 100644 --- a/dmp-backend/src/main/java/entities/DatasetProfile.java +++ b/dmp-backend/src/main/java/entities/DatasetProfile.java @@ -69,7 +69,7 @@ public class DatasetProfile implements Serializable { @Column(name = "\"Created\"") - private Date created = null; + private Date created; @Column(name = "\"Modified\"") private Date modified = new Date(); diff --git a/dmp-backend/src/main/java/rest/entities/DatasetProfiles.java b/dmp-backend/src/main/java/rest/entities/DatasetProfiles.java index 306979fc4..da1bd462e 100644 --- a/dmp-backend/src/main/java/rest/entities/DatasetProfiles.java +++ b/dmp-backend/src/main/java/rest/entities/DatasetProfiles.java @@ -1,5 +1,6 @@ package rest.entities; +import java.util.Date; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; @@ -114,6 +115,9 @@ public class DatasetProfiles { @RequestMapping(method = RequestMethod.POST, value = { "/datasetprofile/create" }, consumes = "application/json", produces="application/json") public @ResponseBody ResponseEntity createDatasetProfile(@RequestBody DatasetProfile datasetProfile) { + datasetProfile.setCreated(new Date()); + datasetProfile.setModified(new Date()); + DatasetProfileRuleset datasetprofileruleset = datasetProfile.getRuleset(); DatasetProfileViewstyle datasetprofileviewstyle = datasetProfile.getViewstyle();