Skip to content

Commit 0d56de1

Browse files
committed
pr comment - using StringUtils.isBlank() to check if variable is null or empty
1 parent 516c3a5 commit 0d56de1

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/main/java/uk/gov/companieshouse/orders/api/validator/DeliveryDetailsValidator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package uk.gov.companieshouse.orders.api.validator;
22

3+
import org.apache.commons.lang.StringUtils;
34
import org.springframework.stereotype.Component;
45
import uk.gov.companieshouse.orders.api.dto.AddDeliveryDetailsRequestDTO;
56

@@ -17,8 +18,8 @@ public List<String> getValidationErrors(final AddDeliveryDetailsRequestDTO addDe
1718
String postalCode = addDeliveryDetailsRequestDTO.getDeliveryDetails().getPostalCode();
1819
String region = addDeliveryDetailsRequestDTO.getDeliveryDetails().getRegion();
1920

20-
if((postalCode == null || postalCode.isEmpty()) && (region==null || region.isEmpty())) {
21-
errors.add("Post code or Region is required");
21+
if(StringUtils.isBlank(postalCode) && StringUtils.isBlank(region)) {
22+
errors.add("Postcode or Region is required");
2223
}
2324

2425
return errors;

src/test/java/uk/gov/companieshouse/orders/api/validator/DeliveryDetailsValidatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ void postcodeOrRegionIsMandatory() {
4848

4949
final List<String> errors = deliveryDetailsValidator.getValidationErrors(dto);
5050

51-
assertThat(errors, contains("Post code or Region is required"));
51+
assertThat(errors, contains("Postcode or Region is required"));
5252
}
5353
}

0 commit comments

Comments
 (0)