hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CST-5587] Moved org.dspace.app.orcid and org.dspace.app.profile into org.dspace.orcid and org.dspace.profile

Browse Source
This commit is contained in:
Luca Giamminonni
2022-06-20 16:02:01 +02:00
parent 3e82a766d7
commit 680e96fda3
112 changed files with 455 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
View File

@@ -23,19 +23,19 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.client.OrcidConfiguration;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.eperson.service.EPersonService;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.client.OrcidConfiguration;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.profile.ResearcherProfile;
import org.dspace.profile.service.ResearcherProfileService;
import org.dspace.services.ConfigurationService;
import org.orcid.jaxb.model.v3.release.record.Email;
import org.orcid.jaxb.model.v3.release.record.Person;

18
dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
View File

@@ -27,15 +27,6 @@ import java.util.stream.Stream;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.util.AuthorizeUtil;
import org.dspace.authorize.AuthorizeConfiguration;
import org.dspace.authorize.AuthorizeException;
@@ -67,6 +58,15 @@ import org.dspace.harvest.HarvestedItem;
import org.dspace.harvest.service.HarvestedItemService;
import org.dspace.identifier.IdentifierException;
import org.dspace.identifier.service.IdentifierService;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.profile.service.ResearcherProfileService;
import org.dspace.services.ConfigurationService;
import org.dspace.versioning.service.VersioningService;
import org.dspace.workflow.WorkflowItemService;

2
dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
View File

@@ -25,7 +25,6 @@ import org.apache.commons.codec.DecoderException;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.factory.AuthorizeServiceFactory;
import org.dspace.authorize.service.AuthorizeService;
@@ -47,6 +46,7 @@ import org.dspace.eperson.service.EPersonService;
import org.dspace.eperson.service.GroupService;
import org.dspace.eperson.service.SubscribeService;
import org.dspace.event.Event;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.util.UUIDUtils;
import org.dspace.versioning.Version;
import org.dspace.versioning.VersionHistory;

2
dspace-api/src/main/java/org/dspace/app/orcid/OrcidHistory.java → dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid;
package org.dspace.orcid;
import java.util.Date;
import javax.persistence.Column;

