Replaced lambdas with method references

spotify · Jul 13, 2016 · 4262e58 · 4262e58
1 parent 18ecf9b
commit 4262e58
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 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
@@ -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<TrueFilter> 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
@@ -48,7 +48,7 @@ public InputManagerModule(
         @JsonProperty("plugins") List<InputPlugin> 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
@@ -50,7 +50,7 @@ public OutputManagerModule(
         @JsonProperty("plugins") List<OutputPlugin> 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
@@ -40,6 +40,6 @@ public byte[] serialize(Metric metric) throws Exception {
     }
 
     public static Supplier<Serializer> 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
@@ -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
@@ -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
@@ -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
@@ -50,10 +50,6 @@ public int partition(final Event event) {
         public int partition(final Metric metric) {
             return metric.getHost().hashCode();
         }
-
-        public static Supplier<KafkaPartitioner> 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
@@ -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<? extends ProtocolServer> 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
@@ -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<? extends ProtocolServer> 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
@@ -60,14 +60,14 @@ public RiemannOutputPlugin(
         @JsonProperty("retry") RetryPolicy retry,
         @JsonProperty("riemannTags") Set<String> 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
@@ -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