From dd927854144fa6f00debf4ff0dfcbb25b3e58911 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Tue, 28 Apr 2020 16:52:54 -0700 Subject: [PATCH] DRYD-841, DRYD-855: Merging in UCB contributions to post-v6.0 master branch. --- .../services/batch/nuxeo/AbstractBatchJob.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/AbstractBatchJob.java b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/AbstractBatchJob.java index a77b10c65..31b381f64 100644 --- a/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/AbstractBatchJob.java +++ b/services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/AbstractBatchJob.java @@ -314,17 +314,17 @@ public abstract class AbstractBatchJob extends AbstractBatchInvocable { return csids; } - protected List findAllAuthorityItems(String serviceName, String vocabularyCsid, int pageSize, int pageNum) throws Exception { + protected List findAllAuthorityItems(String serviceName, String vocabularyCsid, int pageSize, int pageNum) throws URISyntaxException, DocumentException, Exception { return findAllAuthorityItems(serviceName, vocabularyCsid, pageSize, pageNum, null); } - protected List findAllAuthorityItems(String serviceName, String vocabularyCsid, int pageSize, int pageNum, String sortBy) throws Exception { + protected List findAllAuthorityItems(String serviceName, String vocabularyCsid, int pageSize, int pageNum, String sortBy) throws URISyntaxException, DocumentException, Exception { AuthorityResource resource = (AuthorityResource) getResourceMap().get(serviceName); return findAllAuthorityItems(resource, vocabularyCsid, pageSize, pageNum, sortBy); } - protected List findAllAuthorityItems(AuthorityResource resource, String vocabularyCsid, int pageSize, int pageNum, String sortBy) throws Exception { + protected List findAllAuthorityItems(AuthorityResource resource, String vocabularyCsid, int pageSize, int pageNum, String sortBy) throws URISyntaxException, DocumentException, Exception { AbstractCommonList list = resource.getAuthorityItemList(getServiceContext(), vocabularyCsid, createPagedListUriInfo(resource.getServiceName(), pageNum, pageSize, sortBy)); List csids = new ArrayList(); @@ -423,7 +423,7 @@ public abstract class AbstractBatchJob extends AbstractBatchInvocable { return findAuthorityItemByRefName(TaxonomyAuthorityClient.SERVICE_NAME, refName); } - protected List findReferencingFields(String serviceName, String parentCsid, String csid, String type, int pageNum, int pageSize) throws Exception { + protected List findReferencingFields(String serviceName, String parentCsid, String csid, String type, int pageNum, int pageSize) throws URISyntaxException, Exception { AuthorityResource resource = (AuthorityResource) getResourceMap().get(serviceName); // The pageNum and pageSize params don't work right for the refobj request. @@ -453,9 +453,9 @@ public abstract class AbstractBatchJob extends AbstractBatchInvocable { * Only records that reference the given item in the specified field are returned. * If null, returns records that reference the item in any field. * @return A List containing the csids of referencing records. - * @throws Exception + * @throws URISyntaxException */ - protected List findReferencingObjects(String serviceName, String parentCsid, String csid, String type, String sourceField) throws Exception { + protected List findReferencingObjects(String serviceName, String parentCsid, String csid, String type, String sourceField) throws URISyntaxException, Exception { logger.debug("findReferencingObjects serviceName=" + serviceName + " parentCsid=" + parentCsid + " csid=" + csid + " type=" + type + " sourceField=" + sourceField); List items = findReferencingFields(serviceName, parentCsid, csid, type, 0, 0); @@ -476,7 +476,7 @@ public abstract class AbstractBatchJob extends AbstractBatchInvocable { return csids; } - protected List findReferencingObjects(String serviceName, String csid, String type, String sourceField) throws URISyntaxException, Exception { + protected List findReferencingObjects(String serviceName, String csid, String type, String sourceField) throws URISyntaxException, DocumentException, Exception { logger.debug("findReferencingObjects serviceName=" + serviceName + " csid=" + csid + " type=" + type + " sourceField=" + sourceField); List vocabularyCsids = getVocabularyCsids(serviceName); @@ -505,7 +505,7 @@ public abstract class AbstractBatchJob extends AbstractBatchInvocable { return findReferencingObjects(serviceName, parentCsid, csid, type, sourceField); } - protected List findReferencingCollectionObjects(String serviceName, String csid, String sourceField) throws URISyntaxException, Exception { + protected List findReferencingCollectionObjects(String serviceName, String csid, String sourceField) throws URISyntaxException, DocumentException, Exception { return findReferencingObjects(serviceName, csid, ServiceBindingUtils.SERVICE_TYPE_OBJECT, sourceField); } -- 2.47.3