2
dspace-api/src/main/java/org/dspace/app/orcid/OrcidOperation.java → dspace-api/src/main/java/org/dspace/orcid/OrcidOperation.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid;
package org.dspace.orcid;
/**
* Enum that models an ORCID synchronization operation.

2
dspace-api/src/main/java/org/dspace/app/orcid/OrcidQueue.java → dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid;
package org.dspace.orcid;
import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;

2
dspace-api/src/main/java/org/dspace/app/orcid/OrcidToken.java → dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid;
package org.dspace.orcid;
import javax.persistence.Column;
import javax.persistence.Entity;

6
dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidClient.java → dspace-api/src/main/java/org/dspace/orcid/client/OrcidClient.java
View File

@@ -5,10 +5,10 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.client;
package org.dspace.orcid.client;
import org.dspace.app.orcid.exception.OrcidClientException;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.orcid.exception.OrcidClientException;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.orcid.jaxb.model.v3.release.record.Person;
/**

10
dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidClientImpl.java → dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.client;
package org.dspace.orcid.client;
import static org.apache.http.client.methods.RequestBuilder.delete;
import static org.apache.http.client.methods.RequestBuilder.get;
@@ -41,10 +41,10 @@ import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.dspace.app.orcid.exception.OrcidClientException;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.orcid.exception.OrcidClientException;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.dspace.util.ThrowingSupplier;
import org.orcid.jaxb.model.v3.release.record.Address;
import org.orcid.jaxb.model.v3.release.record.Funding;

2
dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidConfiguration.java → dspace-api/src/main/java/org/dspace/orcid/client/OrcidConfiguration.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.client;
package org.dspace.orcid.client;
import org.apache.commons.lang3.StringUtils;

2
dspace-api/src/main/java/org/dspace/app/orcid/client/OrcidResponse.java → dspace-api/src/main/java/org/dspace/orcid/client/OrcidResponse.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.client;
package org.dspace.orcid.client;
import org.apache.http.HttpStatus;

24
dspace-api/src/main/java/org/dspace/app/orcid/consumer/OrcidQueueConsumer.java → dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.consumer;
package org.dspace.orcid.consumer;
import static java.util.Arrays.asList;
import static java.util.Comparator.comparing;
@@ -22,17 +22,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidOperation;
import org.dspace.app.orcid.factory.OrcidServiceFactory;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.content.DSpaceObject;
import org.dspace.content.Item;
import org.dspace.content.MetadataFieldName;
@@ -43,6 +32,17 @@ import org.dspace.content.service.RelationshipService;
import org.dspace.core.Context;
import org.dspace.event.Consumer;
import org.dspace.event.Event;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidOperation;
import org.dspace.orcid.factory.OrcidServiceFactory;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.dspace.services.ConfigurationService;
import org.dspace.services.factory.DSpaceServicesFactory;
import org.slf4j.Logger;

4
dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidHistoryDAO.java → dspace-api/src/main/java/org/dspace/orcid/dao/OrcidHistoryDAO.java
View File

@@ -5,16 +5,16 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.dao;
package org.dspace.orcid.dao;
import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.core.GenericDAO;
import org.dspace.orcid.OrcidHistory;
/**
* Database Access Object interface class for the OrcidHistory object. The

4
dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidQueueDAO.java → dspace-api/src/main/java/org/dspace/orcid/dao/OrcidQueueDAO.java
View File

@@ -5,16 +5,16 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.dao;
package org.dspace.orcid.dao;
import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.core.GenericDAO;
import org.dspace.orcid.OrcidQueue;
/**
* Database Access Object interface class for the OrcidQueue object. The

4
dspace-api/src/main/java/org/dspace/app/orcid/dao/OrcidTokenDAO.java → dspace-api/src/main/java/org/dspace/orcid/dao/OrcidTokenDAO.java
View File

@@ -5,13 +5,13 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.dao;
package org.dspace.orcid.dao;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.core.GenericDAO;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidToken;
/**
* Database Access Object interface class for the OrcidToken object. The

6
dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidHistoryDAOImpl.java → dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
View File

@@ -5,18 +5,18 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.dao.impl;
package org.dspace.orcid.dao.impl;
import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import javax.persistence.Query;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.dao.OrcidHistoryDAO;
import org.dspace.content.Item;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.dao.OrcidHistoryDAO;
/**
* Implementation of {@link OrcidHistoryDAO}.

6
dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidQueueDAOImpl.java → dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
View File

@@ -5,18 +5,18 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.dao.impl;
package org.dspace.orcid.dao.impl;
import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import javax.persistence.Query;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.dao.OrcidQueueDAO;
import org.dspace.content.Item;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.dao.OrcidQueueDAO;
/**
* Implementation of {@link OrcidQueueDAO}.

6
dspace-api/src/main/java/org/dspace/app/orcid/dao/impl/OrcidTokenDAOImpl.java → dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
View File

@@ -5,17 +5,17 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.dao.impl;
package org.dspace.orcid.dao.impl;
import java.sql.SQLException;
import javax.persistence.Query;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.dao.OrcidTokenDAO;
import org.dspace.content.Item;
import org.dspace.core.AbstractHibernateDAO;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.dao.OrcidTokenDAO;
/**
* Implementation of {@link OrcidTokenDAO}.

2
dspace-api/src/main/java/org/dspace/app/orcid/exception/OrcidClientException.java → dspace-api/src/main/java/org/dspace/orcid/exception/OrcidClientException.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.exception;
package org.dspace.orcid.exception;
/**
* Exception throwable from class that implements {@link OrcidClient} in case of

4
dspace-api/src/main/java/org/dspace/app/orcid/exception/OrcidValidationException.java → dspace-api/src/main/java/org/dspace/orcid/exception/OrcidValidationException.java
View File

@@ -5,12 +5,12 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.exception;
package org.dspace.orcid.exception;
import java.util.List;
import java.util.stream.Collectors;
import org.dspace.app.orcid.model.validator.OrcidValidationError;
import org.dspace.orcid.model.validator.OrcidValidationError;
/**
* A Runtime exception that occurs when an ORCID object that must be send to

20
dspace-api/src/main/java/org/dspace/app/orcid/factory/OrcidServiceFactory.java → dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactory.java
View File

@@ -5,17 +5,17 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.factory;
package org.dspace.orcid.factory;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.client.OrcidConfiguration;
import org.dspace.app.orcid.service.MetadataSignatureGenerator;
import org.dspace.app.orcid.service.OrcidEntityFactoryService;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.client.OrcidConfiguration;
import org.dspace.orcid.service.MetadataSignatureGenerator;
import org.dspace.orcid.service.OrcidEntityFactoryService;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.services.factory.DSpaceServicesFactory;
/**

20
dspace-api/src/main/java/org/dspace/app/orcid/factory/OrcidServiceFactoryImpl.java → dspace-api/src/main/java/org/dspace/orcid/factory/OrcidServiceFactoryImpl.java
View File

@@ -5,17 +5,17 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.factory;
package org.dspace.orcid.factory;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.client.OrcidConfiguration;
import org.dspace.app.orcid.service.MetadataSignatureGenerator;
import org.dspace.app.orcid.service.OrcidEntityFactoryService;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.client.OrcidConfiguration;
import org.dspace.orcid.service.MetadataSignatureGenerator;
import org.dspace.orcid.service.OrcidEntityFactoryService;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.orcid.service.OrcidTokenService;
import org.springframework.beans.factory.annotation.Autowired;
/**

2
dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidEntityType.java → dspace-api/src/main/java/org/dspace/orcid/model/OrcidEntityType.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model;
package org.dspace.orcid.model;
import java.util.Arrays;

6
dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidFundingFieldMapping.java → dspace-api/src/main/java/org/dspace/orcid/model/OrcidFundingFieldMapping.java
View File

@@ -5,18 +5,18 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model;
package org.dspace.orcid.model;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toMap;
import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.dspace.app.orcid.model.factory.OrcidFactoryUtils;
import org.dspace.orcid.model.factory.OrcidFactoryUtils;
import org.dspace.util.SimpleMapConverter;
import org.orcid.jaxb.model.common.FundingContributorRole;

2
dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidProfileSectionType.java → dspace-api/src/main/java/org/dspace/orcid/model/OrcidProfileSectionType.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model;
package org.dspace.orcid.model;
import org.apache.commons.lang3.EnumUtils;

2
dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidTokenResponseDTO.java → dspace-api/src/main/java/org/dspace/orcid/model/OrcidTokenResponseDTO.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model;
package org.dspace.orcid.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;

4
dspace-api/src/main/java/org/dspace/app/orcid/model/OrcidWorkFieldMapping.java → dspace-api/src/main/java/org/dspace/orcid/model/OrcidWorkFieldMapping.java
View File

@@ -5,11 +5,11 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model;
package org.dspace.orcid.model;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toMap;
import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
import java.util.Arrays;
import java.util.HashMap;

4
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidCommonObjectFactory.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
View File

@@ -5,14 +5,14 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory;
package org.dspace.orcid.model.factory;
import java.util.Optional;
import org.dspace.app.orcid.exception.OrcidValidationException;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.core.Context;
import org.dspace.orcid.exception.OrcidValidationException;
import org.orcid.jaxb.model.common.ContributorRole;
import org.orcid.jaxb.model.common.FundingContributorRole;
import org.orcid.jaxb.model.v3.release.common.Contributor;

4
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidEntityFactory.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidEntityFactory.java
View File

@@ -5,11 +5,11 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory;
package org.dspace.orcid.model.factory;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidEntityType;
import org.orcid.jaxb.model.v3.release.record.Activity;
/**

2
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidFactoryUtils.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidFactoryUtils.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory;
package org.dspace.orcid.model.factory;
import java.util.HashMap;
import java.util.Map;

6
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/OrcidProfileSectionFactory.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidProfileSectionFactory.java
View File

@@ -5,15 +5,15 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory;
package org.dspace.orcid.model.factory;
import java.util.List;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.profile.OrcidProfileSyncPreference;
/**
* Interface for classes that creates ORCID profile section object.

12
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/AbstractOrcidProfileSectionFactory.java
View File

@@ -5,20 +5,20 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory.impl;
package org.dspace.orcid.model.factory.impl;
import static java.lang.String.format;
import java.util.List;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.orcid.model.factory.OrcidCommonObjectFactory;
import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.app.orcid.service.MetadataSignatureGenerator;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.content.service.ItemService;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.orcid.service.MetadataSignatureGenerator;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.springframework.beans.factory.annotation.Autowired;
/**

12
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory.impl;
package org.dspace.orcid.model.factory.impl;
import static java.util.Optional.empty;
import static java.util.Optional.of;
@@ -13,7 +13,7 @@ import static java.util.Optional.ofNullable;
import static org.apache.commons.lang3.EnumUtils.isValidEnum;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
import static org.orcid.jaxb.model.common.SequenceType.ADDITIONAL;
import static org.orcid.jaxb.model.common.SequenceType.FIRST;
@@ -25,16 +25,16 @@ import java.util.Map;
import java.util.Optional;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.orcid.client.OrcidConfiguration;
import org.dspace.app.orcid.exception.OrcidValidationException;
import org.dspace.app.orcid.model.factory.OrcidCommonObjectFactory;
import org.dspace.app.orcid.model.validator.OrcidValidationError;
import org.dspace.content.Item;
import org.dspace.content.MetadataFieldName;
import org.dspace.content.MetadataValue;
import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.handle.service.HandleService;
import org.dspace.orcid.client.OrcidConfiguration;
import org.dspace.orcid.exception.OrcidValidationException;
import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
import org.dspace.orcid.model.validator.OrcidValidationError;
import org.dspace.util.MultiFormatDateParser;
import org.dspace.util.SimpleMapConverter;
import org.orcid.jaxb.model.common.ContributorRole;

10
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidFundingFactory.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory.impl;
package org.dspace.orcid.model.factory.impl;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -18,10 +18,6 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.model.OrcidFundingFieldMapping;
import org.dspace.app.orcid.model.factory.OrcidCommonObjectFactory;
import org.dspace.app.orcid.model.factory.OrcidEntityFactory;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.content.Relationship;
@@ -30,6 +26,10 @@ import org.dspace.content.service.ItemService;
import org.dspace.content.service.RelationshipService;
import org.dspace.content.service.RelationshipTypeService;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.model.OrcidFundingFieldMapping;
import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
import org.dspace.orcid.model.factory.OrcidEntityFactory;
import org.orcid.jaxb.model.common.FundingContributorRole;
import org.orcid.jaxb.model.common.FundingType;
import org.orcid.jaxb.model.v3.release.common.Amount;

10
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidPersonExternalIdentifierFactory.java
View File

@@ -5,20 +5,20 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory.impl;
package org.dspace.orcid.model.factory.impl;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
import static org.dspace.app.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
import static org.dspace.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
import static org.dspace.orcid.model.factory.OrcidFactoryUtils.parseConfigurations;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.content.MetadataValue;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.orcid.jaxb.model.common.Relationship;
import org.orcid.jaxb.model.v3.release.common.Url;
import org.orcid.jaxb.model.v3.release.record.PersonExternalIdentifier;

14
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidSimpleValueObjectFactory.java
View File

@@ -5,25 +5,25 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory.impl;
package org.dspace.orcid.model.factory.impl;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.COUNTRY;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.KEYWORDS;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
import static org.dspace.orcid.model.OrcidProfileSectionType.COUNTRY;
import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
import static org.dspace.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
import static org.dspace.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.orcid.jaxb.model.v3.release.common.Country;
import org.orcid.jaxb.model.v3.release.common.Url;
import org.orcid.jaxb.model.v3.release.record.Address;

10
dspace-api/src/main/java/org/dspace/app/orcid/model/factory/impl/OrcidWorkFactory.java → dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.factory.impl;
package org.dspace.orcid.model.factory.impl;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -19,14 +19,14 @@ import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.commons.lang3.EnumUtils;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.model.OrcidWorkFieldMapping;
import org.dspace.app.orcid.model.factory.OrcidCommonObjectFactory;
import org.dspace.app.orcid.model.factory.OrcidEntityFactory;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.model.OrcidWorkFieldMapping;
import org.dspace.orcid.model.factory.OrcidCommonObjectFactory;
import org.dspace.orcid.model.factory.OrcidEntityFactory;
import org.orcid.jaxb.model.common.ContributorRole;
import org.orcid.jaxb.model.common.LanguageCode;
import org.orcid.jaxb.model.common.Relationship;

2
dspace-api/src/main/java/org/dspace/app/orcid/model/validator/OrcidValidationError.java → dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidationError.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.validator;
package org.dspace.orcid.model.validator;
/**
* Enum that model all the errors that could occurs during an ORCID object

2
dspace-api/src/main/java/org/dspace/app/orcid/model/validator/OrcidValidator.java → dspace-api/src/main/java/org/dspace/orcid/model/validator/OrcidValidator.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.validator;
package org.dspace.orcid.model.validator;
import java.util.List;

34
dspace-api/src/main/java/org/dspace/app/orcid/model/validator/impl/OrcidValidatorImpl.java → dspace-api/src/main/java/org/dspace/orcid/model/validator/impl/OrcidValidatorImpl.java
View File

@@ -5,32 +5,32 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.validator.impl;
package org.dspace.orcid.model.validator.impl;
import static org.apache.commons.collections.CollectionUtils.isEmpty;
import static org.apache.commons.lang3.ArrayUtils.contains;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
import static org.dspace.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.dspace.app.orcid.model.validator.OrcidValidationError;
import org.dspace.app.orcid.model.validator.OrcidValidator;
import org.dspace.orcid.model.validator.OrcidValidationError;
import org.dspace.orcid.model.validator.OrcidValidator;
import org.dspace.services.ConfigurationService;
import org.orcid.jaxb.model.v3.release.common.DisambiguatedOrganization;
import org.orcid.jaxb.model.v3.release.common.Organization;

22
dspace-api/src/main/java/org/dspace/app/orcid/script/OrcidBulkPush.java → dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
View File

@@ -5,11 +5,11 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.script;
package org.dspace.orcid.script;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import static org.dspace.app.profile.OrcidSynchronizationMode.BATCH;
import static org.dspace.app.profile.OrcidSynchronizationMode.MANUAL;
import static org.dspace.profile.OrcidSynchronizationMode.BATCH;
import static org.dspace.profile.OrcidSynchronizationMode.MANUAL;
import java.sql.SQLException;
import java.util.HashMap;
@@ -20,18 +20,18 @@ import java.util.stream.Collectors;
import org.apache.commons.cli.ParseException;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.exception.OrcidValidationException;
import org.dspace.app.orcid.factory.OrcidServiceFactory;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.profile.OrcidSynchronizationMode;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.factory.EPersonServiceFactory;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.exception.OrcidValidationException;
import org.dspace.orcid.factory.OrcidServiceFactory;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.profile.OrcidSynchronizationMode;
import org.dspace.scripts.DSpaceRunnable;
import org.dspace.services.ConfigurationService;
import org.dspace.services.factory.DSpaceServicesFactory;

2
dspace-api/src/main/java/org/dspace/app/orcid/script/OrcidBulkPushScriptConfiguration.java → dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPushScriptConfiguration.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.script;
package org.dspace.orcid.script;
import java.sql.SQLException;

2
dspace-api/src/main/java/org/dspace/app/orcid/service/MetadataSignatureGenerator.java → dspace-api/src/main/java/org/dspace/orcid/service/MetadataSignatureGenerator.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import java.util.List;

2
dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidEntityFactoryService.java → dspace-api/src/main/java/org/dspace/orcid/service/OrcidEntityFactoryService.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import org.dspace.content.Item;
import org.dspace.core.Context;

8
dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidHistoryService.java → dspace-api/src/main/java/org/dspace/orcid/service/OrcidHistoryService.java
View File

@@ -5,18 +5,18 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.exception.OrcidValidationException;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.exception.OrcidValidationException;
/**
* Interface of service to manage OrcidHistory.

8
dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidProfileSectionFactoryService.java → dspace-api/src/main/java/org/dspace/orcid/service/OrcidProfileSectionFactoryService.java
View File

@@ -5,16 +5,16 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import java.util.List;
import java.util.Optional;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.content.MetadataValue;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.profile.OrcidProfileSyncPreference;
/**
* Interface that mark classes that handle the configured instance of

8
dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidQueueService.java → dspace-api/src/main/java/org/dspace/orcid/service/OrcidQueueService.java
View File

@@ -5,18 +5,18 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.profile.OrcidEntitySyncPreference;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.profile.OrcidEntitySyncPreference;
/**
* Service that handles ORCID queue records.

14
dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidSynchronizationService.java → dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
View File

@@ -5,20 +5,20 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import java.sql.SQLException;
import java.util.List;
import java.util.Optional;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.app.profile.OrcidEntitySyncPreference;
import org.dspace.app.profile.OrcidProfileDisconnectionMode;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.app.profile.OrcidSynchronizationMode;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.dspace.profile.OrcidEntitySyncPreference;
import org.dspace.profile.OrcidProfileDisconnectionMode;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.dspace.profile.OrcidSynchronizationMode;
/**
* Service that handle the the syncronization between a DSpace profile and the

4
dspace-api/src/main/java/org/dspace/app/orcid/service/OrcidTokenService.java → dspace-api/src/main/java/org/dspace/orcid/service/OrcidTokenService.java
View File

@@ -5,12 +5,12 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidToken;
/**
* Service that handle {@link OrcidToken} entities.

8
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidEntityFactoryServiceImpl.java → dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidEntityFactoryServiceImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service.impl;
package org.dspace.orcid.service.impl;
import static java.util.stream.Collectors.toMap;
@@ -14,12 +14,12 @@ import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.model.factory.OrcidEntityFactory;
import org.dspace.app.orcid.service.OrcidEntityFactoryService;
import org.dspace.content.Item;
import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.model.factory.OrcidEntityFactory;
import org.dspace.orcid.service.OrcidEntityFactoryService;
import org.orcid.jaxb.model.v3.release.record.Activity;
/**

38
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidHistoryServiceImpl.java → dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service.impl;
package org.dspace.orcid.service.impl;
import static java.lang.String.format;
import static java.util.Comparator.comparing;
@@ -24,29 +24,29 @@ import java.util.Optional;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpStatus;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidOperation;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.client.OrcidResponse;
import org.dspace.app.orcid.dao.OrcidHistoryDAO;
import org.dspace.app.orcid.dao.OrcidQueueDAO;
import org.dspace.app.orcid.exception.OrcidClientException;
import org.dspace.app.orcid.exception.OrcidValidationException;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.orcid.model.validator.OrcidValidationError;
import org.dspace.app.orcid.model.validator.OrcidValidator;
import org.dspace.app.orcid.service.MetadataSignatureGenerator;
import org.dspace.app.orcid.service.OrcidEntityFactoryService;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.content.Item;
import org.dspace.content.MetadataFieldName;
import org.dspace.content.MetadataValue;
import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidOperation;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.client.OrcidResponse;
import org.dspace.orcid.dao.OrcidHistoryDAO;
import org.dspace.orcid.dao.OrcidQueueDAO;
import org.dspace.orcid.exception.OrcidClientException;
import org.dspace.orcid.exception.OrcidValidationException;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.orcid.model.validator.OrcidValidationError;
import org.dspace.orcid.model.validator.OrcidValidator;
import org.dspace.orcid.service.MetadataSignatureGenerator;
import org.dspace.orcid.service.OrcidEntityFactoryService;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.orcid.service.OrcidTokenService;
import org.orcid.jaxb.model.v3.release.record.Activity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

10
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java → dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidProfileSectionFactoryServiceImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service.impl;
package org.dspace.orcid.service.impl;
import static java.util.stream.Collectors.toMap;
@@ -16,12 +16,12 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.app.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.content.MetadataValue;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
import org.dspace.profile.OrcidProfileSyncPreference;
/**
* Implementation of {@link OrcidProfileSectionFactoryService}.

16
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidQueueServiceImpl.java → dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidQueueServiceImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service.impl;
package org.dspace.orcid.service.impl;
import java.sql.SQLException;
import java.util.List;
@@ -13,19 +13,19 @@ import java.util.Optional;
import java.util.UUID;
import java.util.stream.Collectors;
import org.dspace.app.orcid.OrcidOperation;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.dao.OrcidQueueDAO;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.profile.OrcidEntitySyncPreference;
import org.dspace.content.Item;
import org.dspace.content.MetadataFieldName;
import org.dspace.content.Relationship;
import org.dspace.content.service.ItemService;
import org.dspace.content.service.RelationshipService;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidOperation;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.dao.OrcidQueueDAO;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.profile.OrcidEntitySyncPreference;
import org.springframework.beans.factory.annotation.Autowired;
/**

24
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidSynchronizationServiceImpl.java → dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service.impl;
package org.dspace.orcid.service.impl;
import static java.time.LocalDateTime.now;
import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
@@ -14,8 +14,8 @@ import static java.util.Optional.ofNullable;
import static org.apache.commons.collections.CollectionUtils.isEmpty;
import static org.apache.commons.lang3.EnumUtils.isValidEnum;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.dspace.app.profile.OrcidEntitySyncPreference.DISABLED;
import static org.dspace.content.Item.ANY;
import static org.dspace.profile.OrcidEntitySyncPreference.DISABLED;
import java.sql.SQLException;
import java.util.HashSet;
@@ -25,16 +25,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.codec.binary.StringUtils;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.app.profile.OrcidEntitySyncPreference;
import org.dspace.app.profile.OrcidProfileDisconnectionMode;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.app.profile.OrcidSynchronizationMode;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
@@ -42,6 +32,16 @@ import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.service.EPersonService;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.profile.OrcidEntitySyncPreference;
import org.dspace.profile.OrcidProfileDisconnectionMode;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.dspace.profile.OrcidSynchronizationMode;
import org.dspace.profile.service.ResearcherProfileService;
import org.dspace.services.ConfigurationService;
import org.springframework.beans.factory.annotation.Autowired;

8
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/OrcidTokenServiceImpl.java → dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidTokenServiceImpl.java
View File

@@ -5,17 +5,17 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service.impl;
package org.dspace.orcid.service.impl;
import java.sql.SQLException;
import java.util.List;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.dao.OrcidTokenDAO;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.dao.OrcidTokenDAO;
import org.dspace.orcid.service.OrcidTokenService;
import org.springframework.beans.factory.annotation.Autowired;
/**

4
dspace-api/src/main/java/org/dspace/app/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java → dspace-api/src/main/java/org/dspace/orcid/service/impl/PlainMetadataSignatureGeneratorImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service.impl;
package org.dspace.orcid.service.impl;
import static java.util.Comparator.comparing;
@@ -16,10 +16,10 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.orcid.service.MetadataSignatureGenerator;
import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.core.Context;
import org.dspace.orcid.service.MetadataSignatureGenerator;
/**
* Implementation of {@link MetadataSignatureGenerator} that composes a

2
dspace-api/src/main/java/org/dspace/app/profile/OrcidEntitySyncPreference.java → dspace-api/src/main/java/org/dspace/profile/OrcidEntitySyncPreference.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile;
package org.dspace.profile;
/**
* Enum that model the allowed values to configure the ORCID synchronization

8
dspace-api/src/main/java/org/dspace/app/profile/OrcidMetadataCopyingAction.java → dspace-api/src/main/java/org/dspace/profile/OrcidMetadataCopyingAction.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile;
package org.dspace.profile;
import static java.time.LocalDateTime.now;
import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
@@ -17,9 +17,6 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.app.profile.service.AfterResearcherProfileCreationAction;
import org.dspace.content.Item;
import org.dspace.content.MetadataFieldName;
import org.dspace.content.MetadataValue;
@@ -27,6 +24,9 @@ import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.service.EPersonService;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.profile.service.AfterResearcherProfileCreationAction;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;

2
dspace-api/src/main/java/org/dspace/app/profile/OrcidProfileDisconnectionMode.java → dspace-api/src/main/java/org/dspace/profile/OrcidProfileDisconnectionMode.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile;
package org.dspace.profile;
import static org.apache.commons.lang3.EnumUtils.isValidEnum;

2
dspace-api/src/main/java/org/dspace/app/profile/OrcidProfileSyncPreference.java → dspace-api/src/main/java/org/dspace/profile/OrcidProfileSyncPreference.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile;
package org.dspace.profile;
/**
* Enum that model the allowed values to configure the ORCID synchronization

2
dspace-api/src/main/java/org/dspace/app/profile/OrcidSynchronizationMode.java → dspace-api/src/main/java/org/dspace/profile/OrcidSynchronizationMode.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile;
package org.dspace.profile;
/**
* Enum that model the allowed values to configure the ORCID synchronization

2
dspace-api/src/main/java/org/dspace/app/profile/ResearcherProfile.java → dspace-api/src/main/java/org/dspace/profile/ResearcherProfile.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile;
package org.dspace.profile;
import static org.dspace.core.Constants.READ;
import static org.dspace.eperson.Group.ANONYMOUS;

8
dspace-api/src/main/java/org/dspace/app/profile/ResearcherProfileServiceImpl.java → dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile;
package org.dspace.profile;
import static java.util.Optional.empty;
import static java.util.Optional.of;
@@ -28,9 +28,6 @@ import javax.annotation.PostConstruct;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.dspace.app.exception.ResourceAlreadyExistsException;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.profile.service.AfterResearcherProfileCreationAction;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.service.AuthorizeService;
import org.dspace.content.Collection;
@@ -51,6 +48,9 @@ import org.dspace.discovery.indexobject.IndexableCollection;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.eperson.service.GroupService;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.profile.service.AfterResearcherProfileCreationAction;
import org.dspace.profile.service.ResearcherProfileService;
import org.dspace.services.ConfigurationService;
import org.dspace.util.UUIDUtils;
import org.slf4j.Logger;

4
dspace-api/src/main/java/org/dspace/app/profile/service/AfterResearcherProfileCreationAction.java → dspace-api/src/main/java/org/dspace/profile/service/AfterResearcherProfileCreationAction.java
View File

@@ -5,13 +5,13 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile.service;
package org.dspace.profile.service;
import java.sql.SQLException;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.profile.ResearcherProfile;
/**
* Interface to mark classes that allow to perform additional logic on created

4
dspace-api/src/main/java/org/dspace/app/profile/service/ResearcherProfileService.java → dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
View File

@@ -5,18 +5,18 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.profile.service;
package org.dspace.profile.service;
import java.net.URI;
import java.sql.SQLException;
import java.util.UUID;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.discovery.SearchServiceException;
import org.dspace.eperson.EPerson;
import org.dspace.profile.ResearcherProfile;
/**
* Service interface class for the {@link ResearcherProfile} object. The

4
dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
View File

@@ -60,9 +60,9 @@
<property name="dspaceRunnableClass" value="org.dspace.scripts.impl.MockDSpaceRunnableScript"/>
</bean>
<bean id="orcid-bulk-push" class="org.dspace.app.orcid.script.OrcidBulkPushScriptConfiguration">
<bean id="orcid-bulk-push" class="org.dspace.orcid.script.OrcidBulkPushScriptConfiguration">
<property name="description" value="Perform the bulk synchronization of all the BATCH configured ORCID entities placed in the ORCID queue"/>
<property name="dspaceRunnableClass" value="org.dspace.app.orcid.script.OrcidBulkPush"/>
<property name="dspaceRunnableClass" value="org.dspace.orcid.script.OrcidBulkPush"/>
</bean>
<!-- Keep as last script; for test ScriptRestRepository#findOneScriptByNameTest -->

4
dspace-api/src/test/java/org/dspace/app/matcher/OrcidQueueMatcher.java
View File

@@ -9,9 +9,9 @@ package org.dspace.app.matcher;
import static org.hamcrest.Matchers.is;
import org.dspace.app.orcid.OrcidOperation;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.content.Item;
import org.dspace.orcid.OrcidOperation;
import org.dspace.orcid.OrcidQueue;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;

8
dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
View File

@@ -13,10 +13,6 @@ import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dspace.app.orcid.factory.OrcidServiceFactory;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.app.requestitem.factory.RequestItemServiceFactory;
import org.dspace.app.requestitem.service.RequestItemService;
import org.dspace.authorize.AuthorizeException;
@@ -46,6 +42,10 @@ import org.dspace.eperson.factory.EPersonServiceFactory;
import org.dspace.eperson.service.EPersonService;
import org.dspace.eperson.service.GroupService;
import org.dspace.eperson.service.RegistrationDataService;
import org.dspace.orcid.factory.OrcidServiceFactory;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.scripts.factory.ScriptServiceFactory;
import org.dspace.scripts.service.ProcessService;
import org.dspace.services.factory.DSpaceServicesFactory;

6
dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
View File

@@ -15,9 +15,6 @@ import java.io.IOException;
import java.sql.SQLException;
import java.util.UUID;
import org.dspace.app.profile.OrcidEntitySyncPreference;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.app.profile.OrcidSynchronizationMode;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Collection;
import org.dspace.content.DCDate;
@@ -29,6 +26,9 @@ import org.dspace.content.service.DSpaceObjectService;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.profile.OrcidEntitySyncPreference;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.dspace.profile.OrcidSynchronizationMode;
/**
* Builder to construct Item objects

7
dspace-api/src/test/java/org/dspace/builder/OrcidHistoryBuilder.java
View File

@@ -12,12 +12,11 @@ import java.sql.SQLException;
import java.util.Date;
import org.apache.log4j.Logger;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidOperation;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidOperation;
import org.dspace.orcid.service.OrcidHistoryService;
/**
* Builder to construct OrcidHistory objects
*

6
dspace-api/src/test/java/org/dspace/builder/OrcidQueueBuilder.java
View File

@@ -9,12 +9,12 @@ package org.dspace.builder;
import java.sql.SQLException;
import org.dspace.app.orcid.OrcidOperation;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidOperation;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.service.OrcidQueueService;
/**
* Builder to construct OrcidQueue objects

4
dspace-api/src/test/java/org/dspace/builder/OrcidTokenBuilder.java
View File

@@ -9,12 +9,12 @@ package org.dspace.builder;
import java.sql.SQLException;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.service.OrcidTokenService;
/**
* Builder for {@link OrcidToken} entities.

24
dspace-api/src/test/java/org/dspace/app/orcid/OrcidQueueConsumerIT.java → dspace-api/src/test/java/org/dspace/orcid/OrcidQueueConsumerIT.java
View File

@@ -5,19 +5,19 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid;
package org.dspace.orcid;
import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
import static org.dspace.app.orcid.OrcidOperation.DELETE;
import static org.dspace.app.orcid.OrcidOperation.INSERT;
import static org.dspace.app.orcid.OrcidOperation.UPDATE;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.KEYWORDS;
import static org.dspace.app.profile.OrcidEntitySyncPreference.ALL;
import static org.dspace.app.profile.OrcidEntitySyncPreference.DISABLED;
import static org.dspace.app.profile.OrcidProfileSyncPreference.BIOGRAPHICAL;
import static org.dspace.app.profile.OrcidProfileSyncPreference.IDENTIFIERS;
import static org.dspace.builder.OrcidHistoryBuilder.createOrcidHistory;
import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
import static org.dspace.orcid.OrcidOperation.DELETE;
import static org.dspace.orcid.OrcidOperation.INSERT;
import static org.dspace.orcid.OrcidOperation.UPDATE;
import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
import static org.dspace.profile.OrcidEntitySyncPreference.DISABLED;
import static org.dspace.profile.OrcidProfileSyncPreference.BIOGRAPHICAL;
import static org.dspace.profile.OrcidProfileSyncPreference.IDENTIFIERS;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
@@ -30,9 +30,6 @@ import java.util.Date;
import java.util.List;
import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.orcid.consumer.OrcidQueueConsumer;
import org.dspace.app.orcid.factory.OrcidServiceFactory;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
@@ -47,6 +44,9 @@ import org.dspace.content.MetadataValue;
import org.dspace.content.RelationshipType;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.ItemService;
import org.dspace.orcid.consumer.OrcidQueueConsumer;
import org.dspace.orcid.factory.OrcidServiceFactory;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.services.ConfigurationService;
import org.dspace.services.factory.DSpaceServicesFactory;
import org.junit.After;

32
dspace-api/src/test/java/org/dspace/app/orcid/model/validator/OrcidValidatorTest.java → dspace-api/src/test/java/org/dspace/orcid/model/validator/OrcidValidatorTest.java
View File

@@ -5,22 +5,22 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.model.validator;
package org.dspace.orcid.model.validator;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
import static org.dspace.app.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.AMOUNT_CURRENCY_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATED_ORGANIZATION_VALUE_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_INVALID;
import static org.dspace.orcid.model.validator.OrcidValidationError.DISAMBIGUATION_SOURCE_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.EXTERNAL_ID_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.FUNDER_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_ADDRESS_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_CITY_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_COUNTRY_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.ORGANIZATION_NAME_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.PUBLICATION_DATE_INVALID;
import static org.dspace.orcid.model.validator.OrcidValidationError.TITLE_REQUIRED;
import static org.dspace.orcid.model.validator.OrcidValidationError.TYPE_REQUIRED;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.when;
import java.util.List;
import org.dspace.app.orcid.model.validator.impl.OrcidValidatorImpl;
import org.dspace.orcid.model.validator.impl.OrcidValidatorImpl;
import org.dspace.services.ConfigurationService;
import org.junit.Before;
import org.junit.Test;

32
dspace-api/src/test/java/org/dspace/app/orcid/script/OrcidBulkPushIT.java → dspace-api/src/test/java/org/dspace/orcid/script/OrcidBulkPushIT.java
View File

@@ -5,17 +5,17 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.script;
package org.dspace.orcid.script;
import static org.dspace.app.launcher.ScriptLauncher.handleScript;
import static org.dspace.app.matcher.LambdaMatcher.matches;
import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
import static org.dspace.app.orcid.OrcidOperation.DELETE;
import static org.dspace.app.orcid.OrcidOperation.INSERT;
import static org.dspace.app.orcid.OrcidOperation.UPDATE;
import static org.dspace.app.profile.OrcidSynchronizationMode.BATCH;
import static org.dspace.app.profile.OrcidSynchronizationMode.MANUAL;
import static org.dspace.builder.OrcidQueueBuilder.createOrcidQueue;
import static org.dspace.orcid.OrcidOperation.DELETE;
import static org.dspace.orcid.OrcidOperation.INSERT;
import static org.dspace.orcid.OrcidOperation.UPDATE;
import static org.dspace.profile.OrcidSynchronizationMode.BATCH;
import static org.dspace.profile.OrcidSynchronizationMode.MANUAL;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -37,16 +37,6 @@ import java.util.function.Predicate;
import org.apache.commons.lang3.ArrayUtils;
import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.launcher.ScriptLauncher;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidOperation;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.client.OrcidResponse;
import org.dspace.app.orcid.exception.OrcidClientException;
import org.dspace.app.orcid.factory.OrcidServiceFactory;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.impl.OrcidHistoryServiceImpl;
import org.dspace.app.profile.OrcidSynchronizationMode;
import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
@@ -56,6 +46,16 @@ import org.dspace.builder.OrcidTokenBuilder;
import org.dspace.content.Collection;
import org.dspace.content.Item;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidOperation;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.client.OrcidResponse;
import org.dspace.orcid.exception.OrcidClientException;
import org.dspace.orcid.factory.OrcidServiceFactory;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.impl.OrcidHistoryServiceImpl;
import org.dspace.profile.OrcidSynchronizationMode;
import org.dspace.services.ConfigurationService;
import org.dspace.services.factory.DSpaceServicesFactory;
import org.junit.After;

4
dspace-api/src/test/java/org/dspace/app/orcid/service/OrcidEntityFactoryServiceIT.java → dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import static org.apache.commons.lang.StringUtils.endsWith;
import static org.dspace.app.matcher.LambdaMatcher.has;
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.function.Predicate;
import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.orcid.factory.OrcidServiceFactory;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
import org.dspace.builder.EntityTypeBuilder;
@@ -38,6 +37,7 @@ import org.dspace.content.Collection;
import org.dspace.content.EntityType;
import org.dspace.content.Item;
import org.dspace.content.RelationshipType;
import org.dspace.orcid.factory.OrcidServiceFactory;
import org.junit.Before;
import org.junit.Test;
import org.orcid.jaxb.model.common.ContributorRole;

18
dspace-api/src/test/java/org/dspace/app/orcid/service/OrcidProfileSectionFactoryServiceIT.java → dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
View File

@@ -5,14 +5,14 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import static org.dspace.app.matcher.LambdaMatcher.matches;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.COUNTRY;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.KEYWORDS;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
import static org.dspace.app.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
import static org.dspace.orcid.model.OrcidProfileSectionType.COUNTRY;
import static org.dspace.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
import static org.dspace.orcid.model.OrcidProfileSectionType.KEYWORDS;
import static org.dspace.orcid.model.OrcidProfileSectionType.OTHER_NAMES;
import static org.dspace.orcid.model.OrcidProfileSectionType.RESEARCHER_URLS;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.greaterThan;
@@ -26,9 +26,6 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.orcid.factory.OrcidServiceFactory;
import org.dspace.app.orcid.model.OrcidProfileSectionType;
import org.dspace.app.orcid.model.factory.OrcidProfileSectionFactory;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
import org.dspace.builder.ItemBuilder;
@@ -37,6 +34,9 @@ import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.ItemService;
import org.dspace.orcid.factory.OrcidServiceFactory;
import org.dspace.orcid.model.OrcidProfileSectionType;
import org.dspace.orcid.model.factory.OrcidProfileSectionFactory;
import org.junit.Before;
import org.junit.Test;
import org.orcid.jaxb.model.common.Iso3166Country;

4
dspace-api/src/test/java/org/dspace/app/orcid/service/PlainMetadataSignatureGeneratorIT.java → dspace-api/src/test/java/org/dspace/orcid/service/PlainMetadataSignatureGeneratorIT.java
View File

@@ -5,7 +5,7 @@
*
* http://www.dspace.org/license/
*/
package org.dspace.app.orcid.service;
package org.dspace.orcid.service;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.anyOf;
@@ -19,7 +19,6 @@ import static org.hamcrest.Matchers.notNullValue;
import java.util.List;
import org.dspace.AbstractIntegrationTestWithDatabase;
import org.dspace.app.orcid.service.impl.PlainMetadataSignatureGeneratorImpl;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
import org.dspace.builder.ItemBuilder;
@@ -28,6 +27,7 @@ import org.dspace.content.Item;
import org.dspace.content.MetadataValue;
import org.dspace.content.factory.ContentServiceFactory;
import org.dspace.content.service.ItemService;
import org.dspace.orcid.service.impl.PlainMetadataSignatureGeneratorImpl;
import org.junit.Before;
import org.junit.Test;

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
View File

