diff --git a/metadata-templates/src/test/java/org/irods/jargon/metadatatemplate/MetadataTemplateFormBotServiceTest.java b/metadata-templates/src/test/java/org/irods/jargon/metadatatemplate/MetadataTemplateFormBotServiceTest.java index 34ff239..0f6d0e8 100644 --- a/metadata-templates/src/test/java/org/irods/jargon/metadatatemplate/MetadataTemplateFormBotServiceTest.java +++ b/metadata-templates/src/test/java/org/irods/jargon/metadatatemplate/MetadataTemplateFormBotServiceTest.java @@ -5,8 +5,6 @@ import java.util.Properties; import java.util.UUID; -import junit.framework.Assert; - import org.irods.jargon.core.connection.IRODSAccount; import org.irods.jargon.core.pub.DataTransferOperations; import org.irods.jargon.core.pub.IRODSAccessObjectFactory; @@ -22,10 +20,10 @@ import org.irods.jargon.formbot.MetadataTemplateFormBotService; import org.irods.jargon.testutils.TestingPropertiesHelper; import org.junit.After; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; public class MetadataTemplateFormBotServiceTest { @@ -36,13 +34,9 @@ public class MetadataTemplateFormBotServiceTest { private static ObjectMapper objectMapper = new ObjectMapper(); private static final String TEMPLATE_FILE_NAME1 = "src/test/resources/templates/test1.mdtemplate"; - private static final String TEMPLATE_FILE_NAME2 = "src/test/resources/templates/test2.mdtemplate"; - private static final String TEMPLATE_FILE_NAME3 = "src/test/resources/templates/test3.mdtemplate"; private static final String TEST_FILE_NAME = "src/test/resources/testFile.txt"; private static final String TEMPLATE_NOPATH1 = "test1.mdtemplate"; - private static final String TEMPLATE_NOPATH2 = "test2.mdtemplate"; - private static final String TEMPLATE_NOPATH3 = "test3.mdtemplate"; private static final String TEST_FILE_NOPATH = "testFile.txt"; public static final String IRODS_TEST_SUBDIR_PATH = "MetadataTemplateFormBotServiceTest"; @@ -56,8 +50,7 @@ public static void setUpBeforeClass() throws Exception { irodsTestSetupUtilities = new org.irods.jargon.testutils.IRODSTestSetupUtilities(); irodsTestSetupUtilities.clearIrodsScratchDirectory(); irodsTestSetupUtilities.initializeIrodsScratchDirectory(); - irodsTestSetupUtilities - .initializeDirectoryForTest(IRODS_TEST_SUBDIR_PATH); + irodsTestSetupUtilities.initializeDirectoryForTest(IRODS_TEST_SUBDIR_PATH); } @After @@ -69,46 +62,36 @@ public void tearDown() throws Exception { public void buildFormBotFormBadJson() throws Exception { String testDirName = "buildFormBotFormBadJson"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile1 = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile1 = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile1.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath1 = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath1 = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath1, irodsAccount.getDefaultStorageResource(), - null, null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath1, + irodsAccount.getDefaultStorageResource(), null, null); String dummyJson = "{\n\t\"notAName\":\"garbage\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.buildFormBotForm(dummyJson); - Assert.assertTrue("buildFormBotForm should have returned empty string", - returnString.isEmpty()); + Assert.assertTrue("buildFormBotForm should have returned empty string", returnString.isEmpty()); // FormBotForm returnForm = objectMapper.readValue( // formBotService.buildFormBotForm(dummyJson), FormBotForm.class); @@ -121,66 +104,52 @@ public void buildFormBotFormBadJson() throws Exception { public void buildFormBotFormUuidJson() throws Exception { String testDirName = "buildFormBotFormUuidJson"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); String uuidJson = "{\n\t\"uuid\":\"" + uuid.toString() + "\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.buildFormBotForm(uuidJson); - Assert.assertFalse( - "buildFormBotForm should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("buildFormBotForm should not have returned empty string", returnString.isEmpty()); + + FormBotForm returnForm = objectMapper.readValue(returnString, FormBotForm.class); - FormBotForm returnForm = objectMapper.readValue(returnString, - FormBotForm.class); - - Assert.assertTrue( - "buildFormBotForm should have returned a form populated from template1.mdtemplate", + Assert.assertTrue("buildFormBotForm should have returned a form populated from template1.mdtemplate", returnForm.getName().equalsIgnoreCase("test1")); // FormBotForm returnForm = formBotService.buildFormBotForm(uuidJson); // - // Assert.assertNotNull("buildFormBotForm should not have returned null", + // Assert.assertNotNull("buildFormBotForm should not have returned + // null", // returnForm); } @@ -188,60 +157,48 @@ public void buildFormBotFormUuidJson() throws Exception { public void buildFormBotFormFqNameJson() throws Exception { String testDirName = "buildFormBotFormFqNameJson"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; String fqNameJson = "{\n\t\"fqName\":\"" + mdTemplateFqName + "\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.buildFormBotForm(fqNameJson); - Assert.assertFalse( - "buildFormBotForm should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("buildFormBotForm should not have returned empty string", returnString.isEmpty()); - FormBotForm returnForm = objectMapper.readValue(returnString, - FormBotForm.class); + FormBotForm returnForm = objectMapper.readValue(returnString, FormBotForm.class); - Assert.assertTrue( - "buildFormBotForm should have returned a form populated from template1.mdtemplate", + Assert.assertTrue("buildFormBotForm should have returned a form populated from template1.mdtemplate", returnForm.getName().equalsIgnoreCase("test1")); // FormBotForm returnForm = formBotService.buildFormBotForm(faNameJson); // - // Assert.assertNotNull("buildFormBotForm should not have returned null", + // Assert.assertNotNull("buildFormBotForm should not have returned + // null", // returnForm); } @@ -249,59 +206,46 @@ public void buildFormBotFormFqNameJson() throws Exception { public void buildFormBotFormNameJson() throws Exception { String testDirName = "buildFormBotFormNameJson"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); - String nameJson = "{\n\t\"name\":\"test1\",\n\t\"activeDir\":\"" - + targetIrodsCollection + "\"}"; + String nameJson = "{\n\t\"name\":\"test1\",\n\t\"activeDir\":\"" + targetIrodsCollection + "\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.buildFormBotForm(nameJson); - Assert.assertFalse( - "buildFormBotForm should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("buildFormBotForm should not have returned empty string", returnString.isEmpty()); - FormBotForm returnForm = objectMapper.readValue(returnString, - FormBotForm.class); + FormBotForm returnForm = objectMapper.readValue(returnString, FormBotForm.class); - Assert.assertTrue( - "buildFormBotForm should have returned a form populated from template1.mdtemplate", + Assert.assertTrue("buildFormBotForm should have returned a form populated from template1.mdtemplate", returnForm.getName().equalsIgnoreCase("test1")); // FormBotForm returnForm = formBotService.buildFormBotForm(nameJson); // - // Assert.assertNotNull("buildFormBotForm should not have returned null", + // Assert.assertNotNull("buildFormBotForm should not have returned + // null", // returnForm); } @@ -309,128 +253,97 @@ public void buildFormBotFormNameJson() throws Exception { public void validateFormBotFieldTemplateNotFound() throws Exception { String testDirName = "validateFormBotFieldTemplateNotFound"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"00000000-0000-0000-0000-000000000000attribute2\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); // FormBotValidationResult returnResult = formBotService // .validateFormBotField(fieldJson); String returnString = formBotService.validateFormBotField(fieldJson); - Assert.assertFalse( - "validateFormBotField should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("validateFormBotField should not have returned empty string", returnString.isEmpty()); - FormBotValidationResult returnResult = objectMapper.readValue( - returnString, FormBotValidationResult.class); + FormBotValidationResult returnResult = objectMapper.readValue(returnString, FormBotValidationResult.class); - Assert.assertEquals( - "validateFormBotField should have returned an error", - FormBotValidationEnum.ERROR, returnResult.getCode()); + Assert.assertEquals("validateFormBotField should have returned an error", FormBotValidationEnum.ERROR, + returnResult.getCode()); } @Test public void validateFormBotFieldAttributeNotFound() throws Exception { String testDirName = "validateFormBotFieldAttributeNotFound"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); - String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"" - + uuid.toString() + "garbage\"}"; + String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"" + uuid.toString() + "garbage\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.validateFormBotField(fieldJson); - Assert.assertFalse( - "validateFormBotField should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("validateFormBotField should not have returned empty string", returnString.isEmpty()); - FormBotValidationResult returnResult = objectMapper.readValue( - returnString, FormBotValidationResult.class); + FormBotValidationResult returnResult = objectMapper.readValue(returnString, FormBotValidationResult.class); - Assert.assertEquals( - "validateFormBotField should have returned an error", - FormBotValidationEnum.ERROR, returnResult.getCode()); + Assert.assertEquals("validateFormBotField should have returned an error", FormBotValidationEnum.ERROR, + returnResult.getCode()); // FormBotValidationResult returnResult = formBotService // .validateFormBotField(fieldJson); @@ -444,59 +357,45 @@ public void validateFormBotFieldAttributeNotFound() throws Exception { public void validateFormBotFieldValidationFailed() throws Exception { String testDirName = "validateFormBotFieldValidationFailed"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); - String fieldJson = "{\n\t\"value\":\"notaninteger\",\n\t\"fieldUniqueName\":\"" - + uuid.toString() + "attribute2\"}"; + String fieldJson = "{\n\t\"value\":\"notaninteger\",\n\t\"fieldUniqueName\":\"" + uuid.toString() + + "attribute2\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.validateFormBotField(fieldJson); - Assert.assertFalse( - "validateFormBotField should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("validateFormBotField should not have returned empty string", returnString.isEmpty()); - FormBotValidationResult returnResult = objectMapper.readValue( - returnString, FormBotValidationResult.class); + FormBotValidationResult returnResult = objectMapper.readValue(returnString, FormBotValidationResult.class); Assert.assertEquals( "validateFormBotField should have returned FAILURE, because value is not convertible to integer", @@ -506,7 +405,8 @@ public void validateFormBotFieldValidationFailed() throws Exception { // .validateFormBotField(fieldJson); // // Assert.assertEquals( - // "validateFormBotField should have returned FAILURE, because value is not convertible to integer", + // "validateFormBotField should have returned FAILURE, because value is + // not convertible to integer", // FormBotValidationEnum.FAILURE, returnResult.getCode()); } @@ -514,63 +414,47 @@ public void validateFormBotFieldValidationFailed() throws Exception { public void validateFormBotFieldValidationSuccess() throws Exception { String testDirName = "validateFormBotFieldValidationSuccess"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); - String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"" - + uuid.toString() + "attribute2\"}"; + String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"" + uuid.toString() + "attribute2\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.validateFormBotField(fieldJson); - Assert.assertFalse( - "validateFormBotField should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("validateFormBotField should not have returned empty string", returnString.isEmpty()); - FormBotValidationResult returnResult = objectMapper.readValue( - returnString, FormBotValidationResult.class); - - Assert.assertEquals( - "validateFormBotField should have returned SUCCESS", - FormBotValidationEnum.SUCCESS, returnResult.getCode()); + FormBotValidationResult returnResult = objectMapper.readValue(returnString, FormBotValidationResult.class); + + Assert.assertEquals("validateFormBotField should have returned SUCCESS", FormBotValidationEnum.SUCCESS, + returnResult.getCode()); // FormBotValidationResult returnResult = formBotService // .validateFormBotField(fieldJson); @@ -584,69 +468,53 @@ public void validateFormBotFieldValidationSuccess() throws Exception { public void executeFormBotFieldTemplateNotFound() throws Exception { String testDirName = "executeFormBotFieldTemplateNotFound"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); // Create a file in targetIrodsCollection1 - dataTransferOperations.putOperation(TEST_FILE_NAME, - targetIrodsCollection, + dataTransferOperations.putOperation(TEST_FILE_NAME, targetIrodsCollection, irodsAccount.getDefaultStorageResource(), null, null); String testFileNameFQ = targetIrodsCollection + '/' + TEST_FILE_NOPATH; String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"00000000-0000-0000-0000-000000000000attribute2\",\n\t\"pathToObject\":\"" + testFileNameFQ + "\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.executeFormBotField(fieldJson); - Assert.assertFalse( - "executeFormBotField should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("executeFormBotField should not have returned empty string", returnString.isEmpty()); - FormBotExecutionResult returnResult = objectMapper.readValue( - returnString, FormBotExecutionResult.class); + FormBotExecutionResult returnResult = objectMapper.readValue(returnString, FormBotExecutionResult.class); - Assert.assertEquals( - "executeFormBotField should have returned an error", - FormBotExecutionEnum.ERROR, returnResult.getCode()); + Assert.assertEquals("executeFormBotField should have returned an error", FormBotExecutionEnum.ERROR, + returnResult.getCode()); // FormBotExecutionResult returnResult = formBotService // .executeFormBotField(fieldJson); @@ -660,69 +528,52 @@ public void executeFormBotFieldTemplateNotFound() throws Exception { public void executeFormBotFieldFileNotFound() throws Exception { String testDirName = "executeFormBotFieldFileNotFound"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); // Create a file in targetIrodsCollection1 - dataTransferOperations.putOperation(TEST_FILE_NAME, - targetIrodsCollection, + dataTransferOperations.putOperation(TEST_FILE_NAME, targetIrodsCollection, irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); - String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"" - + uuid.toString() + String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"" + uuid.toString() + "attribute2\",\n\t\"pathToObject\":\"path/is/bogus\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.executeFormBotField(fieldJson); - - Assert.assertFalse( - "executeFormBotField should not have returned empty string", - returnString.isEmpty()); - FormBotExecutionResult returnResult = objectMapper.readValue( - returnString, FormBotExecutionResult.class); + Assert.assertFalse("executeFormBotField should not have returned empty string", returnString.isEmpty()); - Assert.assertEquals( - "executeFormBotField should have returned an error", - FormBotExecutionEnum.ERROR, returnResult.getCode()); + FormBotExecutionResult returnResult = objectMapper.readValue(returnString, FormBotExecutionResult.class); + + Assert.assertEquals("executeFormBotField should have returned an error", FormBotExecutionEnum.ERROR, + returnResult.getCode()); // FormBotExecutionResult returnResult = formBotService // .executeFormBotField(fieldJson); @@ -736,70 +587,53 @@ public void executeFormBotFieldFileNotFound() throws Exception { public void executeFormBotFieldAttributeNotFound() throws Exception { String testDirName = "executeFormBotFieldAttributeNotFound"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); // Create a file in targetIrodsCollection1 - dataTransferOperations.putOperation(TEST_FILE_NAME, - targetIrodsCollection, + dataTransferOperations.putOperation(TEST_FILE_NAME, targetIrodsCollection, irodsAccount.getDefaultStorageResource(), null, null); String testFileNameFQ = targetIrodsCollection + '/' + TEST_FILE_NOPATH; - String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"" - + uuid.toString() + "bogus\",\n\t\"pathToObject\":\"" - + testFileNameFQ + "\"}"; + String fieldJson = "{\n\t\"value\":\"15\",\n\t\"fieldUniqueName\":\"" + uuid.toString() + + "bogus\",\n\t\"pathToObject\":\"" + testFileNameFQ + "\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.executeFormBotField(fieldJson); - Assert.assertFalse( - "executeFormBotField should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("executeFormBotField should not have returned empty string", returnString.isEmpty()); - FormBotExecutionResult returnResult = objectMapper.readValue( - returnString, FormBotExecutionResult.class); + FormBotExecutionResult returnResult = objectMapper.readValue(returnString, FormBotExecutionResult.class); - Assert.assertEquals( - "executeFormBotField should have returned an error", - FormBotExecutionEnum.ERROR, returnResult.getCode()); + Assert.assertEquals("executeFormBotField should have returned an error", FormBotExecutionEnum.ERROR, + returnResult.getCode()); // FormBotExecutionResult returnResult = formBotService // .executeFormBotField(fieldJson); @@ -813,67 +647,50 @@ public void executeFormBotFieldAttributeNotFound() throws Exception { public void executeFormBotFieldValidationFailed() throws Exception { String testDirName = "executeFormBotFieldValidationFailed"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); // Create a file in targetIrodsCollection1 - dataTransferOperations.putOperation(TEST_FILE_NAME, - targetIrodsCollection, + dataTransferOperations.putOperation(TEST_FILE_NAME, targetIrodsCollection, irodsAccount.getDefaultStorageResource(), null, null); String testFileNameFQ = targetIrodsCollection + '/' + TEST_FILE_NOPATH; - String fieldJson = "{\n\t\"value\":\"bogus\",\n\t\"fieldUniqueName\":\"" - + uuid.toString() - + "attribute2\",\n\t\"pathToObject\":\"" - + testFileNameFQ + "\"}"; + String fieldJson = "{\n\t\"value\":\"bogus\",\n\t\"fieldUniqueName\":\"" + uuid.toString() + + "attribute2\",\n\t\"pathToObject\":\"" + testFileNameFQ + "\"}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.executeFormBotField(fieldJson); - Assert.assertFalse( - "executeFormBotField should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("executeFormBotField should not have returned empty string", returnString.isEmpty()); - FormBotExecutionResult returnResult = objectMapper.readValue( - returnString, FormBotExecutionResult.class); + FormBotExecutionResult returnResult = objectMapper.readValue(returnString, FormBotExecutionResult.class); Assert.assertEquals( "executeFormBotField should have returned VALIDATION_FAILED, because value is not convertible to integer", @@ -883,7 +700,8 @@ public void executeFormBotFieldValidationFailed() throws Exception { // .executeFormBotField(fieldJson); // // Assert.assertEquals( - // "validateFormBotField should have returned VALIDATION_FAILED, because value is not convertible to integer", + // "validateFormBotField should have returned VALIDATION_FAILED, because + // value is not convertible to integer", // FormBotExecutionEnum.VALIDATION_FAILED, returnResult.getCode()); } @@ -891,74 +709,57 @@ public void executeFormBotFieldValidationFailed() throws Exception { public void executeFormBotFieldValidationSuccess() throws Exception { String testDirName = "executeFormBotFieldValidationSuccess"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); // Create a file in targetIrodsCollection1 - dataTransferOperations.putOperation(TEST_FILE_NAME, - targetIrodsCollection, + dataTransferOperations.putOperation(TEST_FILE_NAME, targetIrodsCollection, irodsAccount.getDefaultStorageResource(), null, null); String testFileNameFQ = targetIrodsCollection + '/' + TEST_FILE_NOPATH; - String fieldJson = "{\n\t\"value\":\"42\",\n\t\"fieldUniqueName\":\"" - + uuid.toString() + "attribute2\",\n\t\"pathToObject\":\"" - + testFileNameFQ + "\"}"; + String fieldJson = "{\n\t\"value\":\"42\",\n\t\"fieldUniqueName\":\"" + uuid.toString() + + "attribute2\",\n\t\"pathToObject\":\"" + testFileNameFQ + "\"}"; ; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); // FormBotExecutionResult returnResult = formBotService // .executeFormBotField(fieldJson); String returnString = formBotService.executeFormBotField(fieldJson); - Assert.assertFalse( - "executeFormBotField should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("executeFormBotField should not have returned empty string", returnString.isEmpty()); - FormBotExecutionResult returnResult = objectMapper.readValue( - returnString, FormBotExecutionResult.class); + FormBotExecutionResult returnResult = objectMapper.readValue(returnString, FormBotExecutionResult.class); - List fileAvus = accessObjectFactory - .getDataObjectAO(irodsAccount).findMetadataValuesForDataObject( - targetIrodsCollection, TEST_FILE_NOPATH); + List fileAvus = accessObjectFactory.getDataObjectAO(irodsAccount) + .findMetadataValuesForDataObject(targetIrodsCollection, TEST_FILE_NOPATH); String attribute2Value = ""; for (MetaDataAndDomainData avu : fileAvus) { @@ -968,75 +769,57 @@ public void executeFormBotFieldValidationSuccess() throws Exception { } } - Assert.assertEquals( - "validateFormBotField should have returned SUCCESS", - FormBotExecutionEnum.SUCCESS, returnResult.getCode()); - Assert.assertEquals( - "executeFormBotField should have set metadata on file", "42", - attribute2Value); + Assert.assertEquals("validateFormBotField should have returned SUCCESS", FormBotExecutionEnum.SUCCESS, + returnResult.getCode()); + Assert.assertEquals("executeFormBotField should have set metadata on file", "42", attribute2Value); } @Test public void validateFormBotFormBadJson() throws Exception { String testDirName = "validateFormBotFormBadJson"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); String formJson = "{\"broken\" : \"WhereItLives\", \"fields\" : [ {\"fieldName\" : \"NameOfField\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"NameOfField\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"NameOfField\", \"value\" : \"MyValue\"}]}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.validateFormBotForm(formJson); - Assert.assertFalse( - "validateFormBotForm should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("validateFormBotForm should not have returned empty string", returnString.isEmpty()); List returnResultList = Arrays - .asList(objectMapper.readValue(returnString, - FormBotValidationResult[].class)); + .asList(objectMapper.readValue(returnString, FormBotValidationResult[].class)); - Assert.assertEquals( - "validateFormBotForm should have returned an error", - FormBotValidationEnum.ERROR, returnResultList.get(0).getCode()); + Assert.assertEquals("validateFormBotForm should have returned an error", FormBotValidationEnum.ERROR, + returnResultList.get(0).getCode()); // List returnResult = formBotService // .validateFormBotForm(fieldJson); @@ -1050,69 +833,50 @@ public void validateFormBotFormBadJson() throws Exception { public void validateFormBotFormValidationFailed() throws Exception { String testDirName = "validateFormBotFormValidationFailed"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); - String formJson = "{\"formUniqueName\" : \"" - + uuid.toString() + String formJson = "{\"formUniqueName\" : \"" + uuid.toString() + "\", \"fields\" : [ {\"fieldName\" : \"attribute1\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"attribute2\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"optional1\", \"value\" : \"MyValue\"}]}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.validateFormBotForm(formJson); - Assert.assertFalse( - "validateFormBotForm should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("validateFormBotForm should not have returned empty string", returnString.isEmpty()); List returnResultList = Arrays - .asList(objectMapper.readValue(returnString, - FormBotValidationResult[].class)); + .asList(objectMapper.readValue(returnString, FormBotValidationResult[].class)); - Assert.assertEquals( - "validateFormBotForm return list should have 4 elements", 4, - returnResultList.size()); - Assert.assertEquals( - "validateFormBotForm overall return value should be FAILURE", - FormBotValidationEnum.FAILURE, returnResultList.get(0) - .getCode()); + Assert.assertEquals("validateFormBotForm return list should have 4 elements", 4, returnResultList.size()); + Assert.assertEquals("validateFormBotForm overall return value should be FAILURE", FormBotValidationEnum.FAILURE, + returnResultList.get(0).getCode()); // List returnResult = formBotService // .validateFormBotForm(fieldJson); @@ -1129,69 +893,50 @@ public void validateFormBotFormValidationFailed() throws Exception { public void validateFormBotFormValidationSuccess() throws Exception { String testDirName = "validateFormBotFormValidationSuccess"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); - String formJson = "{\"formUniqueName\" : \"" - + uuid.toString() + String formJson = "{\"formUniqueName\" : \"" + uuid.toString() + "\", \"fields\" : [ {\"fieldName\" : \"attribute1\", \"value\" : \"hello\"}, {\"fieldName\" : \"attribute2\", \"value\" : \"42\"}, {\"fieldName\" : \"optional1\", \"value\" : \"MyValue\"}]}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.validateFormBotForm(formJson); - Assert.assertFalse( - "validateFormBotForm should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("validateFormBotForm should not have returned empty string", returnString.isEmpty()); List returnResultList = Arrays - .asList(objectMapper.readValue(returnString, - FormBotValidationResult[].class)); + .asList(objectMapper.readValue(returnString, FormBotValidationResult[].class)); - Assert.assertEquals( - "validateFormBotForm return list should have 4 elements", 4, - returnResultList.size()); - Assert.assertEquals( - "validateFormBotForm overall return value should be SUCCESS", - FormBotValidationEnum.SUCCESS, returnResultList.get(0) - .getCode()); + Assert.assertEquals("validateFormBotForm return list should have 4 elements", 4, returnResultList.size()); + Assert.assertEquals("validateFormBotForm overall return value should be SUCCESS", FormBotValidationEnum.SUCCESS, + returnResultList.get(0).getCode()); // List returnResult = formBotService // .validateFormBotForm(fieldJson); @@ -1208,62 +953,48 @@ public void validateFormBotFormValidationSuccess() throws Exception { public void executeFormBotFormBadJson() throws Exception { String testDirName = "executeFormBotFormBadJson"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); String formJson = "{\"broken\" : \"WhereItLives\", \"pathToObject\" : \"path\\to\\file\", \"fields\" : [ {\"fieldName\" : \"NameOfField\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"NameOfField\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"NameOfField\", \"value\" : \"MyValue\"}]}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.executeFormBotForm(formJson); - - Assert.assertFalse( - "executeFormBotForm should not have returned empty string", - returnString.isEmpty()); + + Assert.assertFalse("executeFormBotForm should not have returned empty string", returnString.isEmpty()); List returnResultList = Arrays - .asList(objectMapper.readValue(returnString, - FormBotExecutionResult[].class)); + .asList(objectMapper.readValue(returnString, FormBotExecutionResult[].class)); - Assert.assertEquals("executeFormBotForm should have returned an error", - FormBotExecutionEnum.ERROR, returnResultList.get(0).getCode()); + Assert.assertEquals("executeFormBotForm should have returned an error", FormBotExecutionEnum.ERROR, + returnResultList.get(0).getCode()); // List returnResult = formBotService // .executeFormBotForm(fieldJson); @@ -1277,77 +1008,55 @@ public void executeFormBotFormBadJson() throws Exception { public void executeFormBotFormValidationFailed() throws Exception { String testDirName = "executeFormBotFormValidationFailed"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); // Create a file in targetIrodsCollection1 - dataTransferOperations.putOperation(TEST_FILE_NAME, - targetIrodsCollection, + dataTransferOperations.putOperation(TEST_FILE_NAME, targetIrodsCollection, irodsAccount.getDefaultStorageResource(), null, null); String testFileNameFQ = targetIrodsCollection + '/' + TEST_FILE_NOPATH; - String formJson = "{\"formUniqueName\" : \"" - + uuid.toString() - + "\", \"pathToObject\" : \"" - + testFileNameFQ + String formJson = "{\"formUniqueName\" : \"" + uuid.toString() + "\", \"pathToObject\" : \"" + testFileNameFQ + "\", \"fields\" : [ {\"fieldName\" : \"attribute1\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"attribute2\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"optional1\", \"value\" : \"MyValue\"}]}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); String returnString = formBotService.executeFormBotForm(formJson); - Assert.assertFalse( - "executeFormBotForm should not have returned empty string", - returnString.isEmpty()); + Assert.assertFalse("executeFormBotForm should not have returned empty string", returnString.isEmpty()); List returnResultList = Arrays - .asList(objectMapper.readValue(returnString, - FormBotExecutionResult[].class)); + .asList(objectMapper.readValue(returnString, FormBotExecutionResult[].class)); - Assert.assertEquals( - "executeFormBotForm return list should have 4 elements", 4, - returnResultList.size()); - Assert.assertEquals( - "executeFormBotForm overall return value should be VALIDATION_FAILED", - FormBotExecutionEnum.VALIDATION_FAILED, returnResultList.get(0) - .getCode()); + Assert.assertEquals("executeFormBotForm return list should have 4 elements", 4, returnResultList.size()); + Assert.assertEquals("executeFormBotForm overall return value should be VALIDATION_FAILED", + FormBotExecutionEnum.VALIDATION_FAILED, returnResultList.get(0).getCode()); // List returnResult = formBotService // .executeFormBotForm(fieldJson); @@ -1356,7 +1065,8 @@ public void executeFormBotFormValidationFailed() throws Exception { // "executeFormBotForm return list should have 4 elements", 4, // returnResult.size()); // Assert.assertEquals( - // "validateFormBotForm overall return value should be VALIDATION_FAILED", + // "validateFormBotForm overall return value should be + // VALIDATION_FAILED", // FormBotExecutionEnum.VALIDATION_FAILED, returnResult.get(0) // .getCode()); } @@ -1365,84 +1075,61 @@ public void executeFormBotFormValidationFailed() throws Exception { public void executeFormBotFormSuccess() throws Exception { String testDirName = "executeFormBotFormSuccess"; - String targetIrodsCollection = testingPropertiesHelper - .buildIRODSCollectionAbsolutePathFromTestProperties( - testingProperties, IRODS_TEST_SUBDIR_PATH + '/' - + testDirName); + String targetIrodsCollection = testingPropertiesHelper.buildIRODSCollectionAbsolutePathFromTestProperties( + testingProperties, IRODS_TEST_SUBDIR_PATH + '/' + testDirName); - IRODSAccount irodsAccount = testingPropertiesHelper - .buildIRODSAccountFromTestProperties(testingProperties); + IRODSAccount irodsAccount = testingPropertiesHelper.buildIRODSAccountFromTestProperties(testingProperties); - IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem - .getIRODSAccessObjectFactory(); + IRODSAccessObjectFactory accessObjectFactory = irodsFileSystem.getIRODSAccessObjectFactory(); - IRODSFile targetCollectionAsFile = accessObjectFactory - .getIRODSFileFactory(irodsAccount).instanceIRODSFile( - targetIrodsCollection); + IRODSFile targetCollectionAsFile = accessObjectFactory.getIRODSFileFactory(irodsAccount) + .instanceIRODSFile(targetIrodsCollection); targetCollectionAsFile.mkdirs(); - JargonMetadataResolver resolver = new JargonMetadataResolver( - irodsAccount, accessObjectFactory); + JargonMetadataResolver resolver = new JargonMetadataResolver(irodsAccount, accessObjectFactory); - String mdTemplatePath = resolver - .findOrCreateMetadataTemplatesCollection(targetIrodsCollection); + String mdTemplatePath = resolver.findOrCreateMetadataTemplatesCollection(targetIrodsCollection); - DataTransferOperations dataTransferOperations = irodsFileSystem - .getIRODSAccessObjectFactory().getDataTransferOperations( - irodsAccount); + DataTransferOperations dataTransferOperations = irodsFileSystem.getIRODSAccessObjectFactory() + .getDataTransferOperations(irodsAccount); - dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, - mdTemplatePath, irodsAccount.getDefaultStorageResource(), null, - null); + dataTransferOperations.putOperation(TEMPLATE_FILE_NAME1, mdTemplatePath, + irodsAccount.getDefaultStorageResource(), null, null); String mdTemplateFqName = mdTemplatePath + '/' + TEMPLATE_NOPATH1; UUID uuid = UUID.randomUUID(); - AvuData avuData = AvuData.instance("test1", uuid.toString(), - JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); - accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata( - mdTemplateFqName, avuData); + AvuData avuData = AvuData.instance("test1", uuid.toString(), JargonMetadataTemplateConstants.MD_TEMPLATE_UNIT); + accessObjectFactory.getDataObjectAO(irodsAccount).addAVUMetadata(mdTemplateFqName, avuData); // Create a file in targetIrodsCollection1 - dataTransferOperations.putOperation(TEST_FILE_NAME, - targetIrodsCollection, + dataTransferOperations.putOperation(TEST_FILE_NAME, targetIrodsCollection, irodsAccount.getDefaultStorageResource(), null, null); String testFileNameFQ = targetIrodsCollection + '/' + TEST_FILE_NOPATH; - String formJson = "{\"formUniqueName\" : \"" - + uuid.toString() - + "\", \"pathToObject\" : \"" - + testFileNameFQ + String formJson = "{\"formUniqueName\" : \"" + uuid.toString() + "\", \"pathToObject\" : \"" + testFileNameFQ + "\", \"fields\" : [ {\"fieldName\" : \"attribute1\", \"value\" : \"MyValue\"}, {\"fieldName\" : \"attribute2\", \"value\" : \"42\"}, {\"fieldName\" : \"optional1\", \"value\" : \"MyValue\"}]}"; - MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService( - accessObjectFactory, irodsAccount); + MetadataTemplateFormBotService formBotService = new MetadataTemplateFormBotService(accessObjectFactory, + irodsAccount); + + // List returnResult = formBotService + // .executeFormBotForm(fieldJson); -// List returnResult = formBotService -// .executeFormBotForm(fieldJson); - String returnString = formBotService.executeFormBotForm(formJson); - - Assert.assertFalse( - "executeFormBotForm should not have returned empty string", - returnString.isEmpty()); + + Assert.assertFalse("executeFormBotForm should not have returned empty string", returnString.isEmpty()); List returnResultList = Arrays - .asList(objectMapper.readValue(returnString, - FormBotExecutionResult[].class)); + .asList(objectMapper.readValue(returnString, FormBotExecutionResult[].class)); - Assert.assertEquals( - "executeFormBotForm return list should have 4 elements", 4, - returnResultList.size()); - Assert.assertEquals( - "executeFormBotForm overall return value should be SUCCESS", - FormBotExecutionEnum.SUCCESS, returnResultList.get(0) - .getCode()); + Assert.assertEquals("executeFormBotForm return list should have 4 elements", 4, returnResultList.size()); + Assert.assertEquals("executeFormBotForm overall return value should be SUCCESS", FormBotExecutionEnum.SUCCESS, + returnResultList.get(0).getCode()); - List fileAvus = accessObjectFactory - .getDataObjectAO(irodsAccount).findMetadataValuesForDataObject( - targetIrodsCollection, TEST_FILE_NOPATH); + List fileAvus = accessObjectFactory.getDataObjectAO(irodsAccount) + .findMetadataValuesForDataObject(targetIrodsCollection, TEST_FILE_NOPATH); String attribute2Value = ""; for (MetaDataAndDomainData avu : fileAvus) { @@ -1452,9 +1139,7 @@ public void executeFormBotFormSuccess() throws Exception { } } - Assert.assertEquals( - "executeFormBotForm should have set metadata on file", "42", - attribute2Value); + Assert.assertEquals("executeFormBotForm should have set metadata on file", "42", attribute2Value); } }