Merge pull request #141 from batfish/unstable

prepare for 0.25.0
batfish · Jun 5, 2017 · d2fcba9 · d2fcba9
2 parents f412e7f + b99c9ae
commit d2fcba9
Show file tree

Hide file tree

Showing 40 changed files with 54 additions and 54 deletions.
diff --git a/lib/antlr/antlr-4.5.3-complete.jar b/lib/antlr/antlr-4.5.3-complete.jar
diff --git a/lib/antlr/antlr-4.7-complete.jar b/lib/antlr/antlr-4.7-complete.jar
diff --git a/lib/antlr/antlr4-4.7-runtime-sources.jar b/lib/antlr/antlr4-4.7-runtime-sources.jar
diff --git a/lib/antlr/antlr4-runtime-4.5.3-sources.jar b/lib/antlr/antlr4-runtime-4.5.3-sources.jar
diff --git a/projects/batfish-common-protocol/.classpath b/projects/batfish-common-protocol/.classpath
@@ -25,6 +25,6 @@
 	<classpathentry kind="lib" path="lib/accessors-smart/accessors-smart-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-jsonschema/mbknor-jackson-jsonschema_2.12-1.0.11-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/guava/guava-21.0.jar" sourcepath="lib/guava/guava-21.0-sources.jar"/>
