From a49d9bc8c05bca86e43bcaa4bc69736265351068 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Tue, 15 May 2012 15:37:10 -0700 Subject: [PATCH] CSPACE-5137,CSPACE-5167: On create and update requests, service validator handlers now check whether a termDisplayName is included with each term in the request payload, rather than checking for either a termDisplayName or a termName. --- .../nuxeo/ConceptValidatorHandler.java | 16 ++++++------ .../nuxeo/LocationValidatorHandler.java | 16 ++++++------ .../nuxeo/OrganizationValidatorHandler.java | 16 ++++++------ .../person/nuxeo/PersonValidatorHandler.java | 26 +++++++++---------- .../place/nuxeo/PlaceValidatorHandler.java | 16 ++++++------ .../taxonomy/nuxeo/TaxonValidatorHandler.java | 16 ++++++------ 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java b/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java index 12a758aac..100c4cdd6 100644 --- a/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java +++ b/services/concept/service/src/main/java/org/collectionspace/services/concept/nuxeo/ConceptValidatorHandler.java @@ -45,15 +45,15 @@ public class ConceptValidatorHandler extends ValidatorHandlerImpl { final Logger logger = LoggerFactory.getLogger(ConceptValidatorHandler.class); // 'Bad pattern' for shortIdentifiers matches any non-word characters - private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); //.matcher(input).matches() - private static final String VALIDATION_ERROR = "The record payload was invalid. See log file for more details."; + private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); + private static final String VALIDATION_ERROR = + "The record payload was invalid. See log file for more details."; private static final String SHORT_ID_BAD_CHARS_ERROR = "shortIdentifier must only contain standard word characters"; private static final String HAS_NO_TERMS_ERROR = "Authority items must contain at least one term."; - private static final String HAS_AN_EMPTY_TERM_ERROR = + private static final String TERM_HAS_EMPTY_DISPLAYNAME_ERROR = "Each term group in an authority item must contain " - + "a non-empty term name or " + "a non-empty term display name."; @Override @@ -72,7 +72,7 @@ public class ConceptValidatorHandler extends ValidatorHandlerImpl { CS_ASSERT(shortIdentifierContainsOnlyValidChars(shortId), SHORT_ID_BAD_CHARS_ERROR); } CS_ASSERT(containsAtLeastOneTerm(concept), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(concept), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(concept), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -100,7 +100,7 @@ public class ConceptValidatorHandler extends ValidatorHandlerImpl { // prevented from being changed on an update, and thus // we don't need to check its value here. CS_ASSERT(containsAtLeastOneTerm(concept), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(concept), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(concept), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -134,11 +134,11 @@ public class ConceptValidatorHandler extends ValidatorHandlerImpl { return true; } - private boolean allTermsContainNameOrDisplayName(ConceptsCommon concept) { + private boolean allTermsContainDisplayName(ConceptsCommon concept) { ConceptTermGroupList termGroupList = concept.getConceptTermGroupList(); List termGroups = termGroupList.getConceptTermGroup(); for (ConceptTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java index fd72db9ab..d2dc263ae 100644 --- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java +++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationValidatorHandler.java @@ -45,15 +45,15 @@ public class LocationValidatorHandler extends ValidatorHandlerImpl { final Logger logger = LoggerFactory.getLogger(LocationValidatorHandler.class); // 'Bad pattern' for shortIdentifiers matches any non-word characters - private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); //.matcher(input).matches() - private static final String VALIDATION_ERROR = "The record payload was invalid. See log file for more details."; + private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); + private static final String VALIDATION_ERROR = + "The record payload was invalid. See log file for more details."; private static final String SHORT_ID_BAD_CHARS_ERROR = "shortIdentifier must only contain standard word characters"; private static final String HAS_NO_TERMS_ERROR = "Authority items must contain at least one term."; - private static final String HAS_AN_EMPTY_TERM_ERROR = + private static final String TERM_HAS_EMPTY_DISPLAYNAME_ERROR = "Each term group in an authority item must contain " - + "a non-empty term name or " + "a non-empty term display name."; @Override @@ -72,7 +72,7 @@ public class LocationValidatorHandler extends ValidatorHandlerImpl { CS_ASSERT(shortIdentifierContainsOnlyValidChars(shortId), SHORT_ID_BAD_CHARS_ERROR); } CS_ASSERT(containsAtLeastOneTerm(location), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(location), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(location), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -100,7 +100,7 @@ public class LocationValidatorHandler extends ValidatorHandlerImpl { // prevented from being changed on an update, and thus // we don't need to check its value here. CS_ASSERT(containsAtLeastOneTerm(location), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(location), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(location), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -134,11 +134,11 @@ public class LocationValidatorHandler extends ValidatorHandlerImpl { return true; } - private boolean allTermsContainNameOrDisplayName(LocationsCommon person) { + private boolean allTermsContainDisplayName(LocationsCommon person) { LocTermGroupList termGroupList = person.getLocTermGroupList(); List termGroups = termGroupList.getLocTermGroup(); for (LocTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java index a48aa4899..26ae057cf 100644 --- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java +++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrganizationValidatorHandler.java @@ -45,15 +45,15 @@ public class OrganizationValidatorHandler extends ValidatorHandlerImpl { final Logger logger = LoggerFactory.getLogger(OrganizationValidatorHandler.class); // 'Bad pattern' for shortIdentifiers matches any non-word characters - private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); //.matcher(input).matches() - private static final String VALIDATION_ERROR = "The record payload was invalid. See log file for more details."; + private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); + private static final String VALIDATION_ERROR = + "The record payload was invalid. See log file for more details."; private static final String SHORT_ID_BAD_CHARS_ERROR = "shortIdentifier must only contain standard word characters"; private static final String HAS_NO_TERMS_ERROR = "Authority items must contain at least one term."; - private static final String HAS_AN_EMPTY_TERM_ERROR = + private static final String TERM_HAS_EMPTY_DISPLAYNAME_ERROR = "Each term group in an authority item must contain " - + "a non-empty term name or " + "a non-empty term display name."; @Override @@ -72,7 +72,7 @@ public class OrganizationValidatorHandler extends ValidatorHandlerImpl { CS_ASSERT(shortIdentifierContainsOnlyValidChars(shortId), SHORT_ID_BAD_CHARS_ERROR); } CS_ASSERT(containsAtLeastOneTerm(organization), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(organization), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(organization), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -100,7 +100,7 @@ public class OrganizationValidatorHandler extends ValidatorHandlerImpl { // prevented from being changed on an update, and thus // we don't need to check its value here. CS_ASSERT(containsAtLeastOneTerm(organization), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(organization), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(organization), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -134,11 +134,11 @@ public class OrganizationValidatorHandler extends ValidatorHandlerImpl { return true; } - private boolean allTermsContainNameOrDisplayName(OrganizationsCommon organization) { + private boolean allTermsContainDisplayName(OrganizationsCommon organization) { OrgTermGroupList termGroupList = organization.getOrgTermGroupList(); List termGroups = termGroupList.getOrgTermGroup(); for (OrgTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java index bca6a4fdf..6c80dbe04 100644 --- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java +++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonValidatorHandler.java @@ -44,15 +44,15 @@ public class PersonValidatorHandler extends ValidatorHandlerImpl { final Logger logger = LoggerFactory.getLogger(PersonValidatorHandler.class); // 'Bad pattern' for shortIdentifiers matches any non-word characters - private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); //.matcher(input).matches() - private static final String VALIDATION_ERROR = "The record payload was invalid. See log file for more details."; - private static final String SHORT_ID_BAD_CHARS_MSG = + private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); + private static final String VALIDATION_ERROR = + "The record payload was invalid. See log file for more details."; + private static final String SHORT_ID_BAD_CHARS_ERROR = "shortIdentifier must only contain standard word characters"; - private static final String HAS_NO_TERMS_MSG = + private static final String HAS_NO_TERMS_ERROR = "Authority items must contain at least one term."; - private static final String HAS_AN_EMPTY_TERM_MSG = + private static final String TERM_HAS_EMPTY_DISPLAYNAME_ERROR = "Each term group in an authority item must contain " - + "a non-empty term name or " + "a non-empty term display name."; @Override @@ -68,10 +68,10 @@ public class PersonValidatorHandler extends ValidatorHandlerImpl { try { String shortId = person.getShortIdentifier(); if (shortId != null) { - CS_ASSERT(shortIdentifierContainsOnlyValidChars(shortId), SHORT_ID_BAD_CHARS_MSG); + CS_ASSERT(shortIdentifierContainsOnlyValidChars(shortId), SHORT_ID_BAD_CHARS_ERROR); } - CS_ASSERT(containsAtLeastOneTerm(person), HAS_NO_TERMS_MSG); - CS_ASSERT(allTermsContainNameOrDisplayName(person), HAS_AN_EMPTY_TERM_MSG); + CS_ASSERT(containsAtLeastOneTerm(person), HAS_NO_TERMS_ERROR); + CS_ASSERT(allTermsContainDisplayName(person), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -98,8 +98,8 @@ public class PersonValidatorHandler extends ValidatorHandlerImpl { // shortIdentifier is among a set of fields that are // prevented from being changed on an update, and thus // we don't need to check its value here. - CS_ASSERT(containsAtLeastOneTerm(person), HAS_NO_TERMS_MSG); - CS_ASSERT(allTermsContainNameOrDisplayName(person), HAS_AN_EMPTY_TERM_MSG); + CS_ASSERT(containsAtLeastOneTerm(person), HAS_NO_TERMS_ERROR); + CS_ASSERT(allTermsContainDisplayName(person), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -133,11 +133,11 @@ public class PersonValidatorHandler extends ValidatorHandlerImpl { return true; } - private boolean allTermsContainNameOrDisplayName(PersonsCommon person) { + private boolean allTermsContainDisplayName(PersonsCommon person) { PersonTermGroupList termGroupList = person.getPersonTermGroupList(); List termGroups = termGroupList.getPersonTermGroup(); for (PersonTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java b/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java index 9b330b5e3..e8401602b 100644 --- a/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java +++ b/services/place/service/src/main/java/org/collectionspace/services/place/nuxeo/PlaceValidatorHandler.java @@ -46,15 +46,15 @@ public class PlaceValidatorHandler extends ValidatorHandlerImpl { final Logger logger = LoggerFactory.getLogger(PlaceValidatorHandler.class); // 'Bad pattern' for shortIdentifiers matches any non-word characters - private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); //.matcher(input).matches() - private static final String VALIDATION_ERROR = "The record payload was invalid. See log file for more details."; + private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); + private static final String VALIDATION_ERROR = + "The record payload was invalid. See log file for more details."; private static final String SHORT_ID_BAD_CHARS_ERROR = "shortIdentifier must only contain standard word characters"; private static final String HAS_NO_TERMS_ERROR = "Authority items must contain at least one term."; - private static final String HAS_AN_EMPTY_TERM_ERROR = + private static final String TERM_HAS_EMPTY_DISPLAYNAME_ERROR = "Each term group in an authority item must contain " - + "a non-empty term name or " + "a non-empty term display name."; @Override @@ -73,7 +73,7 @@ public class PlaceValidatorHandler extends ValidatorHandlerImpl { CS_ASSERT(shortIdentifierContainsOnlyValidChars(shortId), SHORT_ID_BAD_CHARS_ERROR); } CS_ASSERT(containsAtLeastOneTerm(place), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(place), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(place), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -101,7 +101,7 @@ public class PlaceValidatorHandler extends ValidatorHandlerImpl { // prevented from being changed on an update, and thus // we don't need to check its value here. CS_ASSERT(containsAtLeastOneTerm(place), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(place), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(place), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -135,11 +135,11 @@ public class PlaceValidatorHandler extends ValidatorHandlerImpl { return true; } - private boolean allTermsContainNameOrDisplayName(PlacesCommon place) { + private boolean allTermsContainDisplayName(PlacesCommon place) { PlaceTermGroupList termGroupList = place.getPlaceTermGroupList(); List termGroups = termGroupList.getPlaceTermGroup(); for (PlaceTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java index 7d455a36c..2849df8f9 100644 --- a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java +++ b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java @@ -45,15 +45,15 @@ public class TaxonValidatorHandler extends ValidatorHandlerImpl { final Logger logger = LoggerFactory.getLogger(TaxonValidatorHandler.class); // 'Bad pattern' for shortIdentifiers matches any non-word characters - private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); //.matcher(input).matches() - private static final String VALIDATION_ERROR = "The record payload was invalid. See log file for more details."; + private static final Pattern SHORT_ID_BAD_PATTERN = Pattern.compile("[\\W]"); + private static final String VALIDATION_ERROR = + "The record payload was invalid. See log file for more details."; private static final String SHORT_ID_BAD_CHARS_ERROR = "shortIdentifier must only contain standard word characters"; private static final String HAS_NO_TERMS_ERROR = "Authority items must contain at least one term."; - private static final String HAS_AN_EMPTY_TERM_ERROR = + private static final String TERM_HAS_EMPTY_DISPLAYNAME_ERROR = "Each term group in an authority item must contain " - + "a non-empty term name or " + "a non-empty term display name."; @Override @@ -72,7 +72,7 @@ public class TaxonValidatorHandler extends ValidatorHandlerImpl { CS_ASSERT(shortIdentifierContainsOnlyValidChars(shortId), SHORT_ID_BAD_CHARS_ERROR); } CS_ASSERT(containsAtLeastOneTerm(organization), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(organization), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(organization), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -100,7 +100,7 @@ public class TaxonValidatorHandler extends ValidatorHandlerImpl { // prevented from being changed on an update, and thus // we don't need to check its value here. CS_ASSERT(containsAtLeastOneTerm(organization), HAS_NO_TERMS_ERROR); - CS_ASSERT(allTermsContainNameOrDisplayName(organization), HAS_AN_EMPTY_TERM_ERROR); + CS_ASSERT(allTermsContainDisplayName(organization), TERM_HAS_EMPTY_DISPLAYNAME_ERROR); } catch (AssertionError e) { if (logger.isErrorEnabled()) { logger.error(e.getMessage(), e); @@ -134,11 +134,11 @@ public class TaxonValidatorHandler extends ValidatorHandlerImpl { return true; } - private boolean allTermsContainNameOrDisplayName(TaxonCommon organization) { + private boolean allTermsContainDisplayName(TaxonCommon organization) { TaxonTermGroupList termGroupList = organization.getTaxonTermGroupList(); List termGroups = termGroupList.getTaxonTermGroup(); for (TaxonTermGroup termGroup : termGroups) { - if (Tools.isBlank(termGroup.getTermName()) && Tools.isBlank(termGroup.getTermDisplayName())) { + if (Tools.isBlank(termGroup.getTermDisplayName())) { return false; } } -- 2.47.3