fix benchmark after renames and server changes

Graylog2 · Mar 4, 2016 · f6011c4 · f6011c4
1 parent e432701
commit f6011c4
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/benchmarks/src/main/java/org/graylog/benchmarks/pipeline/PipelineBenchmark.java b/benchmarks/src/main/java/org/graylog/benchmarks/pipeline/PipelineBenchmark.java
@@ -26,15 +26,15 @@
 import org.graylog.plugins.pipelineprocessor.ast.functions.Function;
 import org.graylog.plugins.pipelineprocessor.db.PipelineDao;
 import org.graylog.plugins.pipelineprocessor.db.PipelineService;
-import org.graylog.plugins.pipelineprocessor.db.PipelineStreamAssignmentService;
+import org.graylog.plugins.pipelineprocessor.db.PipelineStreamConnectionsService;
 import org.graylog.plugins.pipelineprocessor.db.RuleDao;
 import org.graylog.plugins.pipelineprocessor.db.RuleService;
 import org.graylog.plugins.pipelineprocessor.functions.conversion.StringConversion;
 import org.graylog.plugins.pipelineprocessor.functions.messages.SetField;
 import org.graylog.plugins.pipelineprocessor.parser.FunctionRegistry;
 import org.graylog.plugins.pipelineprocessor.parser.PipelineRuleParser;
 import org.graylog.plugins.pipelineprocessor.processors.PipelineInterpreter;
-import org.graylog.plugins.pipelineprocessor.rest.PipelineStreamAssignment;
+import org.graylog.plugins.pipelineprocessor.rest.PipelineStreamConnection;
 import org.graylog2.Configuration;
 import org.graylog2.database.NotFoundException;
 import org.graylog2.filters.ExtractorFilter;
@@ -53,7 +53,6 @@
 import org.graylog2.plugin.filters.MessageFilter;
 import org.graylog2.rules.DroolsEngine;
 import org.graylog2.shared.journal.Journal;
-import org.graylog2.shared.stats.ThroughputStats;
 import org.graylog2.streams.StreamFaultManager;
 import org.graylog2.streams.StreamMetrics;
 import org.graylog2.streams.StreamRouter;
@@ -118,12 +117,12 @@ public InterpreterState() {
                                        null)
             ));
 
-            final PipelineStreamAssignmentService pipelineStreamAssignmentService = mock(PipelineStreamAssignmentService.class);
-            final PipelineStreamAssignment pipelineStreamAssignment = PipelineStreamAssignment.create(null,
+            final PipelineStreamConnectionsService pipelineStreamConnectionsService = mock(PipelineStreamConnectionsService.class);
+            final PipelineStreamConnection pipelineStreamConnection = PipelineStreamConnection.create(null,
                                                                                                       "default",
                                                                                                       newHashSet("cde"));
-            when(pipelineStreamAssignmentService.loadAll()).thenReturn(
-                    newHashSet(pipelineStreamAssignment)
+            when(pipelineStreamConnectionsService.loadAll()).thenReturn(
+                    newHashSet(pipelineStreamConnection)
             );
 
             final Map<String, Function<?>> functions = Maps.newHashMap();
@@ -135,7 +134,7 @@ public InterpreterState() {
             interpreter = new PipelineInterpreter(
                     ruleService,
                     pipelineService,
-                    pipelineStreamAssignmentService,
+                    pipelineStreamConnectionsService,
                     parser,
                     mock(Journal.class),
                     mock(MetricRegistry.class),
@@ -217,7 +216,7 @@ public void setup() {
 
                 filters.add(new ExtractorFilter(inputService));
                 filters.add(new StaticFieldFilter(inputService));
-                filters.add(new StreamMatcherFilter(streamRouter, mock(ThroughputStats.class)));
+                filters.add(new StreamMatcherFilter(streamRouter));
                 if (!noDrools) {
                     filters.add(new RulesFilter(droolsEngine, filterService));
                 }