-	<classpathentry kind="lib" path="lib/antlr/antlr-4.5.3-complete.jar" sourcepath="lib/antlr/antlr4-runtime-4.5.3-sources.jar"/>
+	<classpathentry kind="lib" path="lib/antlr/antlr-4.7-complete.jar" sourcepath="lib/antlr/antlr4-4.7-runtime-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/projects/batfish-common-protocol/lib/antlr/antlr-4.5.3-complete.jar b/projects/batfish-common-protocol/lib/antlr/antlr-4.5.3-complete.jar
diff --git a/projects/batfish-common-protocol/lib/antlr/antlr-4.7-complete.jar b/projects/batfish-common-protocol/lib/antlr/antlr-4.7-complete.jar
@@ -0,0 +1 @@
+../../../../lib/antlr/antlr-4.7-complete.jar
diff --git a/projects/batfish-common-protocol/lib/antlr/antlr4-4.7-runtime-sources.jar b/projects/batfish-common-protocol/lib/antlr/antlr4-4.7-runtime-sources.jar
@@ -0,0 +1 @@
+../../../../lib/antlr/antlr4-4.7-runtime-sources.jar
diff --git a/projects/batfish-common-protocol/lib/antlr/antlr4-runtime-4.5.3-sources.jar b/projects/batfish-common-protocol/lib/antlr/antlr4-runtime-4.5.3-sources.jar
diff --git a/projects/batfish-common-protocol/src/org/batfish/common/Version.java b/projects/batfish-common-protocol/src/org/batfish/common/Version.java
@@ -8,7 +8,7 @@ public final class Version {
 
    private static final String UNKNOWN_VERSION = "0.0.0";
 
-   private static final String VERSION = "0.24.0";
+   private static final String VERSION = "0.25.0";
 
    public static void checkCompatibleVersion(String myName, String otherName,
          String otherVersion) {

diff --git a/projects/batfish-common-protocol/src/org/batfish/grammar/BatfishCombinedParser.java b/projects/batfish-common-protocol/src/org/batfish/grammar/BatfishCombinedParser.java
@@ -4,8 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.Token;
@@ -45,7 +45,7 @@ public BatfishCombinedParser(Class<P> pClass, Class<L> lClass, String input,
       _warnings = new ArrayList<>();
       _errors = new ArrayList<>();
       _input = input;
-      ANTLRInputStream inputStream = new ANTLRInputStream(input);
+      CharStream inputStream = CharStreams.fromString(input);
       try {
          _lexer = lClass.getConstructor(CharStream.class)
                .newInstance(inputStream);

diff --git a/projects/batfish/.classpath b/projects/batfish/.classpath
@@ -22,7 +22,6 @@
 	<classpathentry kind="lib" path="lib/commons/commons-exec-1.3.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/batfish-common-protocol"/>
 	<classpathentry kind="lib" path="lib/commons/commons-cli-1.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/antlr/antlr-4.5.3-complete.jar" sourcepath="lib/antlr/antlr4-runtime-4.5.3-sources.jar"/>
 	<classpathentry kind="lib" path="lib/jaxrs-ri/ext/aopalliance-repackaged-2.4.0-b09.jar"/>
 	<classpathentry kind="lib" path="lib/jaxrs-ri/ext/asm-debug-all-5.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/jaxrs-ri/ext/hk2-api-2.4.0-b09.jar"/>
@@ -55,5 +54,6 @@
 	<classpathentry kind="lib" path="lib/jackson/jackson-databind-2.9.0-SNAPSHOT.jar" sourcepath="lib/jackson/jackson-databind-2.9.0-SNAPSHOT-sources.jar"/>
 	<classpathentry kind="lib" path="lib/guava/guava-21.0.jar" sourcepath="lib/guava/guava-21.0-sources.jar"/>
 	<classpathentry kind="lib" path="lib/commons/commons-collections4-4.1.jar" sourcepath="lib/commons/commons-collections4-4.1-sources.jar"/>
+	<classpathentry kind="lib" path="lib/antlr/antlr-4.7-complete.jar" sourcepath="lib/antlr/antlr4-4.7-runtime-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/projects/batfish/build.xml b/projects/batfish/build.xml
@@ -30,7 +30,7 @@
    <macrodef name="antlr4lexer">
       <attribute name="grammar.packagedir"/>
       <attribute name="grammar.name"/>
-      <attribute name="antlrjar" default="lib/antlr/antlr-4.5.3-complete.jar"/>
+      <attribute name="antlrjar" default="lib/antlr/antlr-4.7-complete.jar"/>
       <sequential>
          <outofdate>
             <sourcefiles>
@@ -62,7 +62,7 @@
    <macrodef name="antlr4parser">
       <attribute name="grammar.packagedir"/>
       <attribute name="grammar.name"/>
-      <attribute name="antlrjar" default="lib/antlr/antlr-4.5.3-complete.jar"/>
+      <attribute name="antlrjar" default="lib/antlr/antlr-4.7-complete.jar"/>
       <element name="dependencies"/>
       <sequential>
          <outofdate>

diff --git a/projects/batfish/lib/antlr/antlr-4.5.3-complete.jar b/projects/batfish/lib/antlr/antlr-4.5.3-complete.jar
diff --git a/projects/batfish/lib/antlr/antlr-4.7-complete.jar b/projects/batfish/lib/antlr/antlr-4.7-complete.jar
@@ -0,0 +1 @@
+../../../../lib/antlr/antlr-4.7-complete.jar
diff --git a/projects/batfish/lib/antlr/antlr4-4.7-runtime-sources.jar b/projects/batfish/lib/antlr/antlr4-4.7-runtime-sources.jar
@@ -0,0 +1 @@
+../../../../lib/antlr/antlr4-4.7-runtime-sources.jar
diff --git a/projects/batfish/lib/antlr/antlr4-runtime-4.5.3-sources.jar b/projects/batfish/lib/antlr/antlr4-runtime-4.5.3-sources.jar
diff --git a/test_rigs/parsing-tests/dc-as-reuse.ref b/test_rigs/parsing-tests/dc-as-reuse.ref
@@ -4680,7 +4680,7 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -4836,7 +4836,7 @@
           }
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/disable-as-suppression.ref b/test_rigs/parsing-tests/disable-as-suppression.ref
@@ -269,11 +269,11 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/example-isp-switchover-1.ref b/test_rigs/parsing-tests/example-isp-switchover-1.ref
@@ -9807,7 +9807,7 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -9936,7 +9936,7 @@
           }
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/example-isp-switchover-2.ref b/test_rigs/parsing-tests/example-isp-switchover-2.ref
@@ -9807,7 +9807,7 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -9936,7 +9936,7 @@
           }
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/example-juniper.ref b/test_rigs/parsing-tests/example-juniper.ref
@@ -10365,7 +10365,7 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -10494,7 +10494,7 @@
           }
         }
       },
