no message

.gitignore

@@ -19,3 +19,4 @@ dmp-backend/src/main/ui-resources/static/favicon.ico
 dmp-backend/src/main/ui-resources/static/assets/lang/en.json
 dmp-frontend/new  3.xml
 dmp-backend/src/main/ui-resources/static/
+dmp-backend/web/target/

dmp-backend/pom.xml

@@ -2,15 +2,21 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>dmp-backend</groupId>
+    <groupId>eu.eudat</groupId>
     <artifactId>dmp-backend</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>${packaging.type}</packaging>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>1.5.9.RELEASE</version>
     </parent>
+
+    <modules>
+        <module>queryable</module>
+        <module>web</module>
+    </modules>
+
     <properties>
         <project.http.version>1.19.0</project.http.version>
         <project.oauth.version>1.19.0</project.oauth.version>

dmp-backend/queryable/pom.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dmp-backend</groupId>
+    <artifactId>queryable</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>eu.eudat</groupId>
+        <artifactId>dmp-backend</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+</project>

dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java

@@ -1,11 +1,7 @@
 package eu.eudat.queryable;
 
-
+import eu.eudat.queryable.predicates.*;
-import eu.eudat.entities.DataEntity;
+import eu.eudat.queryable.queryableentity.DataEntity;
-import eu.eudat.queryable.predicates.NestedQuerySinglePredicate;
-import eu.eudat.queryable.predicates.OrderByPredicate;
-import eu.eudat.queryable.predicates.SelectPredicate;
-import eu.eudat.queryable.predicates.SinglePredicate;
 import eu.eudat.queryable.types.SelectionField;
 
 import javax.persistence.criteria.Subquery;

dmp-backend/queryable/src/main/java/eu/eudat/queryable/hibernatequeryablelist/QueryableHibernateList.java

@@ -1,13 +1,9 @@
 package eu.eudat.queryable.hibernatequeryablelist;
 
-
-import eu.eudat.entities.DataEntity;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.exceptions.NotSingleResultException;
-import eu.eudat.queryable.predicates.NestedQuerySinglePredicate;
+import eu.eudat.queryable.predicates.*;
-import eu.eudat.queryable.predicates.OrderByPredicate;
+import eu.eudat.queryable.queryableentity.DataEntity;
-import eu.eudat.queryable.predicates.SelectPredicate;
-import eu.eudat.queryable.predicates.SinglePredicate;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
 

dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.queryable.queryableentity;
 
 public interface DataEntity<T,K> {
     void update(T entity);

dmp-backend/web/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dmp-backend</groupId>
+    <artifactId>web</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>eu.eudat</groupId>
+        <artifactId>dmp-backend</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>dmp-backend</groupId>
+            <artifactId>queryable</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java

@@ -1,14 +1,11 @@
 package eu.eudat;
 
-import eu.eudat.services.helpers.FileStorageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.web.context.WebApplicationContext;
 
 @SpringBootApplication
 public class EuDatApplication extends SpringBootServletInitializer {

dmp-backend/web/src/main/java/eu/eudat/builders/Builder.java

@@ -1,7 +1,5 @@
 package eu.eudat.builders;
 
-import eu.eudat.builders.helpers.BuilderApplier;
-
 /**
  * Created by ikalyvas on 2/15/2018.
  */

dmp-backend/web/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java

@@ -5,7 +5,6 @@ import eu.eudat.builders.model.criteria.DataRepositoryCriteriaBuilder;
 import eu.eudat.builders.model.criteria.ExternalDatasetCriteriaBuilder;
 import eu.eudat.builders.model.criteria.RegistryCriteriaBuilder;
 import eu.eudat.builders.model.models.*;
-import eu.eudat.models.dashboard.recent.RecentActivityData;
 import org.springframework.stereotype.Service;
 
 /**

dmp-backend/web/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java

@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.models.helpers.common.DataTableData;
 
 import java.util.List;

dmp-backend/web/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java

@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.models.security.Principal;
 import eu.eudat.types.Authorities;
 

dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java

@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.entities.UserInfo;
 import eu.eudat.models.dmp.DataManagementPlan;
 import eu.eudat.models.project.Project;

dmp-backend/web/src/main/java/eu/eudat/builders/model/models/RecentActivityDataBuilder.java

@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.models.dashboard.recent.RecentActivityData;
 
 import java.util.Date;

dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ResearcherBuilder.java

@@ -1,7 +1,6 @@
 package eu.eudat.builders.model.models;
 
 import eu.eudat.builders.Builder;
-import eu.eudat.builders.helpers.BuilderApplier;
 import eu.eudat.models.dmp.Researcher;
 
 /**

dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java

@@ -4,8 +4,6 @@ import eu.eudat.controllers.interceptors.RequestInterceptor;
 import eu.eudat.handlers.PrincipalArgumentResolver;
 import eu.eudat.services.ApiContext;
 import eu.eudat.services.operations.AuthenticationService;
-import eu.eudat.services.operations.AuthenticationServiceImpl;
-import eu.eudat.types.WarningLevel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;

dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java

@@ -1,13 +1,10 @@
 package eu.eudat.controllers;
 
 import eu.eudat.exceptions.security.UnauthorisedException;
-import eu.eudat.managers.ProjectManager;
 import eu.eudat.managers.ResearcherManager;
-import eu.eudat.models.criteria.ResearcherCriteria;
 import eu.eudat.models.dmp.Researcher;
 import eu.eudat.models.external.ResearchersExternalSourcesModel;
 import eu.eudat.models.helpers.responses.ResponseItem;
-import eu.eudat.models.project.ProjectCriteriaRequest;
 import eu.eudat.models.researcher.ResearcherCriteriaRequest;
 import eu.eudat.models.security.Principal;
 import eu.eudat.proxy.config.exceptions.HugeResultSet;

dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java

@@ -1,7 +1,7 @@
 package eu.eudat.dao;
 
 import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.DataEntity;
+import eu.eudat.queryable.queryableentity.DataEntity;
 
 
 public class DatabaseAccess<T extends DataEntity> {

dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java

@@ -1,9 +1,8 @@
 package eu.eudat.dao;
 
 
-import eu.eudat.entities.DataEntity;
-import eu.eudat.entities.Dataset;
 import eu.eudat.queryable.QueryableList;
+import eu.eudat.queryable.queryableentity.DataEntity;
 
 import java.util.concurrent.CompletableFuture;
 

dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java

@@ -1,8 +1,8 @@
 package eu.eudat.dao.databaselayer.context;
 
-import eu.eudat.entities.DataEntity;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.hibernatequeryablelist.QueryableHibernateList;
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;

dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java

@@ -2,8 +2,8 @@ package eu.eudat.dao.databaselayer.service;
 
 
 import eu.eudat.dao.databaselayer.context.DatabaseContext;
-import eu.eudat.entities.DataEntity;
 import eu.eudat.queryable.QueryableList;
+import eu.eudat.queryable.queryableentity.DataEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java

@@ -7,7 +7,6 @@ import eu.eudat.models.criteria.DatasetCriteria;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 
 public interface DatasetDao extends DatabaseAccessLayer<Dataset, UUID> {