MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

change queryable dependencies

This commit is contained in:
Efstratios Giannopoulos 2023-11-14 16:27:46 +02:00
parent 0e1408e532
commit e103f40763
44 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-backend/core/pom.xml
View File

@ -15,12 +15,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>dmp-backend</groupId>
<artifactId>queryable</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>

2
dmp-backend/core/src/main/java/eu/eudat/data/CredentialEntity.java
View File

@ -7,7 +7,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.converters.enums.ProviderTypeConverter;
import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;
import java.util.List;

2
dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java
View File

@ -7,7 +7,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.converters.enums.DescriptionStatusConverter;
import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;

2
dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java
View File

@ -5,7 +5,7 @@ import eu.eudat.commons.enums.DescriptionTemplateStatus;
import eu.eudat.commons.enums.IsActive;
import eu.eudat.data.converters.enums.DescriptionTemplateStatusConverter;
import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.time.Instant;

2
dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java
View File

@ -5,7 +5,7 @@ import eu.eudat.commons.enums.UserDescriptionTemplateRole;
import eu.eudat.data.converters.enums.IsActiveConverter;
import eu.eudat.data.converters.enums.UserDescriptionTemplateRoleConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.time.Instant;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Content.java
View File

@ -1,7 +1,7 @@
package eu.eudat.data.old;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.List;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java
View File

@ -5,7 +5,7 @@ import eu.eudat.data.DescriptionEntity;
import eu.eudat.data.DmpBlueprintEntity;
import eu.eudat.data.EntityDoiEntity;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.*;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java
View File

@ -1,7 +1,7 @@
package eu.eudat.data.old;
import eu.eudat.data.DescriptionTemplateEntity;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.List;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/DataRepository.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.old;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.io.Serializable;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java
View File

@ -1,7 +1,7 @@
package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;

3
dmp-backend/core/src/main/java/eu/eudat/data/old/ExternalDataset.java
View File

@ -2,12 +2,11 @@ package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.UUID;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java
View File

@ -1,6 +1,6 @@
package eu.eudat.data.old;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java
View File

@ -3,7 +3,7 @@ package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.*;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Invitation.java
View File

@ -1,7 +1,7 @@
package eu.eudat.data.old;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.List;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java
View File

@ -4,7 +4,7 @@ import eu.eudat.commons.enums.old.notification.ActiveStatus;
import eu.eudat.commons.enums.old.notification.ContactType;
import eu.eudat.commons.enums.old.notification.NotificationType;
import eu.eudat.commons.enums.old.notification.NotifyState;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Organisation.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.io.Serializable;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Project.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.*;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Registry.java
View File

@ -4,7 +4,7 @@ package eu.eudat.data.old;
import eu.eudat.data.DescriptionEntity;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/Researcher.java
View File

@ -3,7 +3,7 @@ package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;

3
dmp-backend/core/src/main/java/eu/eudat/data/old/Service.java
View File

@ -2,12 +2,11 @@ package eu.eudat.data.old;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.UUID;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/UserDMP.java
View File

@ -1,7 +1,7 @@
package eu.eudat.data.old;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.LinkedList;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/UserInfo.java
View File

@ -3,7 +3,7 @@ package eu.eudat.data.old;
import eu.eudat.data.CredentialEntity;
import eu.eudat.data.converters.DateToUTCConverter;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.*;

2
dmp-backend/core/src/main/java/eu/eudat/data/old/UserRole.java
View File

@ -1,7 +1,7 @@
package eu.eudat.data.old;
import eu.eudat.data.old.helpers.EntityBinder;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import jakarta.persistence.*;
import java.util.List;

2
dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java → dmp-backend/core/src/main/java/eu/eudat/data/old/queryableentity/DataEntity.java
View File

@ -1,4 +1,4 @@
package eu.eudat.queryable.queryableentity;
package eu.eudat.data.old.queryableentity;
import jakarta.persistence.Tuple;
import java.util.List;

2
dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccess.java
View File

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

2
dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccessLayer.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.dao;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import javax.management.InvalidApplicationException;
import java.util.concurrent.CompletableFuture;

3
dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/context/DatabaseContext.java
View File

@ -2,9 +2,8 @@ package eu.eudat.data.dao.databaselayer.context;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.jpa.hibernatequeryablelist.QueryableHibernateList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;

