From 8f753ac3ac71b6f748e7c554f947ffbcdeccbaa6 Mon Sep 17 00:00:00 2001 From: Armin Date: Tue, 24 Oct 2017 22:40:30 +0200 Subject: [PATCH] MINOR: Remove some dead code in PipelineIR Fixes #8522 --- .../main/java/org/logstash/config/ir/graph/IfVertex.java | 1 - .../java/org/logstash/config/ir/graph/PluginVertex.java | 7 ------- .../logstash/config/ir/graph/algorithms/BreadthFirst.java | 6 ++---- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/IfVertex.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/IfVertex.java index d23de9b98..c720363e3 100644 --- a/logstash-core/src/main/java/org/logstash/config/ir/graph/IfVertex.java +++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/IfVertex.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; * Created by andrewvc on 9/15/16. */ public class IfVertex extends Vertex { - private volatile String generatedId; public BooleanExpression getBooleanExpression() { return booleanExpression; diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/PluginVertex.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/PluginVertex.java index 7b2068c45..56c190f49 100644 --- a/logstash-core/src/main/java/org/logstash/config/ir/graph/PluginVertex.java +++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/PluginVertex.java @@ -13,7 +13,6 @@ import org.logstash.config.ir.SourceComponent; public class PluginVertex extends Vertex { private final SourceWithMetadata meta; private final PluginDefinition pluginDefinition; - private volatile String generatedId; public PluginDefinition getPluginDefinition() { return pluginDefinition; @@ -66,10 +65,4 @@ public class PluginVertex extends Vertex { } return false; } - - @Override - public void clearCache() { - super.clearCache(); - this.generatedId = null; - } } diff --git a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/BreadthFirst.java b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/BreadthFirst.java index 26b2f1b1a..e82061555 100644 --- a/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/BreadthFirst.java +++ b/logstash-core/src/main/java/org/logstash/config/ir/graph/algorithms/BreadthFirst.java @@ -45,16 +45,14 @@ public class BreadthFirst { }); } - return new BfsResult(vertexDistances, vertexParents); + return new BfsResult(vertexDistances); } public static final class BfsResult { public final Map vertexDistances; - private final Map vertexParents; - BfsResult(Map vertexDistances, Map vertexParents) { + BfsResult(Map vertexDistances) { this.vertexDistances = vertexDistances; - this.vertexParents = vertexParents; } public Collection getVertices() {