From 515cb7cc3a3db26beda9e70c0c71c49b1af01f78 Mon Sep 17 00:00:00 2001 From: Martin Parm Date: Wed, 6 Jul 2016 17:09:07 +0200 Subject: [PATCH 1/3] Replace Guava Optional with java.util.Optional --- .../com/spotify/ffwd/filter/TrueFilter.java | 2 +- .../ffwd/protocol/ProtocolFactory.java | 2 +- .../spotify/ffwd/protocol/RetryPolicy.java | 12 +++--- .../java/com/spotify/ffwd/AgentConfig.java | 38 +++++++------------ .../ffwd/generated/GeneratedInputPlugin.java | 5 ++- .../ffwd/input/InputManagerModule.java | 8 ++-- .../spotify/ffwd/noop/NoopOutputPlugin.java | 4 +- .../ffwd/output/OutputManagerModule.java | 8 ++-- .../ffwd/carbon/CarbonInputPlugin.java | 13 ++++--- .../spotify/ffwd/json/JsonInputPlugin.java | 11 +++--- .../spotify/ffwd/kafka/KafkaOutputPlugin.java | 29 +++++++------- .../spotify/ffwd/kafka/KafkaPartitioner.java | 7 ++-- .../com/spotify/ffwd/kafka/KafkaRouter.java | 15 ++++---- .../ffwd/protobuf/ProtobufInputPlugin.java | 10 +++-- .../ffwd/riemann/RiemannInputPlugin.java | 8 ++-- .../ffwd/riemann/RiemannOutputPlugin.java | 14 +++---- .../ffwd/template/TemplateOutputPlugin.java | 9 +++-- 17 files changed, 97 insertions(+), 98 deletions(-) diff --git a/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java b/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java index fde78d01..38e00774 100644 --- a/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java +++ b/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java @@ -19,12 +19,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; -import com.google.common.base.Supplier; import com.spotify.ffwd.model.Event; import com.spotify.ffwd.model.Metric; import lombok.Data; import java.io.IOException; +import java.util.function.Supplier; @Data public class TrueFilter implements Filter { diff --git a/api/src/main/java/com/spotify/ffwd/protocol/ProtocolFactory.java b/api/src/main/java/com/spotify/ffwd/protocol/ProtocolFactory.java index 7e28568e..dec58e88 100644 --- a/api/src/main/java/com/spotify/ffwd/protocol/ProtocolFactory.java +++ b/api/src/main/java/com/spotify/ffwd/protocol/ProtocolFactory.java @@ -17,10 +17,10 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Supplier; import lombok.Data; import java.net.InetSocketAddress; +import java.util.function.Supplier; /** * Data type suitable for building using a @JsonCreator block. diff --git a/api/src/main/java/com/spotify/ffwd/protocol/RetryPolicy.java b/api/src/main/java/com/spotify/ffwd/protocol/RetryPolicy.java index 1cff6be9..232f7a3a 100644 --- a/api/src/main/java/com/spotify/ffwd/protocol/RetryPolicy.java +++ b/api/src/main/java/com/spotify/ffwd/protocol/RetryPolicy.java @@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; -import com.google.common.base.Optional; +import java.util.Optional; import java.util.concurrent.TimeUnit; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") @@ -51,7 +51,7 @@ class Constant implements RetryPolicy { @JsonCreator public Constant(@JsonProperty("value") Long value) { - this.value = Optional.fromNullable(value).or(DEFAULT_VALUE); + this.value = Optional.ofNullable(value).orElse(DEFAULT_VALUE); } @Override @@ -75,8 +75,8 @@ class Exponential implements RetryPolicy { @JsonCreator public Exponential(@JsonProperty("initial") Long initial, @JsonProperty("max") Long max) { - this.initial = Optional.fromNullable(initial).or(DEFAULT_INITIAL); - this.max = Optional.fromNullable(max).or(DEFAULT_MAX); + this.initial = Optional.ofNullable(initial).orElse(DEFAULT_INITIAL); + this.max = Optional.ofNullable(max).orElse(DEFAULT_MAX); this.maxAttempt = new Double(Math.floor(Math.log(this.max / this.initial) / Math.log(2))).intValue(); } @@ -108,8 +108,8 @@ class Linear implements RetryPolicy { @JsonCreator public Linear(@JsonProperty("value") Long value, @JsonProperty("max") Long max) { - this.value = Optional.fromNullable(value).or(DEFAULT_VALUE); - this.max = Optional.fromNullable(max).or(DEFAULT_MAX); + this.value = Optional.ofNullable(value).orElse(DEFAULT_VALUE); + this.max = Optional.ofNullable(max).orElse(DEFAULT_MAX); this.maxAttempt = (int) ((this.max / this.value) - 1); } diff --git a/core/src/main/java/com/spotify/ffwd/AgentConfig.java b/core/src/main/java/com/spotify/ffwd/AgentConfig.java index d0e9dbf8..11aaf38c 100644 --- a/core/src/main/java/com/spotify/ffwd/AgentConfig.java +++ b/core/src/main/java/com/spotify/ffwd/AgentConfig.java @@ -17,8 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; -import com.google.common.base.Supplier; import com.google.common.collect.Maps; import com.spotify.ffwd.input.InputManagerModule; import com.spotify.ffwd.output.OutputManagerModule; @@ -30,6 +28,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; +import java.util.Optional; @Data public class AgentConfig { @@ -65,27 +64,18 @@ public AgentConfig( @JsonProperty("workerThreads") Integer workerThreads, @JsonProperty("ttl") Long ttl, @JsonProperty("qlog") String qlog ) { - this.debug = Optional.fromNullable(debug); - this.host = Optional.fromNullable(host).or(this.defaultHostSupplier()); - this.tags = Optional.fromNullable(tags).or(DEFAULT_TAGS); - this.input = Optional.fromNullable(input).or(InputManagerModule.supplyDefault()); - this.output = Optional.fromNullable(output).or(OutputManagerModule.supplyDefault()); - this.asyncThreads = Optional.fromNullable(asyncThreads).or(DEFAULT_ASYNC_THREADS); + this.debug = Optional.ofNullable(debug); + this.host = Optional.ofNullable(host).orElseGet(this::buildDefaultHost); + this.tags = Optional.ofNullable(tags).orElse(DEFAULT_TAGS); + this.input = Optional.ofNullable(input).orElseGet(InputManagerModule.supplyDefault()); + this.output = Optional.ofNullable(output).orElseGet(OutputManagerModule.supplyDefault()); + this.asyncThreads = Optional.ofNullable(asyncThreads).orElse(DEFAULT_ASYNC_THREADS); this.schedulerThreads = - Optional.fromNullable(schedulerThreads).or(DEFAULT_SCHEDULER_THREADS); - this.bossThreads = Optional.fromNullable(bossThreads).or(DEFAULT_BOSS_THREADS); - this.workerThreads = Optional.fromNullable(workerThreads).or(DEFAULT_WORKER_THREADS); - this.ttl = Optional.fromNullable(ttl).or(0L); - this.qlog = Paths.get(Optional.fromNullable(qlog).or(DEFAULT_QLOG)); - } - - private Supplier defaultHostSupplier() { - return new Supplier() { - @Override - public String get() { - return buildDefaultHost(); - } - }; + Optional.ofNullable(schedulerThreads).orElse(DEFAULT_SCHEDULER_THREADS); + this.bossThreads = Optional.ofNullable(bossThreads).orElse(DEFAULT_BOSS_THREADS); + this.workerThreads = Optional.ofNullable(workerThreads).orElse(DEFAULT_WORKER_THREADS); + this.ttl = Optional.ofNullable(ttl).orElse(0L); + this.qlog = Paths.get(Optional.ofNullable(qlog).orElse(DEFAULT_QLOG)); } private String buildDefaultHost() { @@ -105,8 +95,8 @@ public static final class Debug { @JsonCreator public Debug(@JsonProperty("host") String host, @JsonProperty("port") Integer port) { - this.localAddress = buildLocalAddress(Optional.fromNullable(host).or(DEFAULT_HOST), - Optional.fromNullable(port).or(DEFAULT_PORT)); + this.localAddress = buildLocalAddress(Optional.ofNullable(host).orElse(DEFAULT_HOST), + Optional.ofNullable(port).orElse(DEFAULT_PORT)); } private InetSocketAddress buildLocalAddress(String host, Integer port) { diff --git a/core/src/main/java/com/spotify/ffwd/generated/GeneratedInputPlugin.java b/core/src/main/java/com/spotify/ffwd/generated/GeneratedInputPlugin.java index ba94d897..da2967aa 100644 --- a/core/src/main/java/com/spotify/ffwd/generated/GeneratedInputPlugin.java +++ b/core/src/main/java/com/spotify/ffwd/generated/GeneratedInputPlugin.java @@ -17,19 +17,20 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.PrivateModule; import com.spotify.ffwd.input.InputPlugin; import com.spotify.ffwd.input.PluginSource; +import java.util.Optional; + public class GeneratedInputPlugin implements InputPlugin { private final boolean sameHost; @JsonCreator public GeneratedInputPlugin(@JsonProperty("sameHost") Boolean sameHost) { - this.sameHost = Optional.fromNullable(sameHost).or(false); + this.sameHost = Optional.ofNullable(sameHost).orElse(false); } @Override diff --git a/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java b/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java index 20e6d3f2..fd0746d2 100644 --- a/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java +++ b/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java @@ -17,8 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; -import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.google.inject.Key; import com.google.inject.Module; @@ -36,6 +34,8 @@ import java.util.List; import java.util.Set; +import java.util.Optional; +import java.util.function.Supplier; public class InputManagerModule { private static final List DEFAULT_PLUGINS = Lists.newArrayList(); @@ -47,8 +47,8 @@ public class InputManagerModule { public InputManagerModule( @JsonProperty("plugins") List plugins, @JsonProperty("filter") Filter filter ) { - this.plugins = Optional.fromNullable(plugins).or(DEFAULT_PLUGINS); - this.filter = Optional.fromNullable(filter).or(new TrueFilter()); + this.plugins = Optional.ofNullable(plugins).orElse(DEFAULT_PLUGINS); + this.filter = Optional.ofNullable(filter).orElseGet(() -> new TrueFilter()); } public Module module() { diff --git a/core/src/main/java/com/spotify/ffwd/noop/NoopOutputPlugin.java b/core/src/main/java/com/spotify/ffwd/noop/NoopOutputPlugin.java index 838f9ccf..668e1e2f 100644 --- a/core/src/main/java/com/spotify/ffwd/noop/NoopOutputPlugin.java +++ b/core/src/main/java/com/spotify/ffwd/noop/NoopOutputPlugin.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Scopes; @@ -27,6 +26,7 @@ import com.spotify.ffwd.output.OutputPluginModule; import com.spotify.ffwd.output.PluginSink; +import java.util.Optional; import java.util.concurrent.TimeUnit; public class NoopOutputPlugin implements OutputPlugin { @@ -37,7 +37,7 @@ public class NoopOutputPlugin implements OutputPlugin { @JsonCreator public NoopOutputPlugin(@JsonProperty("flushInterval") Long flushInterval) { - this.flushInterval = Optional.fromNullable(flushInterval).or(DEFAULT_FLUSH_INTERVAL); + this.flushInterval = Optional.ofNullable(flushInterval).orElse(DEFAULT_FLUSH_INTERVAL); } @Override diff --git a/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java b/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java index d9df5ad1..e0af3ed3 100644 --- a/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java +++ b/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java @@ -17,8 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; -import com.google.common.base.Supplier; import com.google.common.collect.Lists; import com.google.inject.Key; import com.google.inject.Module; @@ -37,7 +35,9 @@ import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; +import java.util.function.Supplier; public class OutputManagerModule { private static final List DEFAULT_PLUGINS = Lists.newArrayList(); @@ -49,8 +49,8 @@ public class OutputManagerModule { public OutputManagerModule( @JsonProperty("plugins") List plugins, @JsonProperty("filter") Filter filter ) { - this.plugins = Optional.fromNullable(plugins).or(DEFAULT_PLUGINS); - this.filter = Optional.fromNullable(filter).or(new TrueFilter()); + this.plugins = Optional.ofNullable(plugins).orElse(DEFAULT_PLUGINS); + this.filter = Optional.ofNullable(filter).orElseGet(() -> new TrueFilter()); } public Module module() { diff --git a/modules/carbon/src/main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java b/modules/carbon/src/main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java index 10adec8c..32f19ae5 100644 --- a/modules/carbon/src/main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java +++ b/modules/carbon/src/main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.PrivateModule; @@ -30,6 +29,8 @@ import com.spotify.ffwd.protocol.ProtocolType; import com.spotify.ffwd.protocol.RetryPolicy; +import java.util.Optional; + public class CarbonInputPlugin implements InputPlugin { private static final ProtocolType DEFAULT_PROTOCOL = ProtocolType.TCP; private static final int DEFAULT_PORT = 20003; @@ -51,13 +52,13 @@ public CarbonInputPlugin( @JsonProperty("retry") final RetryPolicy retry, @JsonProperty("key") final String key ) { this.protocol = Optional - .fromNullable(protocol) - .or(ProtocolFactory.defaultFor()) + .ofNullable(protocol) + .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolServer = - parseProtocolServer(Optional.fromNullable(delimiter).or(defaultDelimiter())); - this.retry = Optional.fromNullable(retry).or(new RetryPolicy.Exponential()); - this.metricKey = Optional.fromNullable(key).or(DEFAULT_KEY); + parseProtocolServer(Optional.ofNullable(delimiter).orElseGet(this::defaultDelimiter)); + this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); + this.metricKey = Optional.ofNullable(key).orElse(DEFAULT_KEY); } private String defaultDelimiter() { diff --git a/modules/json/src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java b/modules/json/src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java index 7e0822ff..54cedbb3 100644 --- a/modules/json/src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java +++ b/modules/json/src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.PrivateModule; @@ -30,6 +29,8 @@ import com.spotify.ffwd.protocol.ProtocolType; import com.spotify.ffwd.protocol.RetryPolicy; +import java.util.Optional; + public class JsonInputPlugin implements InputPlugin { private static final ProtocolType DEFAULT_PROTOCOL = ProtocolType.UDP; private static final int DEFAULT_PORT = 19000; @@ -49,12 +50,12 @@ public JsonInputPlugin( @JsonProperty("delimiter") String delimiter, @JsonProperty("retry") RetryPolicy retry ) { this.protocol = Optional - .fromNullable(protocol) - .or(ProtocolFactory.defaultFor()) + .ofNullable(protocol) + .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolServer = - parseProtocolServer(Optional.fromNullable(delimiter).or(defaultDelimiter())); - this.retry = Optional.fromNullable(retry).or(new RetryPolicy.Exponential()); + parseProtocolServer(Optional.ofNullable(delimiter).orElseGet(this::defaultDelimiter)); + this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); } private String defaultDelimiter() { diff --git a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java index 3e050713..e1cadc73 100644 --- a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java +++ b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provides; @@ -35,6 +34,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import java.util.Optional; public class KafkaOutputPlugin implements OutputPlugin { public static final int DEFAULT_BATCH_SIZE = 1000; @@ -43,8 +43,8 @@ public class KafkaOutputPlugin implements OutputPlugin { private final KafkaRouter router; private final KafkaPartitioner partitioner; private final Map properties; - private final Long flushInterval; - private final Serializer serializer; + private final Optional flushInterval; + private final Optional serializer; private final int batchSize; private final boolean compression; @@ -58,13 +58,14 @@ public KafkaOutputPlugin( @JsonProperty("batchSize") Integer batchSize, @JsonProperty("compression") Boolean compression ) { - this.router = Optional.fromNullable(router).or(KafkaRouter.Tag.supplier()); - this.partitioner = Optional.fromNullable(partitioner).or(KafkaPartitioner.Host.supplier()); - this.flushInterval = Optional.fromNullable(flushInterval).orNull(); - this.properties = Optional.fromNullable(properties).or(new HashMap()); - this.serializer = Optional.fromNullable(serializer).orNull(); - this.batchSize = Optional.fromNullable(batchSize).or(DEFAULT_BATCH_SIZE); - this.compression = Optional.fromNullable(compression).or(DEFAULT_COMPRESSION); + this.router = Optional.ofNullable(router).orElseGet(KafkaRouter.Tag.supplier()); + this.partitioner = Optional.ofNullable(partitioner) + .orElseGet(KafkaPartitioner.Host.supplier()); + this.flushInterval = Optional.ofNullable(flushInterval); + this.properties = Optional.ofNullable(properties).orElseGet(() -> new HashMap<>()); + this.serializer = Optional.ofNullable(serializer); + this.batchSize = Optional.ofNullable(batchSize).orElse(DEFAULT_BATCH_SIZE); + this.compression = Optional.ofNullable(compression).orElse(DEFAULT_COMPRESSION); } @Override @@ -92,16 +93,16 @@ protected void configure() { bind(KafkaRouter.class).toInstance(router); bind(KafkaPartitioner.class).toInstance(partitioner); - if (serializer == null) { + if (serializer.isPresent()) { // bind to default implementation, provided by core. bind(Serializer.class).to(Key.get(Serializer.class, Names.named("default"))); } else { - bind(Serializer.class).toInstance(serializer); + bind(Serializer.class).toInstance(serializer.get()); } - if (flushInterval != null) { + if (flushInterval.isPresent()) { bind(BatchedPluginSink.class).toInstance(new KafkaPluginSink(batchSize)); - bind(key).toInstance(new FlushingPluginSink(flushInterval)); + bind(key).toInstance(new FlushingPluginSink(flushInterval.get())); } else { bind(key).toInstance(new KafkaPluginSink(batchSize)); } diff --git a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java index 77a7b6ec..371a4dd9 100644 --- a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java +++ b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java @@ -19,11 +19,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.google.common.base.Optional; -import com.google.common.base.Supplier; import com.spotify.ffwd.model.Event; import com.spotify.ffwd.model.Metric; +import java.util.Optional; +import java.util.function.Supplier; + @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") @JsonSubTypes({ @JsonSubTypes.Type(value = KafkaPartitioner.Tag.class, name = "tag"), @@ -67,7 +68,7 @@ class Tag implements KafkaPartitioner { @JsonCreator public Tag(@JsonProperty("tag") final String tagKey) { - this.tagKey = Optional.fromNullable(tagKey).or(DEFAULT_TAGKEY); + this.tagKey = Optional.ofNullable(tagKey).orElse(DEFAULT_TAGKEY); } @Override diff --git a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaRouter.java b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaRouter.java index e03be8de..5c601712 100644 --- a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaRouter.java +++ b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaRouter.java @@ -19,11 +19,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.google.common.base.Optional; -import com.google.common.base.Supplier; import com.spotify.ffwd.model.Event; import com.spotify.ffwd.model.Metric; +import java.util.Optional; +import java.util.function.Supplier; + @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") @JsonSubTypes({ @JsonSubTypes.Type(value = KafkaRouter.Tag.class, name = "tag"), @@ -49,9 +50,9 @@ public Tag( @JsonProperty("tag") final String tagKey, @JsonProperty("metrics") String metrics, @JsonProperty("events") String events ) { - this.tagKey = Optional.fromNullable(tagKey).or(DEFAULT_TAGKEY); - this.metrics = Optional.fromNullable(metrics).or(DEFAULT_METRICS); - this.events = Optional.fromNullable(events).or(DEFAULT_EVENTS); + this.tagKey = Optional.ofNullable(tagKey).orElse(DEFAULT_TAGKEY); + this.metrics = Optional.ofNullable(metrics).orElse(DEFAULT_METRICS); + this.events = Optional.ofNullable(events).orElse(DEFAULT_EVENTS); } @Override @@ -97,8 +98,8 @@ class Static implements KafkaRouter { public Static( @JsonProperty("metrics") String metrics, @JsonProperty("events") String events ) { - this.metrics = Optional.fromNullable(metrics).or(DEFAULT_METRICS); - this.events = Optional.fromNullable(events).or(DEFAULT_EVENTS); + this.metrics = Optional.ofNullable(metrics).orElse(DEFAULT_METRICS); + this.events = Optional.ofNullable(events).orElse(DEFAULT_EVENTS); } @Override diff --git a/modules/protobuf/src/main/java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java b/modules/protobuf/src/main/java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java index 3ca7a832..eeb0a49c 100644 --- a/modules/protobuf/src/main/java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java +++ b/modules/protobuf/src/main/java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java @@ -17,7 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; + import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.PrivateModule; @@ -30,6 +30,8 @@ import com.spotify.ffwd.protocol.ProtocolType; import com.spotify.ffwd.protocol.RetryPolicy; +import java.util.Optional; + public class ProtobufInputPlugin implements InputPlugin { private static final ProtocolType DEFAULT_PROTOCOL = ProtocolType.UDP; private static final int DEFAULT_PORT = 19091; @@ -43,11 +45,11 @@ public ProtobufInputPlugin( @JsonProperty("protocol") ProtocolFactory protocol, @JsonProperty("retry") RetryPolicy retry ) { this.protocol = Optional - .fromNullable(protocol) - .or(ProtocolFactory.defaultFor()) + .ofNullable(protocol) + .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolServer = parseProtocolServer(); - this.retry = Optional.fromNullable(retry).or(new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); } private Class parseProtocolServer() { diff --git a/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannInputPlugin.java b/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannInputPlugin.java index d525fb5c..88757c7e 100644 --- a/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannInputPlugin.java +++ b/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannInputPlugin.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.PrivateModule; @@ -32,6 +31,7 @@ import com.spotify.ffwd.protocol.RetryPolicy; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; +import java.util.Optional; @Slf4j public class RiemannInputPlugin implements InputPlugin { @@ -47,11 +47,11 @@ public RiemannInputPlugin( @JsonProperty("protocol") ProtocolFactory protocol, @JsonProperty("retry") RetryPolicy retry ) { this.protocol = Optional - .fromNullable(protocol) - .or(ProtocolFactory.defaultFor()) + .ofNullable(protocol) + .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolServer = parseProtocolServer(); - this.retry = Optional.fromNullable(retry).or(new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); } private Class parseProtocolServer() { diff --git a/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java b/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java index bffc0391..021c4839 100644 --- a/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java +++ b/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; import com.google.common.collect.Sets; import com.google.inject.Key; import com.google.inject.Module; @@ -38,6 +37,7 @@ import com.spotify.ffwd.protocol.RetryPolicy; import java.util.Set; +import java.util.Optional; public class RiemannOutputPlugin implements OutputPlugin { private static final ProtocolType DEFAULT_PROTOCOL = ProtocolType.TCP; @@ -60,15 +60,15 @@ public RiemannOutputPlugin( @JsonProperty("retry") RetryPolicy retry, @JsonProperty("riemannTags") Set riemannTags ) { - this.filter = Optional.fromNullable(filter).or(TrueFilter.supplier()); - this.flushInterval = Optional.fromNullable(flushInterval).or(DEFAULT_FLUSH_INTERVAL); + this.filter = Optional.ofNullable(filter).orElseGet(TrueFilter.supplier()); + this.flushInterval = Optional.ofNullable(flushInterval).orElse(DEFAULT_FLUSH_INTERVAL); this.protocol = Optional - .fromNullable(protocol) - .or(ProtocolFactory.defaultFor()) + .ofNullable(protocol) + .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolClient = parseProtocolClient(); - this.retry = Optional.fromNullable(retry).or(new RetryPolicy.Exponential()); - this.riemannTags = Optional.fromNullable(riemannTags).or(DEFAULT_TAGS); + this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); + this.riemannTags = Optional.ofNullable(riemannTags).orElse(DEFAULT_TAGS); } private Class parseProtocolClient() { diff --git a/modules/template/src/main/java/com/spotify/ffwd/template/TemplateOutputPlugin.java b/modules/template/src/main/java/com/spotify/ffwd/template/TemplateOutputPlugin.java index 84befc14..ddc7a69e 100644 --- a/modules/template/src/main/java/com/spotify/ffwd/template/TemplateOutputPlugin.java +++ b/modules/template/src/main/java/com/spotify/ffwd/template/TemplateOutputPlugin.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Optional; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.PrivateModule; @@ -32,6 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Optional; + public class TemplateOutputPlugin implements OutputPlugin { private static final ProtocolType DEFAULT_PROTOCOL = ProtocolType.TCP; private static final int DEFAULT_PORT = 8910; @@ -45,10 +46,10 @@ public TemplateOutputPlugin( @JsonProperty("retry") final RetryPolicy retry ) { this.protocol = Optional - .fromNullable(protocol) - .or(ProtocolFactory.defaultFor()) + .ofNullable(protocol) + .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); - this.retry = Optional.fromNullable(retry).or(new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); } @Override From 42d11535bb39923678403f6edf1b148a50fa442a Mon Sep 17 00:00:00 2001 From: Martin Parm Date: Wed, 6 Jul 2016 17:29:14 +0200 Subject: [PATCH 2/3] Replaced all anonymous Supplier classes with lambdas or method references --- .../com/spotify/ffwd/filter/TrueFilter.java | 7 +------ .../ffwd/protocol/ProtocolFactory.java | 7 +------ .../ffwd/input/InputManagerModule.java | 7 +------ .../ffwd/output/OutputManagerModule.java | 7 +------ .../ffwd/serializer/ToStringSerializer.java | 10 +++------ .../spotify/ffwd/kafka/KafkaPartitioner.java | 21 +++---------------- .../com/spotify/ffwd/kafka/KafkaRouter.java | 14 ++----------- 7 files changed, 12 insertions(+), 61 deletions(-) diff --git a/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java b/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java index 38e00774..e771ce91 100644 --- a/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java +++ b/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java @@ -51,11 +51,6 @@ public Filter deserialize(JsonParser p, DeserializationContext ctx) } public static Supplier supplier() { - return new Supplier() { - @Override - public TrueFilter get() { - return new TrueFilter(); - } - }; + return TrueFilter::new; } } diff --git a/api/src/main/java/com/spotify/ffwd/protocol/ProtocolFactory.java b/api/src/main/java/com/spotify/ffwd/protocol/ProtocolFactory.java index dec58e88..54ed03fa 100644 --- a/api/src/main/java/com/spotify/ffwd/protocol/ProtocolFactory.java +++ b/api/src/main/java/com/spotify/ffwd/protocol/ProtocolFactory.java @@ -54,12 +54,7 @@ public ProtocolFactory( * @return */ public static Supplier defaultFor() { - return new Supplier() { - @Override - public ProtocolFactory get() { - return new ProtocolFactory(null, null, null, null); - } - }; + return () -> new ProtocolFactory(null, null, null, null); } /** diff --git a/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java b/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java index fd0746d2..519fe926 100644 --- a/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java +++ b/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java @@ -98,11 +98,6 @@ private void bindPlugins() { } public static Supplier supplyDefault() { - return new Supplier() { - @Override - public InputManagerModule get() { - return new InputManagerModule(null, null); - } - }; + return () -> new InputManagerModule(null, null); } } diff --git a/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java b/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java index e0af3ed3..efd1605a 100644 --- a/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java +++ b/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java @@ -119,11 +119,6 @@ private void bindPlugins() { } public static Supplier supplyDefault() { - return new Supplier() { - @Override - public OutputManagerModule get() { - return new OutputManagerModule(null, null); - } - }; + return () -> new OutputManagerModule(null, null); } } diff --git a/core/src/main/java/com/spotify/ffwd/serializer/ToStringSerializer.java b/core/src/main/java/com/spotify/ffwd/serializer/ToStringSerializer.java index 63aeb861..822c93cc 100644 --- a/core/src/main/java/com/spotify/ffwd/serializer/ToStringSerializer.java +++ b/core/src/main/java/com/spotify/ffwd/serializer/ToStringSerializer.java @@ -16,11 +16,12 @@ package com.spotify.ffwd.serializer; import com.fasterxml.jackson.annotation.JsonCreator; -import com.google.common.base.Supplier; import com.spotify.ffwd.model.Event; import com.spotify.ffwd.model.Metric; import lombok.extern.slf4j.Slf4j; +import java.util.function.Supplier; + @Slf4j public class ToStringSerializer implements Serializer { @JsonCreator @@ -39,11 +40,6 @@ public byte[] serialize(Metric metric) throws Exception { } public static Supplier defaultSupplier() { - return new Supplier() { - @Override - public Serializer get() { - return new ToStringSerializer(); - } - }; + return () -> new ToStringSerializer(); } } diff --git a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java index 371a4dd9..6d6c4443 100644 --- a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java +++ b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java @@ -52,12 +52,7 @@ public int partition(final Metric metric) { } public static Supplier supplier() { - return new Supplier() { - @Override - public KafkaPartitioner get() { - return new Host(); - } - }; + return Host::new; } } @@ -96,12 +91,7 @@ public int partition(final Metric metric) { } public static Supplier supplier() { - return new Supplier() { - @Override - public KafkaPartitioner get() { - return new Tag(null); - } - }; + return () -> new Tag(null); } } @@ -121,12 +111,7 @@ public int partition(final Metric metric) { } public static Supplier supplier() { - return new Supplier() { - @Override - public KafkaPartitioner get() { - return new Hashed(); - } - }; + return Hashed::new; } } } diff --git a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaRouter.java b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaRouter.java index 5c601712..c4a13e8c 100644 --- a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaRouter.java +++ b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaRouter.java @@ -78,12 +78,7 @@ public String route(final Metric metric) { } public static Supplier supplier() { - return new Supplier() { - @Override - public KafkaRouter get() { - return new Tag(null, null, null); - } - }; + return () -> new Tag(null, null, null); } } @@ -113,12 +108,7 @@ public String route(final Metric metric) { } public static Supplier supplier() { - return new Supplier() { - @Override - public KafkaRouter get() { - return new Static(null, null); - } - }; + return () -> new Static(null, null); } } } From 47d8881bd781bb0d1a0b6fe848a057c3f80cb941 Mon Sep 17 00:00:00 2001 From: Martin Parm Date: Wed, 6 Jul 2016 18:12:03 +0200 Subject: [PATCH 3/3] Replaced lambdas with method references --- api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java | 5 ----- .../main/java/com/spotify/ffwd/input/InputManagerModule.java | 2 +- .../java/com/spotify/ffwd/output/OutputManagerModule.java | 2 +- .../java/com/spotify/ffwd/serializer/ToStringSerializer.java | 2 +- .../main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java | 2 +- .../src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java | 2 +- .../main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java | 4 ++-- .../main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java | 4 ---- .../java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java | 2 +- .../java/com/spotify/ffwd/riemann/RiemannInputPlugin.java | 2 +- .../java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java | 4 ++-- .../java/com/spotify/ffwd/template/TemplateOutputPlugin.java | 2 +- 12 files changed, 12 insertions(+), 21 deletions(-) diff --git a/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java b/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java index e771ce91..d5139474 100644 --- a/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java +++ b/api/src/main/java/com/spotify/ffwd/filter/TrueFilter.java @@ -24,7 +24,6 @@ import lombok.Data; import java.io.IOException; -import java.util.function.Supplier; @Data public class TrueFilter implements Filter { @@ -49,8 +48,4 @@ public Filter deserialize(JsonParser p, DeserializationContext ctx) return new TrueFilter(); } } - - public static Supplier supplier() { - return TrueFilter::new; - } } diff --git a/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java b/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java index 519fe926..16849633 100644 --- a/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java +++ b/core/src/main/java/com/spotify/ffwd/input/InputManagerModule.java @@ -48,7 +48,7 @@ public InputManagerModule( @JsonProperty("plugins") List plugins, @JsonProperty("filter") Filter filter ) { this.plugins = Optional.ofNullable(plugins).orElse(DEFAULT_PLUGINS); - this.filter = Optional.ofNullable(filter).orElseGet(() -> new TrueFilter()); + this.filter = Optional.ofNullable(filter).orElseGet(TrueFilter::new); } public Module module() { diff --git a/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java b/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java index efd1605a..6e287971 100644 --- a/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java +++ b/core/src/main/java/com/spotify/ffwd/output/OutputManagerModule.java @@ -50,7 +50,7 @@ public OutputManagerModule( @JsonProperty("plugins") List plugins, @JsonProperty("filter") Filter filter ) { this.plugins = Optional.ofNullable(plugins).orElse(DEFAULT_PLUGINS); - this.filter = Optional.ofNullable(filter).orElseGet(() -> new TrueFilter()); + this.filter = Optional.ofNullable(filter).orElseGet(TrueFilter::new); } public Module module() { diff --git a/core/src/main/java/com/spotify/ffwd/serializer/ToStringSerializer.java b/core/src/main/java/com/spotify/ffwd/serializer/ToStringSerializer.java index 822c93cc..e0ce86dc 100644 --- a/core/src/main/java/com/spotify/ffwd/serializer/ToStringSerializer.java +++ b/core/src/main/java/com/spotify/ffwd/serializer/ToStringSerializer.java @@ -40,6 +40,6 @@ public byte[] serialize(Metric metric) throws Exception { } public static Supplier defaultSupplier() { - return () -> new ToStringSerializer(); + return ToStringSerializer::new; } } diff --git a/modules/carbon/src/main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java b/modules/carbon/src/main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java index 32f19ae5..bf8425ee 100644 --- a/modules/carbon/src/main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java +++ b/modules/carbon/src/main/java/com/spotify/ffwd/carbon/CarbonInputPlugin.java @@ -57,7 +57,7 @@ public CarbonInputPlugin( .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolServer = parseProtocolServer(Optional.ofNullable(delimiter).orElseGet(this::defaultDelimiter)); - this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(RetryPolicy.Exponential::new); this.metricKey = Optional.ofNullable(key).orElse(DEFAULT_KEY); } diff --git a/modules/json/src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java b/modules/json/src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java index 54cedbb3..278ec208 100644 --- a/modules/json/src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java +++ b/modules/json/src/main/java/com/spotify/ffwd/json/JsonInputPlugin.java @@ -55,7 +55,7 @@ public JsonInputPlugin( .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolServer = parseProtocolServer(Optional.ofNullable(delimiter).orElseGet(this::defaultDelimiter)); - this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(RetryPolicy.Exponential::new); } private String defaultDelimiter() { diff --git a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java index e1cadc73..b539b183 100644 --- a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java +++ b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaOutputPlugin.java @@ -60,9 +60,9 @@ public KafkaOutputPlugin( ) { this.router = Optional.ofNullable(router).orElseGet(KafkaRouter.Tag.supplier()); this.partitioner = Optional.ofNullable(partitioner) - .orElseGet(KafkaPartitioner.Host.supplier()); + .orElseGet(KafkaPartitioner.Host::new); this.flushInterval = Optional.ofNullable(flushInterval); - this.properties = Optional.ofNullable(properties).orElseGet(() -> new HashMap<>()); + this.properties = Optional.ofNullable(properties).orElseGet(HashMap::new); this.serializer = Optional.ofNullable(serializer); this.batchSize = Optional.ofNullable(batchSize).orElse(DEFAULT_BATCH_SIZE); this.compression = Optional.ofNullable(compression).orElse(DEFAULT_COMPRESSION); diff --git a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java index 6d6c4443..6332410e 100644 --- a/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java +++ b/modules/kafka/src/main/java/com/spotify/ffwd/kafka/KafkaPartitioner.java @@ -50,10 +50,6 @@ public int partition(final Event event) { public int partition(final Metric metric) { return metric.getHost().hashCode(); } - - public static Supplier supplier() { - return Host::new; - } } class Tag implements KafkaPartitioner { diff --git a/modules/protobuf/src/main/java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java b/modules/protobuf/src/main/java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java index eeb0a49c..e07388a1 100644 --- a/modules/protobuf/src/main/java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java +++ b/modules/protobuf/src/main/java/com/spotify/ffwd/protobuf/ProtobufInputPlugin.java @@ -49,7 +49,7 @@ public ProtobufInputPlugin( .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolServer = parseProtocolServer(); - this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(RetryPolicy.Exponential::new); } private Class parseProtocolServer() { diff --git a/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannInputPlugin.java b/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannInputPlugin.java index 88757c7e..1b42eb27 100644 --- a/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannInputPlugin.java +++ b/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannInputPlugin.java @@ -51,7 +51,7 @@ public RiemannInputPlugin( .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolServer = parseProtocolServer(); - this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(RetryPolicy.Exponential::new); } private Class parseProtocolServer() { diff --git a/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java b/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java index 021c4839..d5500535 100644 --- a/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java +++ b/modules/riemann/src/main/java/com/spotify/ffwd/riemann/RiemannOutputPlugin.java @@ -60,14 +60,14 @@ public RiemannOutputPlugin( @JsonProperty("retry") RetryPolicy retry, @JsonProperty("riemannTags") Set riemannTags ) { - this.filter = Optional.ofNullable(filter).orElseGet(TrueFilter.supplier()); + this.filter = Optional.ofNullable(filter).orElseGet(TrueFilter::new); this.flushInterval = Optional.ofNullable(flushInterval).orElse(DEFAULT_FLUSH_INTERVAL); this.protocol = Optional .ofNullable(protocol) .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); this.protocolClient = parseProtocolClient(); - this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(RetryPolicy.Exponential::new); this.riemannTags = Optional.ofNullable(riemannTags).orElse(DEFAULT_TAGS); } diff --git a/modules/template/src/main/java/com/spotify/ffwd/template/TemplateOutputPlugin.java b/modules/template/src/main/java/com/spotify/ffwd/template/TemplateOutputPlugin.java index ddc7a69e..f78d88f9 100644 --- a/modules/template/src/main/java/com/spotify/ffwd/template/TemplateOutputPlugin.java +++ b/modules/template/src/main/java/com/spotify/ffwd/template/TemplateOutputPlugin.java @@ -49,7 +49,7 @@ public TemplateOutputPlugin( .ofNullable(protocol) .orElseGet(ProtocolFactory.defaultFor()) .protocol(DEFAULT_PROTOCOL, DEFAULT_PORT); - this.retry = Optional.ofNullable(retry).orElseGet(() -> new RetryPolicy.Exponential()); + this.retry = Optional.ofNullable(retry).orElseGet(RetryPolicy.Exponential::new); } @Override