From 484cc0be0c99f5ac9452dff37da4556439ba9727 Mon Sep 17 00:00:00 2001
From: Jose Martin Rozanec <jmrozanec@gmail.com>
Date: Thu, 15 Mar 2018 00:00:48 -0300
Subject: [PATCH] Issue #277 #168: remove guava rangesets implementation and
 guava dependency, since the feature was extracted to its own repo.

---
 pom.xml                                       |   7 -
 .../com/cronutils/utils/CronRangeSets.java    | 171 ------------------
 .../java/com/cronutils/utils/CronUtils.java   |   4 -
 .../cronutils/utils/CronRangeSetsTest.java    |  99 ----------
 4 files changed, 281 deletions(-)
 delete mode 100644 src/main/java/com/cronutils/utils/CronRangeSets.java
 delete mode 100644 src/test/java/com/cronutils/utils/CronRangeSetsTest.java

diff --git a/pom.xml b/pom.xml
index 91827a82..f2786c26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,6 @@
         <junit.version>4.12</junit.version>
         <mockito.version>1.10.19</mockito.version>
         <powermock.version>1.6.2</powermock.version>
-        <guava.version>24.0-jre</guava.version>
         <javaee-api.version>8.0</javaee-api.version>
 
         <github.global.server>github</github.global.server>
