diff options
Diffstat (limited to 'idrop-lite')
-rw-r--r-- | idrop-lite/release_notes.txt | 2 | ||||
-rw-r--r-- | idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSFileService.java | 160 |
2 files changed, 2 insertions, 160 deletions
diff --git a/idrop-lite/release_notes.txt b/idrop-lite/release_notes.txt index bbb140b..8300d12 100644 --- a/idrop-lite/release_notes.txt +++ b/idrop-lite/release_notes.txt @@ -24,6 +24,8 @@ Note that the following bug and feature requests are logged in GForge with relat ==Bug Fixes== +*[#1012] error building with IdropFileService missing methods + ==Features== ==Outstanding Issues== diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSFileService.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSFileService.java index e845536..5e31e23 100644 --- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSFileService.java +++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSFileService.java @@ -213,59 +213,6 @@ public class IRODSFileService { } /** - * Method will return a listing of collections with a given metadata value, in this case the marker attribute for - * the result of a virus scan. - * - * @param parentCollectionAbsolutePath - * <code>String</code> with the absolute path to the parent collection. - * @return <code>List<MetaDataAndDomainData></code> with the results of the query. - * @throws IdropException - */ - public List<MetaDataAndDomainData> getVirusStatusForParentCollection(final String parentCollectionAbsolutePath) - throws IdropException { - return getProcessingResultMetadataForCollection(parentCollectionAbsolutePath, - "PolicyDrivenService:PolicyProcessingResultAttribute:VirusScan"); - } - - /** - * Method will return a listing of the marker values for a data object for fixity check status - * - * @param parentCollectionAbsolutePath - * <code>String</code> with the absolute path to the parent collection. - * @return <code>MetaDataAndDomainData</code> with the results of the query or null. - * @throws IdropException - */ - public MetaDataAndDomainData getFixityStatusForDataObject(final String parentCollectionAbsolutePath, - final String dataObjectName) throws IdropException { - List<MetaDataAndDomainData> metaDataList = getProcessingResultMetadataForDataObject( - parentCollectionAbsolutePath, dataObjectName, "CHECKSUM%"); - if (metaDataList.size() > 0) { - return metaDataList.get(0); - } else { - return null; - } - } - - /** - * Method will return a listing of the marker values for a data object for virus scan status - * - * @param parentCollectionAbsolutePath - * <code>String</code> with the absolute path to the parent collection. - * @return <code>MetaDataAndDomainData</code> with the results of the query or null. - * @throws IdropException - */ - public MetaDataAndDomainData getVirusStatusForDataObject(final String parentCollectionAbsolutePath, - final String dataObjectName) throws IdropException { - List<MetaDataAndDomainData> metaDataList = getProcessingResultMetadataForDataObject( - parentCollectionAbsolutePath, dataObjectName, "VIRUS_SCAN%"); - if (metaDataList.size() > 0) { - return metaDataList.get(0); - } else { - return null; - } - } - - /** * Get a list of the AVU metadata for the given collection * * @param irodsAbsolutePath @@ -334,113 +281,6 @@ public class IRODSFileService { } } - - /** - * Method will return a listing of collections with a given metadata value, in this case the marker attribute for - * the result of a fixity check. - * - * @param parentCollectionAbsolutePath - * <code>String</code> with the absolute path to the parent collection. - * @return <code>List<MetaDataAndDomainData></code> with the results of the query. - * @throws IdropException - */ - public List<MetaDataAndDomainData> getFixityStatusForParentCollection(final String parentCollectionAbsolutePath) - throws IdropException { - return getProcessingResultMetadataForCollection(parentCollectionAbsolutePath, - "PolicyDrivenService:PolicyProcessingResultAttribute:FixityCheck"); - } - - public List<MetaDataAndDomainData> getProcessingResultMetadataForCollection( - final String parentCollectionAbsolutePath, final String markerAttribute) throws IdropException { - if (parentCollectionAbsolutePath == null || parentCollectionAbsolutePath.isEmpty()) { - throw new IdropException("null or empty parentCollectionAbsolutePath"); - } - - if (markerAttribute == null || markerAttribute.isEmpty()) { - throw new IdropException("null or empty markerAttribute"); - } - - List<AVUQueryElement> queryElements = new ArrayList<AVUQueryElement>(); - try { - queryElements.add(AVUQueryElement.instanceForValueQuery(AVUQueryElement.AVUQueryPart.ATTRIBUTE, - AVUQueryOperatorEnum.EQUAL, markerAttribute)); - } catch (JargonQueryException ex) { - Logger.getLogger(IRODSFileService.class.getName()).log(Level.SEVERE, null, ex); - throw new IdropException(ex); - } - - StringBuilder sb = new StringBuilder(); - sb.append(RodsGenQueryEnum.COL_COLL_NAME.getName()); - sb.append(" LIKE "); - sb.append("'"); - sb.append(parentCollectionAbsolutePath); - sb.append("%"); - sb.append("'"); - - try { - final CollectionAO collectionAO = irodsFileSystem.getIRODSAccessObjectFactory().getCollectionAO( - irodsAccount); - return collectionAO.findMetadataValuesByMetadataQueryWithAdditionalWhere(queryElements, sb.toString(),0); - } catch (JargonException ex) { - Logger.getLogger(IRODSFileService.class.getName()).log(Level.SEVERE, null, ex); - throw new IdropException("exception processing rule", ex); - } catch (JargonQueryException ex) { - Logger.getLogger(IRODSFileService.class.getName()).log(Level.SEVERE, null, ex); - throw new IdropException("query exception processing rule", ex); - } finally { - try { - irodsFileSystem.close(irodsAccount); - } catch (JargonException ex) { - Logger.getLogger(IRODSFileService.class.getName()).log(Level.SEVERE, null, ex); - } - } - } - - public List<MetaDataAndDomainData> getProcessingResultMetadataForDataObject( - final String parentCollectionAbsolutePath, final String dataObjectName, final String markerAttribute) - throws IdropException { - - if (parentCollectionAbsolutePath == null || parentCollectionAbsolutePath.isEmpty()) { - throw new IdropException("null or empty parentCollectionAbsolutePath"); - } - - if (dataObjectName == null || dataObjectName.isEmpty()) { - throw new IdropException("null or empty dataObjectName"); - } - - if (markerAttribute == null || markerAttribute.isEmpty()) { - throw new IdropException("null or empty markerAttribute"); - } - - List<AVUQueryElement> queryElements = new ArrayList<AVUQueryElement>(); - try { - queryElements.add(AVUQueryElement.instanceForValueQuery(AVUQueryElement.AVUQueryPart.ATTRIBUTE, - AVUQueryOperatorEnum.LIKE, markerAttribute)); - } catch (JargonQueryException ex) { - Logger.getLogger(IRODSFileService.class.getName()).log(Level.SEVERE, null, ex); - throw new IdropException(ex); - } - - try { - final DataObjectAO dataObjectAO = irodsFileSystem.getIRODSAccessObjectFactory().getDataObjectAO( - irodsAccount); - return dataObjectAO.findMetadataValuesForDataObjectUsingAVUQuery(queryElements, - parentCollectionAbsolutePath, dataObjectName); - } catch (JargonException ex) { - Logger.getLogger(IRODSFileService.class.getName()).log(Level.SEVERE, null, ex); - throw new IdropException("exception processing rule", ex); - } catch (JargonQueryException ex) { - Logger.getLogger(IRODSFileService.class.getName()).log(Level.SEVERE, null, ex); - throw new IdropException("query exception processing rule", ex); - } finally { - try { - irodsFileSystem.close(irodsAccount); - } catch (JargonException ex) { - Logger.getLogger(IRODSFileService.class.getName()).log(Level.SEVERE, null, ex); - } - } - } - /** * For a given data object, get a list of the resources for that object * |