diff --git a/dmp-backend/.settings/org.eclipse.core.resources.prefs b/dmp-backend/.settings/org.eclipse.core.resources.prefs
index 5b781ec6d..2b763404c 100644
--- a/dmp-backend/.settings/org.eclipse.core.resources.prefs
+++ b/dmp-backend/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 7c979186d..0da532fe2 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -55,7 +55,10 @@
20160810
-
+
+ org.springframework.boot
+ spring-boot-devtools
+
org.hibernate
hibernate-core
diff --git a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
index ffb9c7edc..39f2c2410 100644
--- a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
+++ b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java
@@ -9,6 +9,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class EuDatApplication {
public static void main(String[] args) {
+ System.setProperty("spring.devtools.restart.enabled", "true");
SpringApplication.run(EuDatApplication.class, args);
}
}
diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/DatabaseConfiguration.java b/dmp-backend/src/main/java/eu/eudat/configurations/DatabaseConfiguration.java
index e85734f30..1d0b57f82 100644
--- a/dmp-backend/src/main/java/eu/eudat/configurations/DatabaseConfiguration.java
+++ b/dmp-backend/src/main/java/eu/eudat/configurations/DatabaseConfiguration.java
@@ -67,6 +67,7 @@ public class DatabaseConfiguration {
Properties properties = new Properties();
properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL92Dialect");
properties.setProperty("hibernate.show_sql", "true");
+ properties.setProperty("hibernate.temp.use_jdbc_metadata_defaults","false");
return properties;
}
}
\ No newline at end of file
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java
index c3bb6508e..7fedf775a 100644
--- a/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java
+++ b/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java
@@ -8,6 +8,12 @@ import eu.eudat.entities.DMP;
import eu.eudat.entities.Dataset;
import eu.eudat.entities.DatasetProfile;
import eu.eudat.entities.UserInfo;
+import eu.eudat.managers.DatasetManager;
+import eu.eudat.managers.ProjectManager;
+import eu.eudat.models.dataset.DatasetTableRequest;
+import eu.eudat.models.helpers.DataTableData;
+import eu.eudat.models.project.Project;
+import eu.eudat.models.project.ProjectTableRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -57,8 +63,37 @@ public class Datasets {
@Autowired private ResearcherDao researcherDao;
@Autowired private ServiceDao serviceDao;
@Autowired private UserInfoDao userInfoDao;
-
-
+
+
+
+
+ @RequestMapping(method = RequestMethod.POST, value = { "/datasets/getPaged" }, consumes = "application/json", produces="application/json")
+ public @ResponseBody ResponseEntity> getPaged(@RequestBody DatasetTableRequest datasetTableRequest) {
+ try {
+ DataTableData dataTable = new DatasetManager().getPaged(datasetDao, datasetTableRequest);
+ return ResponseEntity.status(HttpStatus.OK).body(dataTable);
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
+ }
+ }
+
+ @RequestMapping(method = RequestMethod.GET, value = { "/datasets/getSingle/{id}" }, produces="application/json")
+ public @ResponseBody ResponseEntity getPaged(@PathVariable String id) {
+ try {
+ eu.eudat.models.dataset.Dataset dataset = new DatasetManager().getSingle(datasetDao, id);
+ return ResponseEntity.status(HttpStatus.OK).body(dataset);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
+ }
+ }
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+
// FETCH BY DATASET(S)
diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Users.java b/dmp-backend/src/main/java/eu/eudat/controllers/Users.java
index 34effad1e..0cdc9e7e4 100644
--- a/dmp-backend/src/main/java/eu/eudat/controllers/Users.java
+++ b/dmp-backend/src/main/java/eu/eudat/controllers/Users.java
@@ -75,21 +75,22 @@ public class Users {
@RequestMapping(method = RequestMethod.GET, value = { "/user/whoami" }, produces="application/json;charset=UTF-8")
- public @ResponseBody ResponseEntity