@@ -11,7 +11,6 @@ import java.sql.SQLException;
import java.util.UUID;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.rest.authorization.AuthorizationFeature;
import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
import org.dspace.app.rest.model.BaseObjectRest;
@@ -22,6 +21,7 @@ import org.dspace.content.MetadataValue;
import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.profile.service.ResearcherProfileService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidHistoryRestConverter.java
View File

@@ -7,9 +7,9 @@
*/
package org.dspace.app.rest.converter;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.rest.model.OrcidHistoryRest;
import org.dspace.app.rest.projection.Projection;
import org.dspace.orcid.OrcidHistory;
import org.springframework.stereotype.Component;
/**

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/OrcidQueueRestConverter.java
View File

@@ -7,10 +7,10 @@
*/
package org.dspace.app.rest.converter;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.rest.model.OrcidQueueRest;
import org.dspace.app.rest.projection.Projection;
import org.dspace.content.Item;
import org.dspace.orcid.OrcidQueue;
import org.springframework.stereotype.Component;
/**

14
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ResearcherProfileConverter.java
View File

@@ -7,22 +7,22 @@
*/
package org.dspace.app.rest.converter;
import static org.dspace.app.orcid.model.OrcidEntityType.FUNDING;
import static org.dspace.app.orcid.model.OrcidEntityType.PUBLICATION;
import static org.dspace.orcid.model.OrcidEntityType.FUNDING;
import static org.dspace.orcid.model.OrcidEntityType.PUBLICATION;
import java.util.List;
import java.util.stream.Collectors;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.profile.OrcidEntitySyncPreference;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.app.profile.OrcidSynchronizationMode;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.rest.model.ResearcherProfileRest;
import org.dspace.app.rest.model.ResearcherProfileRest.OrcidSynchronizationRest;
import org.dspace.app.rest.projection.Projection;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.profile.OrcidEntitySyncPreference;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.dspace.profile.OrcidSynchronizationMode;
import org.dspace.profile.ResearcherProfile;
import org.dspace.web.ContextUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
View File

