#1 restarting dev will consider formbot dependencies now in attic

DICE-UNC · Jan 5, 2017 · 6be1829 · 6be1829
1 parent ba78ab9
commit 6be1829
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...plate/MetadataTemplateFormBotService.java → ...attic/MetadataTemplateFormBotService.java b/...plate/MetadataTemplateFormBotService.java → ...attic/MetadataTemplateFormBotService.java
diff --git a/...e/MetadataTemplateFormBotServiceTest.java → ...c/MetadataTemplateFormBotServiceTest.java b/...e/MetadataTemplateFormBotServiceTest.java → ...c/MetadataTemplateFormBotServiceTest.java
diff --git a/...ata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataResolver.java b/...ata-templates/src/main/java/org/irods/jargon/metadatatemplate/JargonMetadataResolver.java
@@ -23,6 +23,7 @@
 import org.irods.jargon.core.query.AVUQueryElement;
 import org.irods.jargon.core.query.JargonQueryException;
 import org.irods.jargon.core.query.MetaDataAndDomainData;
+import org.irods.jargon.core.query.QueryConditionOperators;
 import org.irods.jargon.core.utils.LocalFileUtils;
 import org.irods.jargon.extensions.dotirods.DotIrodsConstants;
 import org.irods.jargon.extensions.dotirods.DotIrodsService;
@@ -399,7 +400,7 @@ public String getFqNameForUUID(UUID uuid) {
 		try {
 			queryElements.add(AVUQueryElement.instanceForValueQuery(
 					AVUQueryElement.AVUQueryPart.VALUE,
-					AVUQueryOperatorEnum.EQUAL, uuid.toString()));
+					QueryConditionOperators.EQUAL, uuid.toString()));
 
 			queryResult = irodsAccessObjectFactory
 					.getDataObjectAO(irodsAccount)
@@ -1620,7 +1621,7 @@ List<MetaDataAndDomainData> queryTemplateAVUForFile(
 		List<MetaDataAndDomainData> queryResult = new ArrayList<MetaDataAndDomainData>();
 
 		queryElements.add(AVUQueryElement.instanceForValueQuery(
-				AVUQueryElement.AVUQueryPart.UNITS, AVUQueryOperatorEnum.EQUAL,
+				AVUQueryElement.AVUQueryPart.UNITS, QueryConditionOperators.EQUAL,
 				JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT));
 
 		queryResult = irodsAccessObjectFactory.getDataObjectAO(irodsAccount)
@@ -1639,7 +1640,7 @@ List<MetaDataAndDomainData> queryElementAVUForFile(
 		List<MetaDataAndDomainData> queryResult = new ArrayList<MetaDataAndDomainData>();
 
 		queryElements.add(AVUQueryElement.instanceForValueQuery(
-				AVUQueryElement.AVUQueryPart.UNITS, AVUQueryOperatorEnum.EQUAL,
+				AVUQueryElement.AVUQueryPart.UNITS, QueryConditionOperators.EQUAL,
 				JargonMetadataTemplateConstants.MD_ELEMENT_UNIT));
 
 		queryResult = irodsAccessObjectFactory.getDataObjectAO(irodsAccount)