This is an automated email from the ASF dual-hosted git repository. srdo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push: new bf0a2e5 STORM-3419: Fix checkstyle violations in storm-opentsdb new b4f9eb1 Merge pull request #3038 from krichter722/checkstyle-opentsdb bf0a2e5 is described below commit bf0a2e51ccf36fec193f221ab40cd81218603ef2 Author: Karl-Philipp Richter <krich...@posteo.de> AuthorDate: Mon Jun 24 00:19:33 2019 +0200 STORM-3419: Fix checkstyle violations in storm-opentsdb --- external/storm-opentsdb/pom.xml | 2 +- .../storm/opentsdb/OpenTsdbMetricDatapoint.java | 39 ++++++++---- .../bolt/ITupleOpenTsdbDatapointMapper.java | 8 +-- .../apache/storm/opentsdb/bolt/OpenTsdbBolt.java | 25 ++++---- .../bolt/TupleOpenTsdbDatapointMapper.java | 60 ++++++++++++------- .../storm/opentsdb/client/ClientResponse.java | 70 ++++++++++++++-------- .../storm/opentsdb/client/OpenTsdbClient.java | 20 ++++--- .../storm/opentsdb/trident/OpenTsdbState.java | 15 +++-- .../opentsdb/trident/OpenTsdbStateFactory.java | 11 ++-- .../opentsdb/trident/OpenTsdbStateUpdater.java | 5 +- 10 files changed, 158 insertions(+), 97 deletions(-) diff --git a/external/storm-opentsdb/pom.xml b/external/storm-opentsdb/pom.xml index c2b311c..dd6eca0 100644 --- a/external/storm-opentsdb/pom.xml +++ b/external/storm-opentsdb/pom.xml @@ -106,7 +106,7 @@ <artifactId>maven-checkstyle-plugin</artifactId> <!--Note - the version would be inherited--> <configuration> - <maxAllowedViolations>99</maxAllowedViolations> + <maxAllowedViolations>0</maxAllowedViolations> </configuration> </plugin> <plugin> diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/OpenTsdbMetricDatapoint.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/OpenTsdbMetricDatapoint.java index b04d817..0b47e10 100644 --- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/OpenTsdbMetricDatapoint.java +++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/OpenTsdbMetricDatapoint.java @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.storm.opentsdb; import java.io.Serializable; @@ -57,6 +58,7 @@ public class OpenTsdbMetricDatapoint implements Serializable { } /** + * Retrieve the metric name of this datapoint. * @return metric name of this datapoint */ public String getMetric() { @@ -64,6 +66,7 @@ public class OpenTsdbMetricDatapoint implements Serializable { } /** + * Retrieve the map of tag/value pairs of this metric. * @return Map of tag/value pairs of this metric */ public Map<String, String> getTags() { @@ -71,13 +74,15 @@ public class OpenTsdbMetricDatapoint implements Serializable { } /** - * @return timestamp either in milliseconds or seconds at which this metric is occurred. + * Retrieve the timestamp at which this metric occured. + * @return timestamp either in milliseconds or seconds at which this metric occurred */ public long getTimestamp() { return timestamp; } /** + * Retrieve the value of this metric datapoint. * @return value of this metric datapoint */ public Object getValue() { @@ -86,24 +91,34 @@ public class OpenTsdbMetricDatapoint implements Serializable { @Override public String toString() { - return "OpenTsdbMetricDataPoint{" + - "metric='" + metric + '\'' + - ", tags=" + tags + - ", timestamp=" + timestamp + - ", value=" + value + - '}'; + return "OpenTsdbMetricDataPoint{" + + "metric='" + metric + '\'' + + ", tags=" + tags + + ", timestamp=" + timestamp + + ", value=" + value + + '}'; } @Override public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof OpenTsdbMetricDatapoint)) return false; + if (this == o) { + return true; + } + if (!(o instanceof OpenTsdbMetricDatapoint)) { + return false; + } OpenTsdbMetricDatapoint that = (OpenTsdbMetricDatapoint) o; - if (timestamp != that.timestamp) return false; - if (value != that.value) return false; - if (!metric.equals(that.metric)) return false; + if (timestamp != that.timestamp) { + return false; + } + if (value != that.value) { + return false; + } + if (!metric.equals(that.metric)) { + return false; + } return tags.equals(that.tags); } diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/ITupleOpenTsdbDatapointMapper.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/ITupleOpenTsdbDatapointMapper.java index 46b2471..a89448b 100644 --- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/ITupleOpenTsdbDatapointMapper.java +++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/ITupleOpenTsdbDatapointMapper.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.storm.opentsdb.bolt; +import java.io.Serializable; + import org.apache.storm.opentsdb.OpenTsdbMetricDatapoint; import org.apache.storm.tuple.ITuple; -import java.io.Serializable; - /** - * This class gives a mapping of a {@link ITuple} with {@link OpenTsdbMetricDatapoint} - * + * This class gives a mapping of a {@link ITuple} with {@link OpenTsdbMetricDatapoint}. */ public interface ITupleOpenTsdbDatapointMapper extends Serializable { 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 906bed5..2a3688b 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 @@ -16,8 +16,17 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.storm.opentsdb.bolt; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.storm.opentsdb.OpenTsdbMetricDatapoint; import org.apache.storm.opentsdb.client.ClientResponse; import org.apache.storm.opentsdb.client.OpenTsdbClient; @@ -31,14 +40,6 @@ import org.apache.storm.utils.TupleUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Basic bolt implementation for storing timeseries datapoints to OpenTSDB. * <p/> @@ -46,7 +47,7 @@ import java.util.Set; * All these datapoints are batched till the given {@code batchSize} or {@code flushIntervalInSeconds} is reached. * <p/> * - * Example topology: + * <p>Example topology: * <blockquote><pre> * OpenTsdbClient.Builder builder = OpenTsdbClient.newBuilder(openTsdbUrl).sync(30_000).returnDetails(); * final OpenTsdbBolt openTsdbBolt = new OpenTsdbBolt(builder, Collections.singletonList(TupleOpenTsdbDatapointMapper.DEFAULT_MAPPER)); @@ -69,12 +70,14 @@ public class OpenTsdbBolt extends BaseRichBolt { private Map<OpenTsdbMetricDatapoint, Tuple> metricPointsWithTuple = new HashMap<>(); private OutputCollector collector; - public OpenTsdbBolt(OpenTsdbClient.Builder openTsdbClientBuilder, ITupleOpenTsdbDatapointMapper tupleOpenTsdbDatapointMapper) { + public OpenTsdbBolt(OpenTsdbClient.Builder openTsdbClientBuilder, + ITupleOpenTsdbDatapointMapper tupleOpenTsdbDatapointMapper) { this.openTsdbClientBuilder = openTsdbClientBuilder; this.tupleOpenTsdbDatapointMappers = Collections.singletonList(tupleOpenTsdbDatapointMapper); } - public OpenTsdbBolt(OpenTsdbClient.Builder openTsdbClientBuilder, List<? extends 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/bolt/TupleOpenTsdbDatapointMapper.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/TupleOpenTsdbDatapointMapper.java index 53a49a9..e2aed5c 100644 --- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/TupleOpenTsdbDatapointMapper.java +++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/bolt/TupleOpenTsdbDatapointMapper.java @@ -16,17 +16,18 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.storm.opentsdb.bolt; +import java.util.Map; + import org.apache.storm.opentsdb.OpenTsdbMetricDatapoint; import org.apache.storm.tuple.ITuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - /** - * Converts {@link org.apache.storm.tuple.ITuple} to {@link OpenTsdbMetricDatapoint} + * Converts {@link org.apache.storm.tuple.ITuple} to {@link OpenTsdbMetricDatapoint}. */ public final class TupleOpenTsdbDatapointMapper implements ITupleOpenTsdbDatapointMapper { private static final Logger LOG = LoggerFactory.getLogger(TupleOpenTsdbDatapointMapper.class); @@ -51,35 +52,39 @@ public final class TupleOpenTsdbDatapointMapper implements ITupleOpenTsdbDatapoi @Override public OpenTsdbMetricDatapoint getMetricPoint(ITuple tuple) { - return new OpenTsdbMetricDatapoint( - tuple.getStringByField(metricField), - (Map<String, String>) tuple.getValueByField(tagsField), - tuple.getLongByField(timestampField), - (Number) tuple.getValueByField(valueField)); + return new OpenTsdbMetricDatapoint( + tuple.getStringByField(metricField), + (Map<String, String>) tuple.getValueByField(tagsField), + tuple.getLongByField(timestampField), + (Number) tuple.getValueByField(valueField)); } /** - * @return metric field name in the tuple. + * Retrieve metric field name in the tuple. + * @return metric field name in the tuple */ public String getMetricField() { return metricField; } /** - * @return timestamp field name in the tuple. + * Retrieve the timestamp field name in the tuple. + * @return timestamp field name in the tuple */ public String getTimestampField() { return timestampField; } /** - * @return value field name in the tuple. + * Retrieve the value field name in the tuple. + * @return value field name in the tuple */ public String getValueField() { return valueField; } /** + * Retrieve the tags field name in the tuple. * @return tags field name in the tuple */ public String getTagsField() { @@ -88,16 +93,25 @@ public final class TupleOpenTsdbDatapointMapper implements ITupleOpenTsdbDatapoi @Override public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof TupleOpenTsdbDatapointMapper)) return false; + if (this == o) { + return true; + } + if (!(o instanceof TupleOpenTsdbDatapointMapper)) { + return false; + } TupleOpenTsdbDatapointMapper that = (TupleOpenTsdbDatapointMapper) o; - if (!metricField.equals(that.metricField)) return false; - if (!timestampField.equals(that.timestampField)) return false; - if (!valueField.equals(that.valueField)) return false; + if (!metricField.equals(that.metricField)) { + return false; + } + if (!timestampField.equals(that.timestampField)) { + return false; + } + if (!valueField.equals(that.valueField)) { + return false; + } return tagsField.equals(that.tagsField); - } @Override @@ -111,11 +125,11 @@ public final class TupleOpenTsdbDatapointMapper implements ITupleOpenTsdbDatapoi @Override public String toString() { - return "TupleOpenTsdbDatapointMapper{" + - "metricField='" + metricField + '\'' + - ", timestampField='" + timestampField + '\'' + - ", valueField='" + valueField + '\'' + - ", tagsField='" + tagsField + '\'' + - '}'; + return "TupleOpenTsdbDatapointMapper{" + + "metricField='" + metricField + '\'' + + ", timestampField='" + timestampField + '\'' + + ", valueField='" + valueField + '\'' + + ", tagsField='" + tagsField + '\'' + + '}'; } } diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/ClientResponse.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/ClientResponse.java index 7c3e191..96acb12 100644 --- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/ClientResponse.java +++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/ClientResponse.java @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.storm.opentsdb.client; -import org.apache.storm.opentsdb.OpenTsdbMetricDatapoint; +package org.apache.storm.opentsdb.client; import java.io.Serializable; import java.util.List; +import org.apache.storm.opentsdb.OpenTsdbMetricDatapoint; + /** * This class represents the response from OpenTsdb for a request sent. */ @@ -57,13 +58,21 @@ public interface ClientResponse extends Serializable { @Override public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Summary)) return false; + if (this == o) { + return true; + } + if (!(o instanceof Summary)) { + return false; + } Summary summary = (Summary) o; - if (failed != summary.failed) return false; - if (success != summary.success) return false; + if (failed != summary.failed) { + return false; + } + if (success != summary.success) { + return false; + } return timeouts == summary.timeouts; } @@ -78,11 +87,11 @@ public interface ClientResponse extends Serializable { @Override public String toString() { - return "Summary{" + - "failed=" + failed + - ", success=" + success + - ", timeouts=" + timeouts + - '}'; + return "Summary{" + + "failed=" + failed + + ", success=" + success + + ", timeouts=" + timeouts + + '}'; } } @@ -99,9 +108,15 @@ public interface ClientResponse extends Serializable { @Override public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Details)) return false; - if (!super.equals(o)) return false; + if (this == o) { + return true; + } + if (!(o instanceof Details)) { + return false; + } + if (!super.equals(o)) { + return false; + } Details details = (Details) o; @@ -122,9 +137,10 @@ public interface ClientResponse extends Serializable { @Override public String toString() { - return "Details{" + - "errors=" + errors + - super.toString()+'}'; + return "Details{" + + "errors=" + errors + + super.toString() + + '}'; } public static class Error implements Serializable { @@ -149,12 +165,18 @@ public interface ClientResponse extends Serializable { @Override public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Error)) return false; + if (this == o) { + return true; + } + if (!(o instanceof Error)) { + return false; + } Error error1 = (Error) o; - if (!error.equals(error1.error)) return false; + if (!error.equals(error1.error)) { + return false; + } return datapoint.equals(error1.datapoint); } @@ -168,10 +190,10 @@ public interface ClientResponse extends Serializable { @Override public String toString() { - return "Error{" + - "error='" + error + '\'' + - ", datapoint=" + datapoint + - '}'; + return "Error{" + + "error='" + error + '\'' + + ", datapoint=" + datapoint + + '}'; } } } diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/OpenTsdbClient.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/OpenTsdbClient.java index 664d615..dde938e 100644 --- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/OpenTsdbClient.java +++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/client/OpenTsdbClient.java @@ -16,9 +16,18 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.storm.opentsdb.client; import com.google.common.base.Preconditions; + +import java.io.Serializable; +import java.util.Collection; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; + import org.apache.storm.opentsdb.OpenTsdbMetricDatapoint; import org.glassfish.jersey.apache.connector.ApacheConnectorProvider; import org.glassfish.jersey.client.ClientConfig; @@ -27,13 +36,6 @@ import org.glassfish.jersey.client.RequestEntityProcessing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import java.io.Serializable; -import java.util.Collection; - /** * Client to connect to OpenTsdb TSD for storing timeseries datapoints. */ @@ -84,11 +86,11 @@ public class OpenTsdbClient { client = ClientBuilder.newClient(clientConfig); target = client.target(urlString).path(PUT_PATH); - if(sync) { + if (sync) { // need to add an empty string else it is nto added as query param. target = target.queryParam("sync", "").queryParam("sync_timeout", syncTimeout); } - if(responseType != ResponseType.None) { + if (responseType != ResponseType.None) { // need to add an empty string else it is nto added as query param. target = target.queryParam(responseType.value, ""); } 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 9ea63e8..6614af5 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 @@ -16,8 +16,13 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.storm.opentsdb.trident; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import org.apache.storm.opentsdb.OpenTsdbMetricDatapoint; import org.apache.storm.opentsdb.bolt.ITupleOpenTsdbDatapointMapper; import org.apache.storm.opentsdb.client.ClientResponse; @@ -29,10 +34,6 @@ import org.apache.storm.trident.tuple.TridentTuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * Trident {@link State} implementation for OpenTSDB. */ @@ -44,7 +45,9 @@ public class OpenTsdbState implements State { private final Iterable<? extends ITupleOpenTsdbDatapointMapper> tupleMetricPointMappers; private OpenTsdbClient openTsdbClient; - public OpenTsdbState(Map<String, Object> conf, OpenTsdbClient.Builder openTsdbClientBuilder, Iterable<? extends ITupleOpenTsdbDatapointMapper> tupleMetricPointMappers) { + public OpenTsdbState(Map<String, Object> conf, + OpenTsdbClient.Builder openTsdbClientBuilder, + Iterable<? extends ITupleOpenTsdbDatapointMapper> tupleMetricPointMappers) { this.conf = conf; this.openTsdbClientBuilder = openTsdbClientBuilder; this.tupleMetricPointMappers = tupleMetricPointMappers; @@ -74,7 +77,7 @@ public class OpenTsdbState implements State { } final ClientResponse.Details details = openTsdbClient.writeMetricPoints(metricDataPoints); - if(details != null && (details.getFailed() > 0) ) { + if (details != null && (details.getFailed() > 0)) { final String errorMsg = "Failed in writing metrics to TSDB with details: " + details; LOG.error(errorMsg); throw new RuntimeException(errorMsg); 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 436f7e1..01cd2c9 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 @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.storm.opentsdb.trident; +import java.util.List; +import java.util.Map; + 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; import org.apache.storm.trident.state.State; import org.apache.storm.trident.state.StateFactory; -import java.util.List; -import java.util.Map; - /** * Trident {@link StateFactory} implementation for OpenTSDB. */ @@ -36,7 +36,8 @@ public class OpenTsdbStateFactory implements StateFactory { private OpenTsdbClient.Builder builder; private final List<? extends ITupleOpenTsdbDatapointMapper> tridentTupleOpenTsdbDatapointMappers; - public OpenTsdbStateFactory(OpenTsdbClient.Builder builder, List<? extends ITupleOpenTsdbDatapointMapper> tridentTupleOpenTsdbDatapointMappers) { + public OpenTsdbStateFactory(OpenTsdbClient.Builder builder, + List<? extends ITupleOpenTsdbDatapointMapper> tridentTupleOpenTsdbDatapointMappers) { this.builder = builder; this.tridentTupleOpenTsdbDatapointMappers = tridentTupleOpenTsdbDatapointMappers; } diff --git a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateUpdater.java b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateUpdater.java index 935611f..7330c94 100644 --- a/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateUpdater.java +++ b/external/storm-opentsdb/src/main/java/org/apache/storm/opentsdb/trident/OpenTsdbStateUpdater.java @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.storm.opentsdb.trident; +import java.util.List; + import org.apache.storm.trident.operation.TridentCollector; import org.apache.storm.trident.state.BaseStateUpdater; import org.apache.storm.trident.tuple.TridentTuple; -import java.util.List; - /** * Trident {@link org.apache.storm.trident.state.StateUpdater} implementation for OpenTSDB. */