Environment: delete unused class (#7228)

batfish · Aug 5, 2021 · 0bcf0ef · 0bcf0ef
1 parent d3856d3
commit 0bcf0ef
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 250 deletions.
diff --git a/projects/batfish-common-protocol/src/main/java/org/batfish/common/plugin/IBatfish.java b/projects/batfish-common-protocol/src/main/java/org/batfish/common/plugin/IBatfish.java
@@ -29,7 +29,6 @@
 import org.batfish.datamodel.answers.ParseVendorConfigurationAnswerElement;
 import org.batfish.datamodel.collections.BgpAdvertisementsByVrf;
 import org.batfish.datamodel.flow.Trace;
-import org.batfish.datamodel.pojo.Environment;
 import org.batfish.datamodel.questions.Question;
 import org.batfish.grammar.BgpTableFormat;
 import org.batfish.identifiers.NetworkId;
@@ -81,8 +80,6 @@ SortedMap<Flow, List<Trace>> buildFlows(
 
   DataPlanePlugin getDataPlanePlugin();
 
-  Environment getEnvironment();
-
   @Nonnull
   NetworkSnapshot getSnapshot();
 

diff --git a/projects/batfish-common-protocol/src/main/java/org/batfish/datamodel/answers/Schema.java b/projects/batfish-common-protocol/src/main/java/org/batfish/datamodel/answers/Schema.java
@@ -18,7 +18,6 @@
 import org.batfish.datamodel.collections.FileLines;
 import org.batfish.datamodel.collections.NodeInterfacePair;
 import org.batfish.datamodel.flow.Trace;
-import org.batfish.datamodel.pojo.Environment;
 import org.batfish.datamodel.pojo.Node;
 import org.batfish.datamodel.questions.BgpRoute;
 import org.batfish.datamodel.questions.BgpRouteDiffs;
@@ -46,7 +45,6 @@ private static String getClassString(Class<?> cls) {
           .put("BgpRouteDiffs", getClassString(BgpRouteDiffs.class))
           .put("Boolean", getClassString(Boolean.class))
           .put("Double", getClassString(Double.class))
-          .put("Environment", getClassString(Environment.class))
           .put("FileLines", getClassString(FileLines.class))
           .put("Flow", getClassString(Flow.class))
           .put("Integer", getClassString(Integer.class))

diff --git a/projects/batfish-common-protocol/src/main/java/org/batfish/datamodel/pojo/Environment.java b/projects/batfish-common-protocol/src/main/java/org/batfish/datamodel/pojo/Environment.java
diff --git a/.../batfish-common-protocol/src/test/java/org/batfish/common/plugin/IBatfishTestAdapter.java b/.../batfish-common-protocol/src/test/java/org/batfish/common/plugin/IBatfishTestAdapter.java
@@ -37,7 +37,6 @@
 import org.batfish.datamodel.flow.Trace;
 import org.batfish.datamodel.ipsec.IpsecTopology;
 import org.batfish.datamodel.ospf.OspfTopology;
-import org.batfish.datamodel.pojo.Environment;
 import org.batfish.datamodel.questions.Question;
 import org.batfish.datamodel.vxlan.VxlanTopology;
 import org.batfish.datamodel.vxlan.VxlanTopologyUtils;
@@ -210,11 +209,6 @@ public DataPlanePlugin getDataPlanePlugin() {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public Environment getEnvironment() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public BatfishLogger getLogger() {
     return null;

diff --git a/...cts/batfish-common-protocol/src/test/java/org/batfish/datamodel/pojo/EnvironmentTest.java b/...cts/batfish-common-protocol/src/test/java/org/batfish/datamodel/pojo/EnvironmentTest.java
diff --git a/projects/batfish/src/main/java/org/batfish/main/Batfish.java b/projects/batfish/src/main/java/org/batfish/main/Batfish.java
@@ -173,7 +173,6 @@
 import org.batfish.datamodel.flow.TraceWrapperAsAnswerElement;
 import org.batfish.datamodel.isp_configuration.IspConfiguration;
 import org.batfish.datamodel.ospf.OspfTopologyUtils;
-import org.batfish.datamodel.pojo.Environment;
 import org.batfish.datamodel.questions.InvalidReachabilityParametersException;
 import org.batfish.datamodel.questions.Question;
 import org.batfish.datamodel.vxlan.Layer2Vni;
@@ -1002,19 +1001,6 @@ public DataPlanePlugin getDataPlanePlugin() {
     return plugin;
   }
 
-  @Override
-  public Environment getEnvironment() {
-    // TODO: delete entirely
-    return new Environment(
-        _settings.getSnapshotName(),
-        ImmutableSortedSet.of(),
-        ImmutableSortedSet.of(),
-        ImmutableSortedSet.of(),
-        null,
-        null,
-        null);
-  }
-
   private SortedMap<String, BgpAdvertisementsByVrf> getEnvironmentBgpTables(
       NetworkSnapshot snapshot, ParseEnvironmentBgpTablesAnswerElement answerElement) {
     _logger.info("\n*** READING Environment BGP Tables ***\n");