2
dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/service/DatabaseService.java
View File

@ -3,7 +3,7 @@ package eu.eudat.data.dao.databaselayer.service;
import eu.eudat.data.dao.databaselayer.context.DatabaseContext;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

2
dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java
View File

@ -4,7 +4,7 @@ import eu.eudat.data.query.definition.TableQuery;
import eu.eudat.data.query.definition.helpers.ColumnOrderings;
import eu.eudat.data.query.definition.helpers.Ordering;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import java.util.Arrays;
import java.util.Collection;

2
dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Collector.java
View File

@ -1,7 +1,7 @@
package eu.eudat.data.query.definition;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
/**
* Created by ikalyvas on 3/21/2018.

2
dmp-backend/data/src/main/java/eu/eudat/data/query/definition/CriteriaQuery.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.query.definition;
import eu.eudat.data.dao.criteria.Criteria;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
/**
* Created by ikalyvas on 3/21/2018.

2
dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Query.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.query.definition;
import eu.eudat.data.dao.criteria.Criteria;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import io.swagger.annotations.ApiModelProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableCriteriaQuery.java
View File

@ -2,7 +2,7 @@ package eu.eudat.data.query.definition;
import eu.eudat.data.dao.criteria.Criteria;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
/**
* Created by ikalyvas on 3/21/2018.

2
dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableQuery.java
View File

@ -5,7 +5,7 @@ import eu.eudat.data.dao.criteria.Criteria;
import eu.eudat.data.query.definition.helpers.ColumnOrderings;
import eu.eudat.data.query.definition.helpers.SelectionFields;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import io.swagger.annotations.ApiModelProperty;

2
dmp-backend/data/src/main/java/eu/eudat/query/Query.java
View File

@ -2,7 +2,7 @@ package eu.eudat.query;
import eu.eudat.data.dao.DatabaseAccessLayer;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import javax.management.InvalidApplicationException;
import java.util.LinkedList;

7
dmp-backend/queryable/pom.xml
View File

@ -14,4 +14,11 @@
<artifactId>dmp-backend</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>eu.eudat</groupId>
<artifactId>core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

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

@ -1,7 +1,7 @@
package eu.eudat.queryable;
import eu.eudat.data.old.queryableentity.DataEntity;
import eu.eudat.queryable.jpa.predicates.*;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.queryable.types.SelectionField;
import jakarta.persistence.criteria.Join;

2
dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/hibernatequeryablelist/QueryableHibernateList.java
View File

@ -1,11 +1,11 @@
package eu.eudat.queryable.jpa.hibernatequeryablelist;
import com.fasterxml.jackson.databind.ObjectMapper;
import eu.eudat.data.old.queryableentity.DataEntity;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.collector.Collector;
import eu.eudat.queryable.exceptions.NotSingleResultException;
import eu.eudat.queryable.jpa.predicates.*;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.queryable.types.FieldSelectionType;
import eu.eudat.queryable.types.SelectionField;
import jakarta.persistence.EntityManager;

2
dmp-backend/web/src/main/java/eu/eudat/logic/managers/PaginationManager.java
View File

@ -4,7 +4,7 @@ import eu.eudat.data.query.definition.TableQuery;
import eu.eudat.data.query.definition.helpers.ColumnOrderings;
import eu.eudat.data.query.definition.helpers.Ordering;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import java.util.Arrays;
import java.util.Collection;

2
dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java
View File

@ -1,7 +1,7 @@
package eu.eudat.models;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
public interface DataModel<T extends DataEntity, M extends DataModel> {
M fromDataModel(T entity);

2
dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java
View File

@ -3,7 +3,7 @@ package eu.eudat.models.data.dashboard.recent.model;
import eu.eudat.models.DataModel;
import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
import eu.eudat.models.data.listingmodels.UserInfoListingModel;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
import java.util.Date;
import java.util.List;

2
dmp-backend/web/src/main/java/eu/eudat/models/data/urls/UrlListing.java
View File

@ -1,6 +1,6 @@
package eu.eudat.models.data.urls;
import eu.eudat.models.DataModel;
import eu.eudat.queryable.queryableentity.DataEntity;
import eu.eudat.data.old.queryableentity.DataEntity;
/**
* Created by ikalyvas on 3/19/2018.