@@ -21,10 +21,10 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dspace.app.exception.ResourceAlreadyExistsException;
import org.dspace.app.orcid.exception.OrcidValidationException;
import org.dspace.app.rest.utils.ContextUtil;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.orcid.exception.OrcidValidationException;
import org.dspace.services.ConfigurationService;
import org.springframework.beans.TypeMismatchException;
import org.springframework.core.annotation.AnnotationUtils;

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
View File

@@ -18,7 +18,6 @@ import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.rest.login.PostLoggedInAction;
import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Item;
@@ -27,6 +26,7 @@ import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.service.EPersonService;
import org.dspace.profile.service.ResearcherProfileService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

6
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
View File

@@ -11,14 +11,14 @@ import java.sql.SQLException;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
import org.dspace.app.rest.model.OrcidHistoryRest;
import org.dspace.app.rest.repository.handler.service.UriListHandlerService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.service.OrcidHistoryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.data.domain.Page;

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
View File

@@ -13,14 +13,14 @@ import java.sql.SQLException;
import java.util.List;
import java.util.UUID;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.rest.Parameter;
import org.dspace.app.rest.SearchRestMethod;
import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
import org.dspace.app.rest.model.OrcidQueueRest;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.service.OrcidQueueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.data.domain.Page;

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
View File

