From b6d2784429ec162eb03f9d92328d4827d1bc02f9 Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Mon, 11 Jan 2010 09:16:00 +0000 Subject: [PATCH] NOJIRA - Cleaning up weird cruft. --- .../importer/PersonAuthorityBaseImport.java | 323 --------- .../organization/client/sample/Sample.java | 622 ------------------ 2 files changed, 945 deletions(-) delete mode 100644 services/person/import/src/main/java/org/collectionspace/services/organization/importer/PersonAuthorityBaseImport.java delete mode 100644 services/person/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java diff --git a/services/person/import/src/main/java/org/collectionspace/services/organization/importer/PersonAuthorityBaseImport.java b/services/person/import/src/main/java/org/collectionspace/services/organization/importer/PersonAuthorityBaseImport.java deleted file mode 100644 index 01bfa75a5..000000000 --- a/services/person/import/src/main/java/org/collectionspace/services/organization/importer/PersonAuthorityBaseImport.java +++ /dev/null @@ -1,323 +0,0 @@ -/** - * This document is a part of the source code and related artifacts - * for CollectionSpace, an open source collections management system - * for museums and related institutions: - * - * http://www.collectionspace.org - * http://wiki.collectionspace.org - * - * Copyright (c)) 2009 Regents of the University of California - * - * Licensed under the Educational Community License (ECL), Version 2.0. - * You may not use this file except in compliance with this License. - * - * You may obtain a copy of the ECL 2.0 License at - * https://source.collectionspace.org/collection-space/LICENSE.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.collectionspace.services.person.importer; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; - -import org.apache.log4j.BasicConfigurator; -import org.collectionspace.services.PersonJAXBSchema; -import org.collectionspace.services.client.PersonAuthorityClient; -import org.collectionspace.services.client.test.ServiceRequestType; -import org.collectionspace.services.person.PersonauthoritiesCommon; -import org.collectionspace.services.person.PersonsCommon; -import org.jboss.resteasy.client.ClientResponse; -import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; -import org.jboss.resteasy.plugins.providers.multipart.OutputPart; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * PersonAuthorityServiceTest, carries out tests against a - * deployed and running PersonAuthority Service. - * - * $LastChangedRevision: 753 $ - * $LastChangedDate: 2009-09-23 11:03:36 -0700 (Wed, 23 Sep 2009) $ - */ -public class PersonAuthorityBaseImport { - private static final Logger logger = - LoggerFactory.getLogger(PersonAuthorityBaseImport.class); - - // Instance variables specific to this test. - private PersonAuthorityClient client = new PersonAuthorityClient(); - final String SERVICE_PATH_COMPONENT = "personauthorities"; - final String ITEM_SERVICE_PATH_COMPONENT = "items"; - - public void createPersonAuthority(String personAuthorityName, - List> personMaps ) { - - // Expected status code: 201 Created - int EXPECTED_STATUS_CODE = Response.Status.CREATED.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.CREATE; - - if(logger.isDebugEnabled()){ - logger.debug("Import: Create personAuthority: \"" + personAuthorityName +"\""); - } - String basePersonRefName = createPersonAuthRefName(personAuthorityName); - String fullPersonRefName = basePersonRefName+"'"+personAuthorityName+"'"; - MultipartOutput multipart = createPersonAuthorityInstance(personAuthorityName, - fullPersonRefName); - ClientResponse res = client.create(multipart); - - int statusCode = res.getStatus(); - - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not create enumeration: \""+personAuthorityName - +"\" "+ invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when creating enumeration: \"" - +personAuthorityName +"\", Status:"+ statusCode); - } - - // Store the ID returned from this create operation - // for additional tests below. - String newPersonAuthorityId = extractId(res); - if(logger.isDebugEnabled()){ - logger.debug("Import: Created personAuthorityulary: \"" + personAuthorityName +"\" ID:" - +newPersonAuthorityId ); - } - for(Map personMap : personMaps){ - createItemInAuthority(newPersonAuthorityId, basePersonRefName, personMap); - } - } - - private String createItemInAuthority(String vcsid, - String personAuthorityRefName, Map personMap) { - // Expected status code: 201 Created - int EXPECTED_STATUS_CODE = Response.Status.CREATED.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.CREATE; - String foreName = personMap.get(PersonJAXBSchema.FORE_NAME); - String middleName = personMap.get(PersonJAXBSchema.MIDDLE_NAME); - String surName = personMap.get(PersonJAXBSchema.SUR_NAME); - String birthDate = personMap.get(PersonJAXBSchema.BIRTH_DATE); - String deathDate = personMap.get(PersonJAXBSchema.DEATH_DATE); - StringBuilder builtName = new StringBuilder(); - if(foreName!=null) - builtName.append(foreName); - if(middleName!=null) - builtName.append(middleName); - if(surName!=null) - builtName.append(surName); - if(birthDate!=null) - builtName.append(birthDate); - builtName.append("-"); - if(deathDate!=null) - builtName.append(deathDate); - String refName = createPersonRefName(personAuthorityRefName, builtName.toString()); - - if(logger.isDebugEnabled()){ - logger.debug("Import: Create Item: \""+builtName.toString() - +"\" in personAuthorityulary: \"" + personAuthorityRefName +"\""); - } - MultipartOutput multipart = createPersonInstance( vcsid, refName, - personMap ); - ClientResponse res = client.createItem(vcsid, multipart); - - int statusCode = res.getStatus(); - - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not create Item: \""+refName - +"\" in personAuthority: \"" + personAuthorityRefName - +"\" "+ invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when creating Item: \""+refName - +"\" in personAuthority: \"" + personAuthorityRefName +"\", Status:"+ statusCode); - } - - return extractId(res); - } - - // --------------------------------------------------------------- - // Utility methods used by methods above - // --------------------------------------------------------------- - - private MultipartOutput createPersonAuthorityInstance( - String displayName, String refName ) { - PersonauthoritiesCommon personAuthority = new PersonauthoritiesCommon(); - personAuthority.setDisplayName(displayName); - personAuthority.setRefName(refName); - personAuthority.setVocabType("PersonAuthority"); - MultipartOutput multipart = new MultipartOutput(); - OutputPart commonPart = multipart.addPart(personAuthority, MediaType.APPLICATION_XML_TYPE); - commonPart.getHeaders().add("label", client.getCommonPartName()); - - if(logger.isDebugEnabled()){ - logger.debug("to be created, personAuthority common ", - personAuthority, PersonauthoritiesCommon.class); - } - - return multipart; - } - - private MultipartOutput createPersonInstance(String inAuthority, - String refName, Map personInfo ) { - /* - String foreName, String middleName, String lastName, - String initials, String salutations, String title, String nameAdditions, - String birthDate, String deathDate, String birthPlace, String deathPlace, - String group, String nationality, String gender, String occupation, - String schoolOrStyle, String bioNote, String nameNote ) { - */ - PersonsCommon person = new PersonsCommon(); - person.setInAuthority(inAuthority); - person.setRefName(refName); - String value = null; - if((value = (String)personInfo.get(PersonJAXBSchema.FORE_NAME))!=null) - person.setForeName(value); - if((value = (String)personInfo.get(PersonJAXBSchema.MIDDLE_NAME))!=null) - person.setMiddleName(value); - if((value = (String)personInfo.get(PersonJAXBSchema.SUR_NAME))!=null) - person.setSurName(value); - if((value = (String)personInfo.get(PersonJAXBSchema.INITIALS))!=null) - person.setInitials(value); - if((value = (String)personInfo.get(PersonJAXBSchema.SALUTATIONS))!=null) - person.setSalutation(value); - if((value = (String)personInfo.get(PersonJAXBSchema.TITLE))!=null) - person.setTitle(value); - if((value = (String)personInfo.get(PersonJAXBSchema.NAME_ADDITIONS))!=null) - person.setNameAdditions(value); - if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_DATE))!=null) - person.setBirthDate(value); - if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_DATE))!=null) - person.setDeathDate(value); - if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_PLACE))!=null) - person.setBirthPlace(value); - if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_PLACE))!=null) - person.setDeathPlace(value); - if((value = (String)personInfo.get(PersonJAXBSchema.GROUP))!=null) - person.setGroup(value); - if((value = (String)personInfo.get(PersonJAXBSchema.NATIONALITY))!=null) - person.setNationality(value); - if((value = (String)personInfo.get(PersonJAXBSchema.GENDER))!=null) - person.setGender(value); - if((value = (String)personInfo.get(PersonJAXBSchema.OCCUPATION))!=null) - person.setOccupation(value); - if((value = (String)personInfo.get(PersonJAXBSchema.SCHOOL_OR_STYLE))!=null) - person.setSchoolOrStyle(value); - if((value = (String)personInfo.get(PersonJAXBSchema.BIO_NOTE))!=null) - person.setBioNote(value); - if((value = (String)personInfo.get(PersonJAXBSchema.NAME_NOTE))!=null) - person.setNameNote(value); - MultipartOutput multipart = new MultipartOutput(); - OutputPart commonPart = multipart.addPart(person, - MediaType.APPLICATION_XML_TYPE); - commonPart.getHeaders().add("label", client.getItemCommonPartName()); - - if(logger.isDebugEnabled()){ - logger.debug("to be created, person common"+person); - } - - return multipart; - } - - - /** - * Returns an error message indicating that the status code returned by a - * specific call to a service does not fall within a set of valid status - * codes for that service. - * - * @param serviceRequestType A type of service request (e.g. CREATE, DELETE). - * - * @param statusCode The invalid status code that was returned in the response, - * from submitting that type of request to the service. - * - * @return An error message. - */ - protected String invalidStatusCodeMessage(ServiceRequestType requestType, int statusCode) { - return "Status code '" + statusCode + "' in response is NOT within the expected set: " + - requestType.validStatusCodesAsString(); - } - - protected String extractId(ClientResponse res) { - MultivaluedMap mvm = res.getMetadata(); - String uri = (String) ((ArrayList) mvm.get("Location")).get(0); - if(logger.isDebugEnabled()){ - logger.debug("extractId:uri=" + uri); - } - String[] segments = uri.split("/"); - String id = segments[segments.length - 1]; - if(logger.isDebugEnabled()){ - logger.debug("id=" + id); - } - return id; - } - - protected String createPersonAuthRefName(String personAuthorityName) { - return "urn:cspace:org.collectionspace.demo:personauthority:name(" - +personAuthorityName+")"; - } - - protected String createPersonRefName( - String personAuthRefName, String personName) { - return personAuthRefName+":person:name("+personName+")"; - } - - public static void main(String[] args) { - - BasicConfigurator.configure(); - logger.info("PersonAuthorityBaseImport starting..."); - - PersonAuthorityBaseImport pabi = new PersonAuthorityBaseImport(); - final String demoPersonAuthorityName = "Demo Person Authority"; - - /* Strings are: - shortName, longName, nameAdditions, contactName, - foundingDate, dissolutionDate, foundingPlace, function, description - */ - Map johnWayneMap = new HashMap(); - johnWayneMap.put(PersonJAXBSchema.FORE_NAME, "John"); - johnWayneMap.put(PersonJAXBSchema.SUR_NAME, "Wayne"); - johnWayneMap.put(PersonJAXBSchema.GENDER, "male"); - johnWayneMap.put(PersonJAXBSchema.BIRTH_DATE, "May 26, 1907"); - johnWayneMap.put(PersonJAXBSchema.BIRTH_PLACE, "Winterset, Iowa"); - johnWayneMap.put(PersonJAXBSchema.DEATH_DATE, "June 11, 1979"); - johnWayneMap.put(PersonJAXBSchema.BIO_NOTE, "born Marion Robert Morrison and better" + - "known by his stage name John Wayne, was an American film actor, director " + - "and producer. He epitomized rugged masculinity and has become an enduring " + - "American icon. He is famous for his distinctive voice, walk and height. " + - "He was also known for his conservative political views and his support in " + - "the 1950s for anti-communist positions."); - Map patrickSchmitzMap = new HashMap(); - patrickSchmitzMap.put(PersonJAXBSchema.FORE_NAME, "Patrick"); - patrickSchmitzMap.put(PersonJAXBSchema.SUR_NAME, "Schmitz"); - patrickSchmitzMap.put(PersonJAXBSchema.GENDER, "male"); - patrickSchmitzMap.put(PersonJAXBSchema.BIRTH_DATE, "7/15/1960"); - patrickSchmitzMap.put(PersonJAXBSchema.BIRTH_PLACE, "MI"); - Map janeDoeMap = new HashMap(); - janeDoeMap.put(PersonJAXBSchema.FORE_NAME, "Jane"); - janeDoeMap.put(PersonJAXBSchema.SUR_NAME, "Doe"); - janeDoeMap.put(PersonJAXBSchema.GENDER, "female"); - janeDoeMap.put(PersonJAXBSchema.BIRTH_DATE, "7/04/1901"); - janeDoeMap.put(PersonJAXBSchema.DEATH_DATE, "4/01/1999"); - janeDoeMap.put(PersonJAXBSchema.BIRTH_PLACE, "Anytown, USA"); - janeDoeMap.put(PersonJAXBSchema.BIRTH_PLACE, "Nowheresville, USA"); - List> personsMaps = - Arrays.asList(johnWayneMap, patrickSchmitzMap, janeDoeMap ); - - pabi.createPersonAuthority(demoPersonAuthorityName, personsMaps); - - logger.info("PersonAuthorityBaseImport complete."); - } -} diff --git a/services/person/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java b/services/person/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java deleted file mode 100644 index 5c807abe9..000000000 --- a/services/person/sample/sample/src/main/java/org/collectionspace/services/organization/client/sample/Sample.java +++ /dev/null @@ -1,622 +0,0 @@ -/** - * This document is a part of the source code and related artifacts - * for CollectionSpace, an open source collections management system - * for museums and related institutions: - * - * http://www.collectionspace.org - * http://wiki.collectionspace.org - * - * Copyright (c)) 2009 Regents of the University of California - * - * Licensed under the Educational Community License (ECL), Version 2.0. - * You may not use this file except in compliance with this License. - * - * You may obtain a copy of the ECL 2.0 License at - * https://source.collectionspace.org/collection-space/LICENSE.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.collectionspace.services.person.client.sample; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; - -import org.apache.log4j.BasicConfigurator; -import org.collectionspace.services.PersonJAXBSchema; -import org.collectionspace.services.client.PersonAuthorityClient; -import org.collectionspace.services.client.test.ServiceRequestType; -import org.collectionspace.services.person.PersonauthoritiesCommon; -import org.collectionspace.services.person.PersonauthoritiesCommonList; -import org.collectionspace.services.person.PersonsCommon; -import org.collectionspace.services.person.PersonsCommonList; -import org.jboss.resteasy.client.ClientResponse; -import org.jboss.resteasy.plugins.providers.multipart.MultipartInput; -import org.jboss.resteasy.plugins.providers.multipart.MultipartOutput; -import org.jboss.resteasy.plugins.providers.multipart.InputPart; -import org.jboss.resteasy.plugins.providers.multipart.OutputPart; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * PersonAuthority Sample, carries out tests against a - * deployed and running PersonAuthority Service. - * - * $LastChangedRevision: 1055 $ - * $LastChangedDate: 2009-12-09 12:25:15 -0800 (Wed, 09 Dec 2009) $ - */ -public class Sample { - private static final Logger logger = - LoggerFactory.getLogger(Sample.class); - - // Instance variables specific to this test. - private PersonAuthorityClient client = new PersonAuthorityClient(); - final String SERVICE_PATH_COMPONENT = "persons"; - final String ITEM_SERVICE_PATH_COMPONENT = "items"; - - - // --------------------------------------------------------------- - // Create - // --------------------------------------------------------------- - - public void createPersonAuthority(String personAuthorityName, - List> personMaps ) { - - // Expected status code: 201 Created - int EXPECTED_STATUS_CODE = Response.Status.CREATED.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.CREATE; - - logger.info("Import: Create personAuthority: \"" + personAuthorityName +"\""); - String basePersonRefName = createPersonAuthRefName(personAuthorityName); - String fullPersonRefName = basePersonRefName+"'"+personAuthorityName+"'"; - MultipartOutput multipart = createPersonAuthorityInstance(personAuthorityName, - fullPersonRefName ); - ClientResponse res = client.create(multipart); - - int statusCode = res.getStatus(); - - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not create enumeration: \""+personAuthorityName - +"\" "+ invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when creating enumeration: \"" - +personAuthorityName +"\", Status:"+ statusCode); - } - - // Store the ID returned from this create operation - // for additional tests below. - String newPersonAuthId = extractId(res); - logger.info("Import: Created personAuthority: \"" + personAuthorityName +"\" ID:" - +newPersonAuthId ); - - // Add items to the personAuthority - for(Map personMap : personMaps){ - createItemInAuthority(newPersonAuthId, basePersonRefName, personMap); - } - - } - - private String createItemInAuthority(String vcsid, - String personAuthorityRefName, Map personMap) { - // Expected status code: 201 Created - int EXPECTED_STATUS_CODE = Response.Status.CREATED.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.CREATE; - String foreName = personMap.get(PersonJAXBSchema.FORE_NAME); - String middleName = personMap.get(PersonJAXBSchema.MIDDLE_NAME); - String surName = personMap.get(PersonJAXBSchema.SUR_NAME); - String birthDate = personMap.get(PersonJAXBSchema.BIRTH_DATE); - String deathDate = personMap.get(PersonJAXBSchema.DEATH_DATE); - StringBuilder builtName = new StringBuilder(); - if(foreName!=null) - builtName.append(foreName); - if(middleName!=null) - builtName.append(middleName); - if(surName!=null) - builtName.append(surName); - if(birthDate!=null) - builtName.append(birthDate); - builtName.append("-"); - if(deathDate!=null) - builtName.append(deathDate); - String refName = createPersonRefName(personAuthorityRefName, builtName.toString()); - logger.info("Import: Create Item: \""+refName+"\" in personAuthority: \"" + personAuthorityRefName +"\""); - - if(logger.isDebugEnabled()){ - logger.debug("Import: Create Item: \""+builtName.toString() - +"\" in personAuthorityulary: \"" + personAuthorityRefName +"\""); - } - MultipartOutput multipart = createPersonInstance( vcsid, refName, - personMap ); - ClientResponse res = client.createItem(vcsid, multipart); - - int statusCode = res.getStatus(); - - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not create Item: \""+refName - +"\" in personAuthority: \"" + personAuthorityRefName - +"\" "+ invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when creating Item: \""+refName - +"\" in personAuthority: \"" + personAuthorityRefName +"\", Status:"+ statusCode); - } - - return extractId(res); - } - - - // --------------------------------------------------------------- - // Read - // --------------------------------------------------------------- - - private PersonauthoritiesCommonList readPersonAuthorities() { - - // Expected status code: 200 OK - int EXPECTED_STATUS_CODE = Response.Status.OK.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.READ; - - // Submit the request to the service and store the response. - ClientResponse res = client.readList(); - PersonauthoritiesCommonList list = res.getEntity(); - - int statusCode = res.getStatus(); - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not read list of personAuthorities: " - + invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when reading " + - "list of personAuthorities, Status:"+ statusCode); - } - - return list; - } - - private List readPersonAuthorityIds(PersonauthoritiesCommonList list) { - - List ids = new ArrayList(); - List personAuthorities = - list.getPersonauthorityListItem(); - for (PersonauthoritiesCommonList.PersonauthorityListItem personAuthority : personAuthorities) { - ids.add(personAuthority.getCsid()); - } - return ids; - } - - private PersonauthoritiesCommon readPersonAuthority(String personAuthId) { - - // Expected status code: 200 OK - int EXPECTED_STATUS_CODE = Response.Status.OK.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.READ; - - // Submit the request to the service and store the response. - PersonauthoritiesCommon personAuthority = null; - try { - ClientResponse res = client.read(personAuthId); - int statusCode = res.getStatus(); - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not read personAuthority" - + invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when reading " + - "personAuthority, Status:"+ statusCode); - } - MultipartInput input = (MultipartInput) res.getEntity(); - personAuthority = (PersonauthoritiesCommon) extractPart(input, - client.getCommonPartName(), PersonauthoritiesCommon.class); - } catch (Exception e) { - throw new RuntimeException("Could not read personAuthority: ", e); - } - - return personAuthority; - } - - private PersonsCommonList readItemsInPersonAuth(String personAuthId) { - - // Expected status code: 200 OK - int EXPECTED_STATUS_CODE = Response.Status.OK.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.READ; - - // Submit the request to the service and store the response. - ClientResponse res = - client.readItemList(personAuthId); - PersonsCommonList list = res.getEntity(); - - int statusCode = res.getStatus(); - - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not read items in personAuthority: " - + invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when reading " + - "items in personAuthority, Status:"+ statusCode); - } - - return list; - } - - private List readPersonIds(PersonsCommonList list) { - - List ids = new ArrayList(); - List items = - list.getPersonListItem(); - for (PersonsCommonList.PersonListItem item : items) { - ids.add(item.getCsid()); - } - return ids; - } - - // --------------------------------------------------------------- - // Delete - // --------------------------------------------------------------- - - private void deletePersonAuthority(String vcsid) { - // Expected status code: 200 OK - int EXPECTED_STATUS_CODE = Response.Status.OK.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.DELETE; - - ClientResponse res = client.delete(vcsid); - int statusCode = res.getStatus(); - - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not delete personAuthority: " - + invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when deleting " + - "personAuthority, Status:"+ statusCode); - } - } - - private void deleteAllPersonAuthorities() { - List ids = readPersonAuthorityIds(readPersonAuthorities()); - for (String id : ids) { - deletePersonAuthority(id); - } - } - - private void deletePerson(String vcsid, String itemcsid) { - // Expected status code: 200 OK - int EXPECTED_STATUS_CODE = Response.Status.OK.getStatusCode(); - // Type of service request being tested - ServiceRequestType REQUEST_TYPE = ServiceRequestType.DELETE; - - ClientResponse res = client.deleteItem(vcsid, itemcsid); - int statusCode = res.getStatus(); - - if(!REQUEST_TYPE.isValidStatusCode(statusCode)) { - throw new RuntimeException("Could not delete personAuthority item: " - + invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - } - if(statusCode != EXPECTED_STATUS_CODE) { - throw new RuntimeException("Unexpected Status when deleting " + - "personAuthority item, Status:"+ statusCode); - } - } - - private void deleteAllItemsForPersonAuth(String personAuthId) { - List itemIds = readPersonIds(readItemsInPersonAuth(personAuthId)); - for (String itemId : itemIds) { - deletePerson(personAuthId, itemId); - } - } - - // --------------------------------------------------------------- - // Utility methods used by tests above - // --------------------------------------------------------------- - - private MultipartOutput createPersonAuthorityInstance( - String displayName, String refName ) { - PersonauthoritiesCommon personAuthority = new PersonauthoritiesCommon(); - personAuthority.setDisplayName(displayName); - personAuthority.setRefName(refName); - personAuthority.setVocabType("PersonAuthority"); - MultipartOutput multipart = new MultipartOutput(); - OutputPart commonPart = multipart.addPart(personAuthority, MediaType.APPLICATION_XML_TYPE); - commonPart.getHeaders().add("label", client.getCommonPartName()); - - if(logger.isDebugEnabled()){ - logger.debug("to be created, personAuthority common ", - personAuthority, PersonauthoritiesCommon.class); - } - - return multipart; - } - - private MultipartOutput createPersonInstance(String inAuthority, - String refName, Map personInfo ) { - /* - String foreName, String middleName, String lastName, - String initials, String salutations, String title, String nameAdditions, - String birthDate, String deathDate, String birthPlace, String deathPlace, - String group, String nationality, String gender, String occupation, - String schoolOrStyle, String bioNote, String nameNote ) { - */ - PersonsCommon person = new PersonsCommon(); - person.setInAuthority(inAuthority); - person.setRefName(refName); - String value = null; - if((value = (String)personInfo.get(PersonJAXBSchema.FORE_NAME))!=null) - person.setForeName(value); - if((value = (String)personInfo.get(PersonJAXBSchema.MIDDLE_NAME))!=null) - person.setMiddleName(value); - if((value = (String)personInfo.get(PersonJAXBSchema.SUR_NAME))!=null) - person.setSurName(value); - if((value = (String)personInfo.get(PersonJAXBSchema.INITIALS))!=null) - person.setInitials(value); - if((value = (String)personInfo.get(PersonJAXBSchema.SALUTATIONS))!=null) - person.setSalutation(value); - if((value = (String)personInfo.get(PersonJAXBSchema.TITLE))!=null) - person.setTitle(value); - if((value = (String)personInfo.get(PersonJAXBSchema.NAME_ADDITIONS))!=null) - person.setNameAdditions(value); - if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_DATE))!=null) - person.setBirthDate(value); - if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_DATE))!=null) - person.setDeathDate(value); - if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_PLACE))!=null) - person.setBirthPlace(value); - if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_PLACE))!=null) - person.setDeathPlace(value); - if((value = (String)personInfo.get(PersonJAXBSchema.GROUP))!=null) - person.setGroup(value); - if((value = (String)personInfo.get(PersonJAXBSchema.NATIONALITY))!=null) - person.setNationality(value); - if((value = (String)personInfo.get(PersonJAXBSchema.GENDER))!=null) - person.setGender(value); - if((value = (String)personInfo.get(PersonJAXBSchema.OCCUPATION))!=null) - person.setOccupation(value); - if((value = (String)personInfo.get(PersonJAXBSchema.SCHOOL_OR_STYLE))!=null) - person.setSchoolOrStyle(value); - if((value = (String)personInfo.get(PersonJAXBSchema.BIO_NOTE))!=null) - person.setBioNote(value); - if((value = (String)personInfo.get(PersonJAXBSchema.NAME_NOTE))!=null) - person.setNameNote(value); - MultipartOutput multipart = new MultipartOutput(); - OutputPart commonPart = multipart.addPart(person, - MediaType.APPLICATION_XML_TYPE); - commonPart.getHeaders().add("label", client.getItemCommonPartName()); - - if(logger.isDebugEnabled()){ - logger.debug("to be created, person common"+person); - } - - return multipart; - } - - // Retrieve individual fields of personAuthority records. - - private String displayAllPersonAuthorities(PersonauthoritiesCommonList list) { - StringBuffer sb = new StringBuffer(); - List personAuthorities = - list.getPersonauthorityListItem(); - int i = 0; - for (PersonauthoritiesCommonList.PersonauthorityListItem personAuthority : personAuthorities) { - sb.append("personAuthority [" + i + "]" + "\n"); - sb.append(displayPersonAuthorityDetails(personAuthority)); - i++; - } - return sb.toString(); - } - - private String displayPersonAuthorityDetails( - PersonauthoritiesCommonList.PersonauthorityListItem personAuthority) { - StringBuffer sb = new StringBuffer(); - sb.append("displayName=" + personAuthority.getDisplayName() + "\n"); - sb.append("vocabType=" + personAuthority.getVocabType() + "\n"); - // sb.append("csid=" + personAuthority.getCsid() + "\n"); - sb.append("URI=" + personAuthority.getUri() + "\n"); - return sb.toString(); - } - - // Retrieve individual fields of person records. - - private String displayAllPersons(PersonsCommonList list) { - StringBuffer sb = new StringBuffer(); - List items = - list.getPersonListItem(); - int i = 0; - for (PersonsCommonList.PersonListItem item : items) { - sb.append("person [" + i + "]" + "\n"); - sb.append(displayPersonDetails(item)); - i++; - } - return sb.toString(); - } - - private String displayPersonDetails( - PersonsCommonList.PersonListItem item) { - StringBuffer sb = new StringBuffer(); - sb.append("csid=" + item.getCsid() + "\n"); - sb.append("displayName=" + item.getDisplayName() + "\n"); - // sb.append("URI=" + item.getUri() + "\n"); - return sb.toString(); - } - - private Object extractPart(MultipartInput input, String label, - Class clazz) throws Exception { - Object obj = null; - for(InputPart part : input.getParts()){ - String partLabel = part.getHeaders().getFirst("label"); - if(label.equalsIgnoreCase(partLabel)){ - String partStr = part.getBodyAsString(); - if(logger.isDebugEnabled()){ - logger.debug("extracted part str=\n" + partStr); - } - obj = part.getBody(clazz, null); - if(logger.isDebugEnabled()){ - logger.debug("extracted part obj=\n", obj, clazz); - } - break; - } - } - return obj; - } - - /** - * Returns an error message indicating that the status code returned by a - * specific call to a service does not fall within a set of valid status - * codes for that service. - * - * @param serviceRequestType A type of service request (e.g. CREATE, DELETE). - * - * @param statusCode The invalid status code that was returned in the response, - * from submitting that type of request to the service. - * - * @return An error message. - */ - protected String invalidStatusCodeMessage(ServiceRequestType requestType, int statusCode) { - return "Status code '" + statusCode + "' in response is NOT within the expected set: " + - requestType.validStatusCodesAsString(); - } - - protected String extractId(ClientResponse res) { - MultivaluedMap mvm = res.getMetadata(); - String uri = (String) ((ArrayList) mvm.get("Location")).get(0); - if(logger.isDebugEnabled()){ - logger.info("extractId:uri=" + uri); - } - String[] segments = uri.split("/"); - String id = segments[segments.length - 1]; - if(logger.isDebugEnabled()){ - logger.debug("id=" + id); - } - return id; - } - - protected String createPersonAuthRefName(String personAuthorityName) { - return "urn:cspace:org.collectionspace.demo:personauthority:name(" - +personAuthorityName+")"; - } - - protected String createPersonRefName( - String personAuthRefName, String personName) { - return personAuthRefName+":person:name("+personName+")"; - } - - public static void main(String[] args) { - - // Configure logging. - BasicConfigurator.configure(); - - logger.info("PersonAuthority Sample starting..."); - - Sample sample = new Sample(); - PersonauthoritiesCommonList personAuthorities; - List personAuthIds; - String details = ""; - - // Optionally delete all personAuthorities and persons. - - boolean ENABLE_DELETE_ALL = false; - if (ENABLE_DELETE_ALL) { - - logger.info("Deleting all persons and personAuthorities ..."); - - // For each personAuthority ... - personAuthorities = sample.readPersonAuthorities(); - personAuthIds = sample.readPersonAuthorityIds(personAuthorities); - for (String personAuthId : personAuthIds) { - logger.info("Deleting all persons for personAuthority ..."); - sample.deleteAllItemsForPersonAuth(personAuthId); - logger.info("Deleting personAuthority ..."); - sample.deletePersonAuthority(personAuthId); - } - - logger.info("Reading personAuthorities after deletion ..."); - personAuthorities = sample.readPersonAuthorities(); - details = sample.displayAllPersonAuthorities(personAuthorities); - logger.info(details); - - logger.info("Reading items in each personAuthority after deletion ..."); - personAuthIds = sample.readPersonAuthorityIds(personAuthorities); - for (String personAuthId : personAuthIds) { - PersonsCommonList items = sample.readItemsInPersonAuth(personAuthId); - details = sample.displayAllPersons(items); - logger.info(details); - } - - } - - // Create new authorities, each populated with persons. - - Map johnWayneMap = new HashMap(); - johnWayneMap.put(PersonJAXBSchema.FORE_NAME, "John"); - johnWayneMap.put(PersonJAXBSchema.SUR_NAME, "Wayne"); - johnWayneMap.put(PersonJAXBSchema.GENDER, "male"); - Map patrickSchmitzMap = new HashMap(); - patrickSchmitzMap.put(PersonJAXBSchema.FORE_NAME, "Patrick"); - patrickSchmitzMap.put(PersonJAXBSchema.SUR_NAME, "Schmitz"); - patrickSchmitzMap.put(PersonJAXBSchema.GENDER, "male"); - Map janeDoeMap = new HashMap(); - janeDoeMap.put(PersonJAXBSchema.FORE_NAME, "Jane"); - janeDoeMap.put(PersonJAXBSchema.SUR_NAME, "Doe"); - janeDoeMap.put(PersonJAXBSchema.GENDER, "female"); - List> personsMaps = - Arrays.asList(johnWayneMap, patrickSchmitzMap, janeDoeMap ); - - sample.createPersonAuthority("Sample Person Auth", personsMaps); - - logger.info("PersonAuthority Sample complete."); - - logger.info("Reading personAuthorities and items ..."); - // Get a list of personAuthorities. - personAuthorities = sample.readPersonAuthorities(); - // For each personAuthority ... - for (PersonauthoritiesCommonList.PersonauthorityListItem - personAuthority : personAuthorities.getPersonauthorityListItem()) { - // Get its display name. - logger.info(personAuthority.getDisplayName()); - // Get a list of the persons in this personAuthority. - PersonsCommonList items = - sample.readItemsInPersonAuth(personAuthority.getCsid()); - // For each person ... - for (PersonsCommonList.PersonListItem - item : items.getPersonListItem()) { - // Get its short name. - logger.info(" " + item.getDisplayName()); - } - } - - // Sample alternate methods of reading all personAuthorities and - // persons separately. - boolean RUN_ADDITIONAL_SAMPLES = false; - if (RUN_ADDITIONAL_SAMPLES) { - - logger.info("Reading all personAuthorities ..."); - details = sample.displayAllPersonAuthorities(personAuthorities); - logger.info(details); - - logger.info("Reading all persons ..."); - personAuthIds = sample.readPersonAuthorityIds(personAuthorities); - for (String personAuthId : personAuthIds) { - PersonsCommonList items = sample.readItemsInPersonAuth(personAuthId); - details = sample.displayAllPersons(items); - logger.info(details); - } - - } - - } - -} -- 2.47.3