From 748f5d961509ae865167eb758a99b1a9d12825d9 Mon Sep 17 00:00:00 2001
From: Jungtaek Lim <kabhwan@gmail.com>
Date: Thu, 19 Jan 2017 14:06:35 +0900
Subject: [PATCH] STORM-2303 [storm-opentsdb] Fix list invariant issue for JDK
 7

* use bounded wildcard type to fix invariant issue
---
 .../java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java | 4 ++--
 .../org/apache/storm/opentsdb/trident/OpenTsdbState.java  | 8 ++++----
 .../storm/opentsdb/trident/OpenTsdbStateFactory.java      | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java
index 41f338f3e5c..cb4b50d0767 100644
--- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java
+++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/OpenTsdbBolt.java
@@ -59,7 +59,7 @@ public class OpenTsdbBolt extends BaseRichBolt {
     private static final Logger LOG = LoggerFactory.getLogger(OpenTsdbBolt.class);
 
     private final OpenTsdbClient.Builder openTsdbClientBuilder;
-    private final List<ITupleOpenTsdbDatapointMapper> tupleOpenTsdbDatapointMappers;
+    private final List<? extends ITupleOpenTsdbDatapointMapper> tupleOpenTsdbDatapointMappers;
     private int batchSize;
     private int flushIntervalInSeconds;
     private boolean failTupleForFailedMetrics;
@@ -74,7 +74,7 @@ public OpenTsdbBolt(OpenTsdbClient.Builder openTsdbClientBuilder, ITupleOpenTsdb
         this.tupleOpenTsdbDatapointMappers = Collections.singletonList(tupleOpenTsdbDatapointMapper);
     }
 
-    public OpenTsdbBolt(OpenTsdbClient.Builder openTsdbClientBuilder, List<ITupleOpenTsdbDatapointMapper> tupleOpenTsdbDatapointMappers) {
+    public OpenTsdbBolt(OpenTsdbClient.Builder openTsdbClientBuilder, List<? extends ITupleOpenTsdbDatapointMapper> tupleOpenTsdbDatapointMappers) {
         this.openTsdbClientBuilder = openTsdbClientBuilder;
         this.tupleOpenTsdbDatapointMappers = tupleOpenTsdbDatapointMappers;
     }
diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java
index 02698d4f8d4..30a6dcc4207 100644
--- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java
+++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbState.java
@@ -19,7 +19,7 @@
 package org.apache.storm.opentsdb.trident;
 
 import org.apache.storm.opentsdb.OpenTsdbMetricDatapoint;
-import org.apache.storm.opentsdb.bolt.TupleOpenTsdbDatapointMapper;
+import org.apache.storm.opentsdb.bolt.ITupleOpenTsdbDatapointMapper;
 import org.apache.storm.opentsdb.client.ClientResponse;
 import org.apache.storm.opentsdb.client.OpenTsdbClient;
 import org.apache.storm.topology.FailedException;
@@ -41,10 +41,10 @@ public class OpenTsdbState implements State {
 
     private final Map conf;
     private final OpenTsdbClient.Builder openTsdbClientBuilder;
-    private final Iterable<TupleOpenTsdbDatapointMapper> tupleMetricPointMappers;
+    private final Iterable<? extends ITupleOpenTsdbDatapointMapper> tupleMetricPointMappers;
     private OpenTsdbClient openTsdbClient;
 
-    public OpenTsdbState(Map conf, OpenTsdbClient.Builder openTsdbClientBuilder, Iterable<TupleOpenTsdbDatapointMapper> tupleMetricPointMappers) {
+    public OpenTsdbState(Map conf, OpenTsdbClient.Builder openTsdbClientBuilder, Iterable<? extends ITupleOpenTsdbDatapointMapper> tupleMetricPointMappers) {
         this.conf = conf;
         this.openTsdbClientBuilder = openTsdbClientBuilder;
         this.tupleMetricPointMappers = tupleMetricPointMappers;
@@ -68,7 +68,7 @@ public void update(List<TridentTuple> tridentTuples, TridentCollector collector)
         try {
             List<OpenTsdbMetricDatapoint> metricDataPoints = new ArrayList<>();
             for (TridentTuple tridentTuple : tridentTuples) {
-                for (TupleOpenTsdbDatapointMapper tupleOpenTsdbDatapointMapper : tupleMetricPointMappers) {
+                for (ITupleOpenTsdbDatapointMapper tupleOpenTsdbDatapointMapper : tupleMetricPointMappers) {
                     metricDataPoints.add(tupleOpenTsdbDatapointMapper.getMetricPoint(tridentTuple));
                 }
             }
diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java
index 20890c977c5..8eff54bb5e0 100644
--- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java
+++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateFactory.java
@@ -18,6 +18,7 @@
  */
 package org.apache.storm.opentsdb.trident;
 
+import org.apache.storm.opentsdb.bolt.ITupleOpenTsdbDatapointMapper;
 import org.apache.storm.opentsdb.bolt.TupleOpenTsdbDatapointMapper;
 import org.apache.storm.opentsdb.client.OpenTsdbClient;
 import org.apache.storm.task.IMetricsContext;
@@ -33,9 +34,9 @@
 public class OpenTsdbStateFactory implements StateFactory {
 
     private OpenTsdbClient.Builder builder;
-    private final List<TupleOpenTsdbDatapointMapper> tridentTupleOpenTsdbDatapointMappers;
+    private final List<? extends ITupleOpenTsdbDatapointMapper> tridentTupleOpenTsdbDatapointMappers;
 
-    public OpenTsdbStateFactory(OpenTsdbClient.Builder builder, List<TupleOpenTsdbDatapointMapper> tridentTupleOpenTsdbDatapointMappers) {
+    public OpenTsdbStateFactory(OpenTsdbClient.Builder builder, List<? extends ITupleOpenTsdbDatapointMapper> tridentTupleOpenTsdbDatapointMappers) {
         this.builder = builder;
         this.tridentTupleOpenTsdbDatapointMappers = tridentTupleOpenTsdbDatapointMappers;
     }