diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java index 466b79f3a..fda1f16cd 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/PulsarActivity.java @@ -3,21 +3,17 @@ package io.nosqlbench.driver.pulsar; import com.codahale.metrics.Timer; import io.nosqlbench.driver.pulsar.ops.PulsarOp; import io.nosqlbench.driver.pulsar.ops.ReadyPulsarOp; -import io.nosqlbench.driver.pulsar.util.PulsarActivityUtil; import io.nosqlbench.driver.pulsar.util.PulsarNBClientConf; import io.nosqlbench.engine.api.activityapi.core.ActivityDefObserver; import io.nosqlbench.engine.api.activityapi.errorhandling.modular.NBErrorHandler; import io.nosqlbench.engine.api.activityapi.planning.OpSequence; import io.nosqlbench.engine.api.activityimpl.ActivityDef; +import io.nosqlbench.engine.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.activityimpl.SimpleActivity; import io.nosqlbench.engine.api.metrics.ActivityMetrics; -import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.function.LongFunction; -import java.util.function.Supplier; - public class PulsarActivity extends SimpleActivity implements ActivityDefObserver { private final static Logger logger = LogManager.getLogger(PulsarActivity.class); @@ -30,7 +26,7 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve private String serviceUrl; private NBErrorHandler errorhandler; - private OpSequence> sequencer; + private OpSequence> sequencer; // private Supplier clientSupplier; // private ThreadLocal> tlClientSupplier; @@ -68,7 +64,7 @@ public class PulsarActivity extends SimpleActivity implements ActivityDefObserve super.onActivityDefUpdate(activityDef); } - public OpSequence> getSequencer() { + public OpSequence> getSequencer() { return sequencer; } diff --git a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java index 54b101e24..e659ee377 100644 --- a/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java +++ b/driver-pulsar/src/main/java/io/nosqlbench/driver/pulsar/ops/ReadyPulsarOp.java @@ -3,6 +3,7 @@ package io.nosqlbench.driver.pulsar.ops; import io.nosqlbench.driver.pulsar.*; import io.nosqlbench.driver.pulsar.util.PulsarActivityUtil; import io.nosqlbench.engine.api.activityconfig.yaml.OpTemplate; +import io.nosqlbench.engine.api.activityimpl.OpDispenser; import io.nosqlbench.engine.api.scoping.ScopedSupplier; import io.nosqlbench.engine.api.templating.CommandTemplate; import org.apache.commons.lang3.StringUtils; @@ -13,7 +14,7 @@ import org.apache.pulsar.client.api.Reader; import java.util.function.LongFunction; import java.util.function.Supplier; -public class ReadyPulsarOp implements LongFunction { +public class ReadyPulsarOp implements OpDispenser { private final OpTemplate opTpl; private final CommandTemplate cmdTpl;