Stared changed to asterisk

src/main/java/scot/carricksoftware/grants/validators/helpers/ValidateTypes.java

@@ -28,7 +28,7 @@ public interface ValidateTypes {
 
     void validateNonNegativeInteger(String integerString, String fieldName, @SuppressWarnings("SameParameterValue") String nullMessage, String formatMessage, String negativeMessage, BindingResult bindingResult);
 
-    void validateNonNegativeStaredInteger(String integerString, String fieldName, @SuppressWarnings("SameParameterValue") String nullMessage, String formatMessage, String negativeMessage, BindingResult bindingResult);
+    void validateNonNegativeAsteriskInteger(String integerString, String fieldName, @SuppressWarnings("SameParameterValue") String nullMessage, String formatMessage, String negativeMessage, BindingResult bindingResult);
 
     void validateIntegerRange(String integerString,
                               Integer lowValue,
@@ -37,7 +37,7 @@ public interface ValidateTypes {
                               String nullMessage, String formatMessage, String rangeMessage,
                               BindingResult bindingResult);
 
-    void validateIntegerStaredRange(String integerString,
+    void validateIntegerAsteriskRange(String integerString,
                               Integer lowValue,
                               Integer highValue,
                               String fieldName, @SuppressWarnings("SameParameterValue")

src/main/java/scot/carricksoftware/grants/validators/helpers/ValidateTypesImpl.java

@@ -78,7 +78,7 @@ public class ValidateTypesImpl implements ValidateTypes {
     }
 
     @Override
-    public void validateNonNegativeStaredInteger(String integerString, String fieldName, String nullMessage, String formatMessage, String negativeMessage, BindingResult bindingResult) {
+    public void validateNonNegativeAsteriskInteger(String integerString, String fieldName, String nullMessage, String formatMessage, String negativeMessage, BindingResult bindingResult) {
         if (integerString != null && !integerString.isEmpty()) {
             int pos = integerString.lastIndexOf('*');
                 if (pos != -1) {
@@ -112,8 +112,9 @@ public class ValidateTypesImpl implements ValidateTypes {
         }
     }
 
+
     @Override
-    public void validateIntegerStaredRange(String integerString,
+    public void validateIntegerAsteriskRange(String integerString,
                                            Integer lowValue, Integer highValue, String fieldName,
                                            String nullMessage, String formatMessage, String rangeMessage,
                                            BindingResult bindingResult) {

src/main/java/scot/carricksoftware/grants/validators/images/AppendixImageCommandValidatorImpl.java

@@ -74,7 +74,7 @@ public class AppendixImageCommandValidatorImpl implements AppendixImageCommandVa
 
     private void validateLevel(String integerString, BindingResult bindingResult) {
         logger.debug("AppendixImageCommandValidator::validateLevel");
-        validateTypes.validateIntegerStaredRange(integerString,
+        validateTypes.validateIntegerAsteriskRange(integerString,
                 ApplicationConstants.LATEX_BOOK,
                 ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,

src/main/java/scot/carricksoftware/grants/validators/images/DocumentImageCommandValidatorImpl.java

@@ -74,7 +74,7 @@ public class DocumentImageCommandValidatorImpl implements DocumentImageCommandVa
 
     private void validateLevel(String integerString, BindingResult bindingResult) {
         logger.debug("AppendixImageCommandValidator::validateLevel");
-        validateTypes.validateIntegerStaredRange(integerString,
+        validateTypes.validateIntegerAsteriskRange(integerString,
                 ApplicationConstants.LATEX_BOOK,
                 ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,

src/main/java/scot/carricksoftware/grants/validators/images/PersonImageCommandValidatorImpl.java

@@ -75,7 +75,7 @@ public class PersonImageCommandValidatorImpl implements PersonImageCommandValida
 
     private void validateLevel(String integerString, BindingResult bindingResult) {
         logger.debug("AppendixImageCommandValidator::validateLevel");
-        validateTypes.validateIntegerStaredRange(integerString,
+        validateTypes.validateIntegerAsteriskRange(integerString,
                 ApplicationConstants.LATEX_BOOK,
                 ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,

src/main/java/scot/carricksoftware/grants/validators/text/AppendixTextCommandValidatorImpl.java

@@ -35,7 +35,7 @@ public class AppendixTextCommandValidatorImpl implements AppendixTextCommandVali
 
     private void validateLevel(String integerString, BindingResult bindingResult) {
         logger.debug("AppendixImageCommandValidator::validateLevel");
-        validateTypes.validateIntegerStaredRange(integerString,
+        validateTypes.validateIntegerAsteriskRange(integerString,
                 ApplicationConstants.LATEX_BOOK,
                 ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,

src/main/java/scot/carricksoftware/grants/validators/text/DocumentTextCommandValidatorImpl.java

@@ -37,7 +37,7 @@ public class DocumentTextCommandValidatorImpl implements DocumentTextCommandVali
 
     private void validateLevel(String integerString, BindingResult bindingResult) {
         logger.debug("DocumentImageCommandValidator::validateLevel");
-        validateTypes.validateIntegerStaredRange(integerString,
+        validateTypes.validateIntegerAsteriskRange(integerString,
                 ApplicationConstants.LATEX_BOOK,
                 ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,

src/main/java/scot/carricksoftware/grants/validators/text/PersonTextCommandValidatorImpl.java

@@ -37,7 +37,7 @@ public class PersonTextCommandValidatorImpl implements PersonTextCommandValidato
 
     private void validateLevel(String integerString, BindingResult bindingResult) {
         logger.debug("AppendixImageCommandValidator::validateLevel");
-        validateTypes.validateIntegerStaredRange(integerString,
+        validateTypes.validateIntegerAsteriskRange(integerString,
                 ApplicationConstants.LATEX_BOOK,
                 ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,

src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateIntegerStaredRangeTest.java → src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateIntegerAsteriskRangeTest.java

@@ -19,7 +19,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
-class ValidateIntegerStaredRangeTest {
+class ValidateIntegerAsteriskRangeTest {
 
     private ValidateTypes validateTypes;
 
@@ -43,7 +43,7 @@ class ValidateIntegerStaredRangeTest {
     public void validateNullInteger() {
         String nullMessage = GetRandomString();
 
-        validateTypes.validateIntegerStaredRange(null, null, null, fieldName, nullMessage, "", "", bindingResultMock);
+        validateTypes.validateIntegerAsteriskRange(null, null, null, fieldName, nullMessage, "", "", bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, nullMessage);
     }
 
@@ -51,7 +51,7 @@ class ValidateIntegerStaredRangeTest {
     public void validateEmptyInteger() {
         String nullMessage = GetRandomString();
 
-        validateTypes.validateIntegerStaredRange("*", null, null, fieldName, nullMessage, "", "", bindingResultMock);
+        validateTypes.validateIntegerAsteriskRange("*", null, null, fieldName, nullMessage, "", "", bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, nullMessage);
     }
 
@@ -59,7 +59,7 @@ class ValidateIntegerStaredRangeTest {
     public void validateBadFormatInteger() {
         String formatMessage = GetRandomString();
 
-        validateTypes.validateIntegerStaredRange("zz", null, null, fieldName, "", formatMessage, "", bindingResultMock);
+        validateTypes.validateIntegerAsteriskRange("zz", null, null, fieldName, "", formatMessage, "", bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, formatMessage);
     }
 
@@ -67,19 +67,19 @@ class ValidateIntegerStaredRangeTest {
     public void validateTooLowInteger() {
         String rangeMessage = GetRandomString();
 
-        validateTypes.validateIntegerStaredRange("-6*", -5, 99, fieldName, "", "", rangeMessage, bindingResultMock);
+        validateTypes.validateIntegerAsteriskRange("-6*", -5, 99, fieldName, "", "", rangeMessage, bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, rangeMessage);
     }
 
     @Test
     public void validateLowLimitInteger() {
-        validateTypes.validateIntegerStaredRange("-6*", -6, 99, fieldName, "", "", "", bindingResultMock);
+        validateTypes.validateIntegerAsteriskRange("-6*", -6, 99, fieldName, "", "", "", bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 
     @Test
     public void validateHighLimitInteger() {
-        validateTypes.validateIntegerStaredRange("10*", -6, 10, fieldName, "", "", "", bindingResultMock);
+        validateTypes.validateIntegerAsteriskRange("10*", -6, 10, fieldName, "", "", "", bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 
@@ -87,7 +87,7 @@ class ValidateIntegerStaredRangeTest {
     public void validateTooHighInteger() {
         String rangeMessage = GetRandomString();
 
-        validateTypes.validateIntegerStaredRange("11*", -5, 10, fieldName, "", "", rangeMessage, bindingResultMock);
+        validateTypes.validateIntegerAsteriskRange("11*", -5, 10, fieldName, "", "", rangeMessage, bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, rangeMessage);
     }
 

src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateNonNegativeStarredIntegerTest.java → src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateNonNegativeAsteriskIntegerTest.java

@@ -19,7 +19,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
-class ValidateNonNegativeStarredIntegerTest {
+class ValidateNonNegativeAsteriskIntegerTest {
 
     private ValidateTypes validateTypes;
 
@@ -43,7 +43,7 @@ class ValidateNonNegativeStarredIntegerTest {
     public void validateNullInteger() {
         String nullMessage = GetRandomString();
 
-        validateTypes.validateNonNegativeStaredInteger(null, fieldName, nullMessage, "", "", bindingResultMock);
+        validateTypes.validateNonNegativeAsteriskInteger(null, fieldName, nullMessage, "", "", bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, nullMessage);
     }
 
@@ -52,7 +52,7 @@ class ValidateNonNegativeStarredIntegerTest {
     void validateEmptyInteger() {
         String nullMessage = GetRandomString();
 
-        validateTypes.validateNonNegativeStaredInteger("", fieldName, nullMessage, "", "", bindingResultMock);
+        validateTypes.validateNonNegativeAsteriskInteger("", fieldName, nullMessage, "", "", bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, nullMessage);
     }
 
@@ -60,7 +60,7 @@ class ValidateNonNegativeStarredIntegerTest {
     void validateStarInteger() {
         String nullMessage = GetRandomString();
 
-        validateTypes.validateNonNegativeStaredInteger("*", fieldName, nullMessage, "", "", bindingResultMock);
+        validateTypes.validateNonNegativeAsteriskInteger("*", fieldName, nullMessage, "", "", bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, nullMessage);
     }
 
@@ -68,25 +68,25 @@ class ValidateNonNegativeStarredIntegerTest {
     void validateNegativeInteger() {
         String negativeMessage = GetRandomString();
 
-        validateTypes.validateNonNegativeStaredInteger("-7", fieldName, "", "", negativeMessage, bindingResultMock);
+        validateTypes.validateNonNegativeAsteriskInteger("-7", fieldName, "", "", negativeMessage, bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, negativeMessage);
     }
 
     @Test
     void validateZeroInteger() {
-        validateTypes.validateNonNegativeStaredInteger("0", fieldName, "", "", "", bindingResultMock);
+        validateTypes.validateNonNegativeAsteriskInteger("0", fieldName, "", "", "", bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 
     @Test
     void validatePositiveInteger() {
-        validateTypes.validateNonNegativeStaredInteger("1", fieldName, "", "", "", bindingResultMock);
+        validateTypes.validateNonNegativeAsteriskInteger("1", fieldName, "", "", "", bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 
     @Test
     void validateStarredPositiveInteger() {
-        validateTypes.validateNonNegativeStaredInteger("1*", fieldName, "", "", "", bindingResultMock);
+        validateTypes.validateNonNegativeAsteriskInteger("1*", fieldName, "", "", "", bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 
@@ -95,7 +95,7 @@ class ValidateNonNegativeStarredIntegerTest {
     void validateBadFormatInteger() {
         String formatMessage = GetRandomString();
 
-        validateTypes.validateNonNegativeStaredInteger("zz", fieldName, "", formatMessage, "", bindingResultMock);
+        validateTypes.validateNonNegativeAsteriskInteger("zz", fieldName, "", formatMessage, "", bindingResultMock);
         verify(bindingResultMock).rejectValue(fieldName, "", null, formatMessage);
     }
 }

src/test/java/scot/carricksoftware/grants/validators/images/appendiximage/AppendixImageCommandValidatorTest.java

@@ -71,7 +71,7 @@ class AppendixImageCommandValidatorTest {
         String level = GetRandomString();
         when(appendixImageCommandMock.getLevel()).thenReturn(level);
         validator.validate(appendixImageCommandMock, bindingResultMock);
-        verify(validateTypesMock).validateIntegerStaredRange(level,
+        verify(validateTypesMock).validateIntegerAsteriskRange(level,
                 -2,
                 5,
                 "level",

src/test/java/scot/carricksoftware/grants/validators/images/personimage/PersonImageCommandValidatorTest.java

@@ -80,7 +80,7 @@ class PersonImageCommandValidatorTest {
         String level = GetRandomString();
         when(personImageCommandMock.getLevel()).thenReturn(level);
         validator.validate(personImageCommandMock, bindingResultMock);
-        verify(validateTypesMock).validateIntegerStaredRange(level,
+        verify(validateTypesMock).validateIntegerAsteriskRange(level,
                 -2,
                 5,
                 "level",

src/test/java/scot/carricksoftware/grants/validators/text/AppendixTextCommandValidatorImplTest.java

@@ -54,7 +54,7 @@ class AppendixTextCommandValidatorImplTest {
         String level = GetRandomString();
         appendixTextCommand.setLevel(level);
         validator.validate(appendixTextCommand, bindingResultMock);
-        verify(validateTypesMock).validateIntegerStaredRange(level,
+        verify(validateTypesMock).validateIntegerAsteriskRange(level,
                 -2,
                 5,
                 "level",

src/test/java/scot/carricksoftware/grants/validators/text/DocumentTextCommandValidatorImplTest.java

@@ -54,7 +54,7 @@ class DocumentTextCommandValidatorImplTest {
         String level = GetRandomString();
         documentTextCommand.setLevel(level);
         validator.validate(documentTextCommand, bindingResultMock);
-        verify(validateTypesMock).validateIntegerStaredRange(level,
+        verify(validateTypesMock).validateIntegerAsteriskRange(level,
                 -2,
                 5,
                 "level",

src/test/java/scot/carricksoftware/grants/validators/text/PersonTextCommandValidatorImplTest.java

@@ -56,7 +56,7 @@ class PersonTextCommandValidatorImplTest {
         String level = GetRandomString();
         personTextCommand.setLevel(level);
         validator.validate(personTextCommand, bindingResultMock);
-        verify(validateTypesMock).validateIntegerStaredRange(level,
+        verify(validateTypesMock).validateIntegerAsteriskRange(level,
                 -2,
                 5,
                 "level",