@@ -12,8 +12,6 @@ import java.util.UUID;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.rest.model.EPersonRest;
import org.dspace.app.rest.model.ResearcherProfileRest;
import org.dspace.app.rest.projection.Projection;
@@ -21,6 +19,8 @@ import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.service.EPersonService;
import org.dspace.profile.ResearcherProfile;
import org.dspace.profile.service.ResearcherProfileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
View File

@@ -12,13 +12,13 @@ import java.util.UUID;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.rest.model.ItemRest;
import org.dspace.app.rest.model.ResearcherProfileRest;
import org.dspace.app.rest.projection.Projection;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.profile.ResearcherProfile;
import org.dspace.profile.service.ResearcherProfileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
View File

@@ -14,8 +14,6 @@ import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.collections.CollectionUtils;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.rest.exception.DSpaceBadRequestException;
import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
import org.dspace.app.rest.exception.UnprocessableEntityException;
@@ -28,6 +26,8 @@ import org.dspace.core.Context;
import org.dspace.discovery.SearchServiceException;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.service.EPersonService;
import org.dspace.profile.ResearcherProfile;
import org.dspace.profile.service.ResearcherProfileService;
import org.dspace.util.UUIDUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
View File

@@ -13,10 +13,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.service.OrcidQueueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

10
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileAddOrcidOperation.java
View File