-      "version" : "0.24.0",
+      "version" : "0.25.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/test_rigs/parsing-tests/example-nsdi.ref b/test_rigs/parsing-tests/example-nsdi.ref
@@ -2828,11 +2828,11 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/example.ref b/test_rigs/parsing-tests/example.ref
@@ -10385,7 +10385,7 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -10528,7 +10528,7 @@
           }
         }
       },
-      "version" : "0.24.0",
+      "version" : "0.25.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/test_rigs/parsing-tests/indirection.ref b/test_rigs/parsing-tests/indirection.ref
@@ -944,11 +944,11 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/isis.ref b/test_rigs/parsing-tests/isis.ref
@@ -2445,11 +2445,11 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/policy-routing.ref b/test_rigs/parsing-tests/policy-routing.ref
@@ -1904,11 +1904,11 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/snat.ref b/test_rigs/parsing-tests/snat.ref
@@ -458,11 +458,11 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/srx-testbed.ref b/test_rigs/parsing-tests/srx-testbed.ref
@@ -5909,7 +5909,7 @@
           ]
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -5927,7 +5927,7 @@
           }
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/unit-tests.ref b/test_rigs/parsing-tests/unit-tests.ref
@@ -29840,7 +29840,7 @@
           ]
         }
       },
-      "version" : "0.24.0",
+      "version" : "0.25.0",
       "warnings" : {
         "bgp_address_family" : {
           "Red flags" : {
@@ -30919,7 +30919,7 @@
           }
         }
       },
-      "version" : "0.24.0",
+      "version" : "0.25.0",
       "warnings" : {
         "address_family" : {
           "Red flags" : {

diff --git a/tests/basic/genDp-delta.ref b/tests/basic/genDp-delta.ref
@@ -34,7 +34,7 @@
         "8" : 289
       },
       "ospfInternalIterations" : 3,
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     }
   ],
   "status" : "SUCCESS"

diff --git a/tests/basic/genDp.ref b/tests/basic/genDp.ref
@@ -34,7 +34,7 @@
         "8" : 286
       },
       "ospfInternalIterations" : 3,
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     }
   ],
   "status" : "SUCCESS"

diff --git a/tests/basic/init-dc-as-reuse.ref b/tests/basic/init-dc-as-reuse.ref
@@ -26,7 +26,7 @@
         "pod_1_tor_0" : "PASSED",
         "pod_1_tor_1" : "PASSED"
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -182,7 +182,7 @@
           }
         }
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/tests/basic/init-delta.ref b/tests/basic/init-delta.ref
@@ -40,7 +40,7 @@
         "testrig/iptables/host1.iptables" : "PASSED",
         "testrig/iptables/host2.iptables" : "PASSED"
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -180,7 +180,7 @@
           }
         }
       },
-      "version" : "0.24.0",
+      "version" : "0.25.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/tests/basic/init-snat.ref b/tests/basic/init-snat.ref
@@ -12,11 +12,11 @@
         "us_border" : "PASSED",
         "us_switch" : "PASSED"
       },
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.24.0"
+      "version" : "0.25.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/tests/basic/init-unit-tests.ref b/tests/basic/init-unit-tests.ref
@@ -346,7 +346,7 @@
         "vrf_context" : "PASSED",
         "vxlan" : "PASSED"
       },
-      "version" : "0.24.0",
+      "version" : "0.25.0",
       "warnings" : {
         "bgp_address_family" : {
           "Red flags" : {
@@ -1425,7 +1425,7 @@
           }
         }
       },
-      "version" : "0.24.0",
+      "version" : "0.25.0",
       "warnings" : {
         "address_family" : {
           "Red flags" : {