@@ -85,12 +84,6 @@
             <version>${javaee-api.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-            <scope>provided</scope>
-        </dependency>
 
         <!--dependency>
             <groupId>eu.lp0.slf4j</groupId>
diff --git a/src/main/java/com/cronutils/utils/CronRangeSets.java b/src/main/java/com/cronutils/utils/CronRangeSets.java
deleted file mode 100644
index 032fa463..00000000
--- a/src/main/java/com/cronutils/utils/CronRangeSets.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.cronutils.utils;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.cronutils.model.Cron;
-import com.cronutils.model.field.CronField;
-import com.cronutils.model.field.CronFieldName;
-import com.cronutils.model.field.constraint.FieldConstraints;
-import com.cronutils.model.field.expression.Always;
-import com.cronutils.model.field.expression.And;
-import com.cronutils.model.field.expression.Between;
-import com.cronutils.model.field.expression.Every;
-import com.cronutils.model.field.expression.FieldExpression;
-import com.cronutils.model.field.expression.On;
-import com.cronutils.model.field.expression.QuestionMark;
-import com.cronutils.model.field.expression.visitor.FieldExpressionVisitor;
-import com.cronutils.model.field.value.IntegerFieldValue;
-import com.cronutils.model.field.value.SpecialCharFieldValue;
-import com.google.common.collect.ImmutableRangeSet;
-import com.google.common.collect.Range;
-import com.google.common.collect.RangeSet;
-import com.google.common.collect.TreeRangeSet;
-
-public class CronRangeSets {
-    private Map<CronFieldName, RangeSet<Integer>> rangesets = new HashMap<>();
-
-    public CronRangeSets(Cron cron){
-        for(Map.Entry<CronFieldName, CronField> entry : cron.retrieveFieldsAsMap().entrySet()){
-            FieldConstraints constraints = entry.getValue().getConstraints();
-            RangeSetExpressionVisitor visitor = new RangeSetExpressionVisitor(constraints.getStartRange(), constraints.getEndRange());
-            entry.getValue().getExpression().accept(visitor);
-            rangesets.put(entry.getKey(), visitor.getRangeset());
-        }
-    }
-
-    public Map<CronFieldName, RangeSet<Integer>> getRangesets(){
-        return Collections.unmodifiableMap(rangesets);
-    }
-
-    private static class RangeSetExpressionVisitor implements FieldExpressionVisitor {
-        private RangeSet<Integer> rangeset = TreeRangeSet.create();
-        private int startrange;
-        private int endrange;
-
-        public RangeSetExpressionVisitor(int startrange, int endrange){
-            this.startrange = startrange;
-            this.endrange = endrange;
-        }
-
-        public RangeSet<Integer> getRangeset(){
-            return ImmutableRangeSet.copyOf(rangeset);
-        }
-
-        @Override
-        public FieldExpression visit(FieldExpression expression) {
-            if(expression instanceof Always){
-                visit((Always) expression);
-            }
-            if(expression instanceof And){
-                visit((And)expression);
-            }
-            if(expression instanceof Between){
-                visit((Between) expression);
-            }
-            if(expression instanceof Every){
-                visit((Every) expression);
-            }
-            if(expression instanceof On){
-                visit((On)expression);
-            }
-            if(expression instanceof QuestionMark){
-                visit((QuestionMark) expression);
-            }
-            return expression;
-        }
-
-        @Override
-        public FieldExpression visit(Always always) {
-            rangeset.add(Range.closed(startrange, endrange));
-            return always;
-        }
-
-        @Override
-        public FieldExpression visit(And and) {
-            for(FieldExpression expression : and.getExpressions()){
-                visit(expression);
-            }
-            return and;
-        }
-
-        @Override
-        public FieldExpression visit(Between between) {
-            if(between.getFrom() instanceof IntegerFieldValue && between.getTo() instanceof IntegerFieldValue){
-                rangeset.add(Range.closed(((IntegerFieldValue)between.getFrom()).getValue(), ((IntegerFieldValue)between.getTo()).getValue()));
-            }else{
-                throw new IllegalArgumentException("Special characters depend on contextual values and are currently not supported by RangeSet mapping");
-            }
-            return between;
-        }
-
-        @Override
-        public FieldExpression visit(Every every) {
-            int period = every.getPeriod().getValue();
-            int start = startrange;
-            int end = endrange;
-            if(every.getExpression() instanceof Between){
-                Between between = (Between) every.getExpression();
-                if(between.getFrom() instanceof IntegerFieldValue && between.getTo() instanceof IntegerFieldValue){
-                    start = ((IntegerFieldValue)between.getFrom()).getValue();
-                    end = ((IntegerFieldValue)between.getTo()).getValue();
-                }else{
-                    throw new IllegalArgumentException("Special characters depend on contextual values and are currently not supported by RangeSet mapping");
-                }
-            }
-            if(every.getExpression() instanceof On){
-                On on = (On) every.getExpression();
-                IntegerFieldValue time = on.getTime();
-                SpecialCharFieldValue specchar = on.getSpecialChar();
-                switch (specchar.getValue()){
-                    case L:
-                        throw new IllegalArgumentException("L depends on contextual values and is currently not supported by RangeSet mapping");
-                    case W:
-                        throw new IllegalArgumentException("W depends on contextual values and is currently not supported by RangeSet mapping");
-                    case LW:
-                        throw new IllegalArgumentException("LW depends on contextual values and is currently not supported by RangeSet mapping");
-                    case HASH:
-                        throw new IllegalArgumentException("# depends on contextual values and is currently not supported by RangeSet mapping");
-                    case NONE:
-                        start = time.getValue();
-                }
-            }
-            if(every.getExpression() instanceof QuestionMark){
-                throw new IllegalArgumentException("? not currently not supported for RangeSet mapping");
-            }
-
-            do{
-                rangeset.add(Range.singleton(start));
-                start+=period;
-            }while(start < end);
-
-            return every;
-        }
-
-        @Override
-        public FieldExpression visit(On on) {
-            IntegerFieldValue time = on.getTime();
-            SpecialCharFieldValue specchar = on.getSpecialChar();
-            switch (specchar.getValue()){
-                case L:
-                    throw new IllegalArgumentException("L depends on contextual values and is currently not supported by RangeSet mapping");
-                case W:
-                    throw new IllegalArgumentException("W depends on contextual values and is currently not supported by RangeSet mapping");
-                case LW:
-                    throw new IllegalArgumentException("LW depends on contextual values and is currently not supported by RangeSet mapping");
-                case HASH:
-                    throw new IllegalArgumentException("# depends on contextual values and is currently not supported by RangeSet mapping");
-                case NONE:
-                    rangeset.add(Range.singleton(time.getValue()));
-            }
-            return on;
-        }
-
-        @Override
-        public FieldExpression visit(QuestionMark questionMark) {
-            //we do not add any range!
-            return questionMark;
-        }
-    }
-}
diff --git a/src/main/java/com/cronutils/utils/CronUtils.java b/src/main/java/com/cronutils/utils/CronUtils.java
index 3d05c134..f697715f 100644
--- a/src/main/java/com/cronutils/utils/CronUtils.java
+++ b/src/main/java/com/cronutils/utils/CronUtils.java
@@ -37,8 +37,4 @@ public static ScheduleExpression asScheduleExpression(Cron cron){
         }
         return expression;
     }
-
-    public static CronRangeSets asRangeSets(Cron cron){
-        return new CronRangeSets(cron);
-    }
 }