@@ -9,14 +9,14 @@ package org.dspace.app.rest.repository.patch.operation;
import java.sql.SQLException;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.exception.OrcidClientException;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.rest.exception.UnprocessableEntityException;
import org.dspace.app.rest.model.patch.Operation;
import org.dspace.core.Context;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.exception.OrcidClientException;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.profile.ResearcherProfile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

16
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileRemoveOrcidOperation.java
View File

@@ -7,23 +7,23 @@
*/
package org.dspace.app.rest.repository.patch.operation;
import static org.dspace.app.profile.OrcidProfileDisconnectionMode.ADMIN_AND_OWNER;
import static org.dspace.app.profile.OrcidProfileDisconnectionMode.DISABLED;
import static org.dspace.app.profile.OrcidProfileDisconnectionMode.ONLY_ADMIN;
import static org.dspace.app.profile.OrcidProfileDisconnectionMode.ONLY_OWNER;
import static org.dspace.profile.OrcidProfileDisconnectionMode.ADMIN_AND_OWNER;
import static org.dspace.profile.OrcidProfileDisconnectionMode.DISABLED;
import static org.dspace.profile.OrcidProfileDisconnectionMode.ONLY_ADMIN;
import static org.dspace.profile.OrcidProfileDisconnectionMode.ONLY_OWNER;
import java.sql.SQLException;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.profile.OrcidProfileDisconnectionMode;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.rest.exception.RESTAuthorizationException;
import org.dspace.app.rest.model.patch.Operation;
import org.dspace.authorize.AuthorizeException;
import org.dspace.authorize.service.AuthorizeService;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.profile.OrcidProfileDisconnectionMode;
import org.dspace.profile.ResearcherProfile;
import org.dspace.profile.service.ResearcherProfileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

