Merge pull request #419 from ShaneLee/bug/412-hash

Check for case where hash is the last value of cron expression #412

Author: jmrozanec

src/main/java/com/cronutils/parser/CronParser.java

@@ -121,7 +121,8 @@ public Cron parse(final String expression) {
                         String.format("Cron expression contains %s parts but we expect one of %s", expressionLength, expressions.keySet()));
             }
             try {
-                final int size = fields.size();
+
+                final int size = expressionParts.length;
                 final List<CronField> results = new ArrayList<>(size + 1);
                 for (int j = 0; j < size; j++) {
                     results.add(fields.get(j).parse(expressionParts[j]));
@@ -133,3 +134,4 @@ public Cron parse(final String expression) {
         }
     }
 }
+

src/main/java/com/cronutils/parser/FieldParser.java

@@ -182,6 +182,9 @@ protected On parseOnWithHash(final String exp) {
         }
         final SpecialCharFieldValue specialChar = new SpecialCharFieldValue(HASH);
         final String[] array = exp.split(HASH_TAG);
+        if (array.length == 0) {
+            throw new IllegalArgumentException("Invalid Position of # Character!");
+        }
         final IntegerFieldValue nth = mapToIntegerFieldValue(array[1]);
         if (array[0].isEmpty()) {
             throw new IllegalArgumentException("Time should be specified!");

src/test/java/com/cronutils/parser/CronParserTest.java

@@ -101,6 +101,11 @@ public void testTrailingCommaListUnix(){
         validateExpression(CronType.UNIX, "1, * * * *");
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testHashListUnix(){
+        validateExpression(CronType.UNIX, "0 0 0 ? * #");
+    }
+
     @Test // issue #369
     public void testParseIncompleteRangeNoValues() {
         parseIncompleteExpression("-", "Missing values for range: -");
@@ -217,4 +222,10 @@ public void testParseMulticron(){
         Cron cron = parser.parse(multicron);
         assertEquals(multicron, cron.asString());
     }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseQuartzCronWithHash() {
+        parser = new CronParser(TestCronDefinitionsFactory.withDayOfYearDefinitionWhereYearAndDoYOptionals());
+        parser.parse("0 0 0 ? * #");
+    }
 }