diff --git a/src/test/java/com/cronutils/utils/CronRangeSetsTest.java b/src/test/java/com/cronutils/utils/CronRangeSetsTest.java
deleted file mode 100644
index 22b3a40d..00000000
--- a/src/test/java/com/cronutils/utils/CronRangeSetsTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.cronutils.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-
-import com.cronutils.model.Cron;
-import com.cronutils.model.CronType;
-import com.cronutils.model.definition.CronDefinition;
-import com.cronutils.model.definition.CronDefinitionBuilder;
-import com.cronutils.model.field.CronFieldName;
-import com.cronutils.parser.CronParser;
-import com.google.common.collect.Range;
-import com.google.common.collect.RangeSet;
-import com.google.common.collect.TreeRangeSet;
-
-import static org.junit.Assert.*;
-
-public class CronRangeSetsTest {
-
-    @Test
-    public void getRangesetsForValidExpressionUnix() throws Exception {
-        final CronDefinition quartzcd = CronDefinitionBuilder.instanceDefinitionFor(CronType.UNIX);
-        final CronParser quartz = new CronParser(quartzcd);
-        final Cron cron = quartz.parse("0 * * * *");
-        Map<CronFieldName, RangeSet<Integer>> rangesets = CronUtils.asRangeSets(cron).getRangesets();
-        Map<CronFieldName, RangeSet<Integer>> expected = new HashMap<>();
-
-        RangeSet<Integer> minutes = TreeRangeSet.create();
-        minutes.add(Range.singleton(0));
-        RangeSet<Integer> hours = TreeRangeSet.create();
-        hours.add(Range.closed(0, 23));
-        RangeSet<Integer> dom = TreeRangeSet.create();
-        dom.add(Range.closed(1, 31));
-        RangeSet<Integer> dow = TreeRangeSet.create();
-        dow.add(Range.closed(0, 7));
-        RangeSet<Integer> month = TreeRangeSet.create();
-        month.add(Range.closed(1, 12));
-
-        expected.put(CronFieldName.MINUTE, minutes);
-        expected.put(CronFieldName.HOUR, hours);
-        expected.put(CronFieldName.DAY_OF_MONTH, dom);
-        expected.put(CronFieldName.DAY_OF_WEEK, dow);
-        expected.put(CronFieldName.MONTH, month);
-
-        for(CronFieldName fieldName : CronUtils.asRangeSets(cron).getRangesets().keySet()){
-            RangeSet<Integer> expectedrs = expected.get(fieldName);
-            RangeSet<Integer> computed = rangesets.get(fieldName);
-            assertEquals(expectedrs, computed);
-        }
-    }
-
-    @Test
-    public void getRangesetsForValidExpressionQuartz() throws Exception {
-        final CronDefinition quartzcd = CronDefinitionBuilder.instanceDefinitionFor(CronType.QUARTZ);
-        final CronParser quartz = new CronParser(quartzcd);
-        final Cron cron = quartz.parse("0 * * ? * MON *");
-        Map<CronFieldName, RangeSet<Integer>> rangesets = CronUtils.asRangeSets(cron).getRangesets();
-        Map<CronFieldName, RangeSet<Integer>> expected = new HashMap<>();
-
-        RangeSet<Integer> seconds = TreeRangeSet.create();
-        seconds.add(Range.singleton(0));
-        RangeSet<Integer> minutes = TreeRangeSet.create();
-        minutes.add(Range.closed(0, 59));
-        RangeSet<Integer> hours = TreeRangeSet.create();
-        hours.add(Range.closed(0, 23));
-        RangeSet<Integer> dom = TreeRangeSet.create();
-        RangeSet<Integer> dow = TreeRangeSet.create();
-        dow.add(Range.singleton(2));
-        RangeSet<Integer> month = TreeRangeSet.create();
-        month.add(Range.closed(1, 12));
-        RangeSet<Integer> year = TreeRangeSet.create();
-        year.add(Range.closed(1970, 2099));
-
-        expected.put(CronFieldName.SECOND, seconds);
-        expected.put(CronFieldName.MINUTE, minutes);
-        expected.put(CronFieldName.HOUR, hours);
-        expected.put(CronFieldName.DAY_OF_MONTH, dom);
-        expected.put(CronFieldName.DAY_OF_WEEK, dow);
-        expected.put(CronFieldName.MONTH, month);
-        expected.put(CronFieldName.YEAR, year);
-
-        for(CronFieldName fieldName : CronUtils.asRangeSets(cron).getRangesets().keySet()){
-            RangeSet<Integer> expectedrs = expected.get(fieldName);
-            RangeSet<Integer> computed = rangesets.get(fieldName);
-            assertEquals(expectedrs, computed);
-        }
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getRangesetsForInvalidExpression() throws Exception {
-        final CronDefinition quartzcd = CronDefinitionBuilder.instanceDefinitionFor(CronType.QUARTZ);
-        final CronParser quartz = new CronParser(quartzcd);
-        final Cron cron = quartz.parse("0 * * L * ? *");
-        CronUtils.asRangeSets(cron);
-    }
-
-}
\ No newline at end of file