20
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileReplaceOrcidSyncPreferencesOperation.java
View File

@@ -7,8 +7,8 @@
*/
package org.dspace.app.rest.repository.patch.operation;
import static org.dspace.app.orcid.model.OrcidEntityType.FUNDING;
import static org.dspace.app.orcid.model.OrcidEntityType.PUBLICATION;
import static org.dspace.orcid.model.OrcidEntityType.FUNDING;
import static org.dspace.orcid.model.OrcidEntityType.PUBLICATION;
import java.sql.SQLException;
import java.util.Arrays;
@@ -16,14 +16,6 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.orcid.model.OrcidEntityType;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.OrcidSynchronizationService;
import org.dspace.app.profile.OrcidEntitySyncPreference;
import org.dspace.app.profile.OrcidProfileSyncPreference;
import org.dspace.app.profile.OrcidSynchronizationMode;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.rest.exception.RESTAuthorizationException;
import org.dspace.app.rest.exception.UnprocessableEntityException;
import org.dspace.app.rest.model.patch.Operation;
@@ -31,6 +23,14 @@ import org.dspace.authorize.AuthorizeException;
import org.dspace.content.Item;
import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.orcid.model.OrcidEntityType;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.OrcidSynchronizationService;
import org.dspace.profile.OrcidEntitySyncPreference;
import org.dspace.profile.OrcidProfileSyncPreference;
import org.dspace.profile.OrcidSynchronizationMode;
import org.dspace.profile.ResearcherProfile;
import org.dspace.profile.service.ResearcherProfileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ResearcherProfileVisibleReplaceOperation.java
View File

@@ -9,13 +9,13 @@ package org.dspace.app.rest.repository.patch.operation;
import java.sql.SQLException;
import org.dspace.app.profile.ResearcherProfile;
import org.dspace.app.profile.service.ResearcherProfileService;
import org.dspace.app.rest.exception.RESTAuthorizationException;
import org.dspace.app.rest.exception.UnprocessableEntityException;
import org.dspace.app.rest.model.patch.Operation;
import org.dspace.authorize.AuthorizeException;
import org.dspace.core.Context;
import org.dspace.profile.ResearcherProfile;
import org.dspace.profile.service.ResearcherProfileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidHistorySendToOrcidRestPermissionEvaluatorPlugin.java
View File

@@ -13,14 +13,14 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.rest.model.OrcidQueueRest;
import org.dspace.app.rest.utils.ContextUtil;
import org.dspace.content.MetadataValue;
import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.services.RequestService;
import org.dspace.services.model.Request;
import org.springframework.beans.factory.annotation.Autowired;

8
dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
View File

@@ -11,15 +11,15 @@ import java.io.Serializable;
import java.sql.SQLException;
import org.apache.commons.lang3.StringUtils;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.rest.utils.ContextUtil;
import org.dspace.content.Item;
import org.dspace.content.service.ItemService;
import org.dspace.core.Context;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.services.RequestService;
import org.dspace.services.model.Request;
import org.slf4j.Logger;

6
dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
View File

@@ -42,9 +42,6 @@ import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.SignedJWT;
import org.apache.commons.codec.CharEncoding;
import org.apache.commons.io.IOUtils;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.client.OrcidConfiguration;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.app.rest.authorization.Authorization;
import org.dspace.app.rest.authorization.AuthorizationFeature;
import org.dspace.app.rest.authorization.AuthorizationFeatureService;
@@ -74,6 +71,9 @@ import org.dspace.content.Collection;
import org.dspace.content.Item;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.client.OrcidConfiguration;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.dspace.services.ConfigurationService;
import org.hamcrest.Matchers;
import org.junit.Before;

12
dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
View File

@@ -10,13 +10,13 @@ package org.dspace.app.rest;
import static com.jayway.jsonpath.JsonPath.read;
import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
import static org.dspace.app.matcher.OrcidQueueMatcher.matches;
import static org.dspace.app.orcid.OrcidOperation.DELETE;
import static org.dspace.app.profile.OrcidEntitySyncPreference.ALL;
import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
import static org.dspace.builder.OrcidHistoryBuilder.createOrcidHistory;
import static org.dspace.builder.OrcidQueueBuilder.createOrcidQueue;
import static org.dspace.core.Constants.WRITE;
import static org.dspace.orcid.OrcidOperation.DELETE;
import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
@@ -48,10 +48,6 @@ import javax.ws.rs.core.MediaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.CharEncoding;
import org.dspace.app.orcid.OrcidHistory;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.service.OrcidHistoryService;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.rest.matcher.BitstreamMatcher;
import org.dspace.app.rest.matcher.BundleMatcher;
import org.dspace.app.rest.matcher.CollectionMatcher;
@@ -93,6 +89,10 @@ import org.dspace.content.service.CollectionService;
import org.dspace.core.Constants;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.orcid.OrcidHistory;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.service.OrcidHistoryService;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.services.ConfigurationService;
import org.dspace.versioning.Version;
import org.dspace.versioning.service.VersioningService;

10
dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
View File

@@ -34,11 +34,6 @@ import javax.servlet.http.Cookie;
import com.jayway.jsonpath.JsonPath;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jwt.SignedJWT;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.exception.OrcidClientException;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.app.rest.model.AuthnRest;
import org.dspace.app.rest.security.OrcidLoginFilter;
import org.dspace.app.rest.security.jwt.EPersonClaimProvider;
@@ -52,6 +47,11 @@ import org.dspace.content.Item;
import org.dspace.content.service.ItemService;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.service.EPersonService;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.exception.OrcidClientException;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.services.ConfigurationService;
import org.dspace.util.UUIDUtils;
import org.junit.After;

16
dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
View File

@@ -13,13 +13,13 @@ import static java.util.Arrays.asList;
import static java.util.UUID.fromString;
import static org.dspace.app.matcher.LambdaMatcher.has;
import static org.dspace.app.matcher.MetadataValueMatcher.with;
import static org.dspace.app.profile.OrcidEntitySyncPreference.ALL;
import static org.dspace.app.rest.matcher.HalMatcher.matchLinks;
import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataNotEmpty;
import static org.dspace.app.rest.matcher.ResourcePolicyMatcher.matchResourcePolicyProperties;
import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.empty;
@@ -51,13 +51,6 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
import com.jayway.jsonpath.JsonPath;
import org.dspace.app.orcid.OrcidQueue;
import org.dspace.app.orcid.OrcidToken;
import org.dspace.app.orcid.client.OrcidClient;
import org.dspace.app.orcid.exception.OrcidClientException;
import org.dspace.app.orcid.model.OrcidTokenResponseDTO;
import org.dspace.app.orcid.service.OrcidQueueService;
import org.dspace.app.orcid.service.OrcidTokenService;
import org.dspace.app.rest.model.patch.AddOperation;
import org.dspace.app.rest.model.patch.Operation;
import org.dspace.app.rest.model.patch.RemoveOperation;
@@ -80,6 +73,13 @@ import org.dspace.content.RelationshipType;
import org.dspace.content.service.ItemService;
import org.dspace.core.Constants;
import org.dspace.eperson.EPerson;
import org.dspace.orcid.OrcidQueue;
import org.dspace.orcid.OrcidToken;
import org.dspace.orcid.client.OrcidClient;
import org.dspace.orcid.exception.OrcidClientException;
import org.dspace.orcid.model.OrcidTokenResponseDTO;
import org.dspace.orcid.service.OrcidQueueService;
import org.dspace.orcid.service.OrcidTokenService;
import org.dspace.services.ConfigurationService;
import org.dspace.util.UUIDUtils;
import org.junit.After;

Some files were not shown because too many files have changed in this diff Show More