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 32ccd43 STORM-3451: jdbc: fix all checkstyle warnings new 224f75a Merge pull request #3069 from krichter722/checkstyle-jdbc 32ccd43 is described below commit 32ccd43e37e5fab42b8dc8d07b44180f6bda0a02 Author: Karl-Philipp Richter <krich...@posteo.de> AuthorDate: Thu Jul 4 20:48:41 2019 +0200 STORM-3451: jdbc: fix all checkstyle warnings --- external/storm-jdbc/pom.xml | 2 +- .../java/org/apache/storm/jdbc/common/Column.java | 35 ++++++++++++---------- .../storm/jdbc/common/ConnectionProvider.java | 2 +- .../jdbc/common/HikariCPConnectionProvider.java | 5 ++-- .../apache/storm/jdbc/mapper/JdbcLookupMapper.java | 1 - .../org/apache/storm/jdbc/mapper/JdbcMapper.java | 3 +- .../storm/jdbc/mapper/SimpleJdbcLookupMapper.java | 1 - .../apache/storm/jdbc/trident/state/JdbcState.java | 13 ++++---- .../storm/jdbc/trident/state/JdbcStateFactory.java | 2 +- 9 files changed, 34 insertions(+), 30 deletions(-) diff --git a/external/storm-jdbc/pom.xml b/external/storm-jdbc/pom.xml index f868739..2b31123 100644 --- a/external/storm-jdbc/pom.xml +++ b/external/storm-jdbc/pom.xml @@ -90,7 +90,7 @@ <artifactId>maven-checkstyle-plugin</artifactId> <!--Note - the version would be inherited--> <configuration> - <maxAllowedViolations>36</maxAllowedViolations> + <maxAllowedViolations>0</maxAllowedViolations> </configuration> </plugin> <plugin> diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Column.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Column.java index c796d3b..0b3498e 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Column.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/Column.java @@ -12,7 +12,6 @@ package org.apache.storm.jdbc.common; - import java.io.Serializable; /** @@ -27,18 +26,16 @@ import java.io.Serializable; * ---------------------------- * </pre> * - * The following class can be used to represent the data in the table as - * <pre> + * <p>The following class can be used to represent the data in the table as + * <pre><![CDATA[ * List<List<Column>> rows = new ArrayList<List<Column>>(); * List<Column> row1 = Lists.newArrayList(new Column("UserId", 1, Types.INTEGER), new Column("UserName", "Foo", Types.VARCHAR)) * List<Column> row1 = Lists.newArrayList(new Column("UserId", 2, Types.INTEGER), new Column("UserName", "Bar", Types.VARCHAR)) * * rows.add(row1) * rows.add(row2) - * + * ]]> * </pre> - * - * @param <T> */ public class Column<T> implements Serializable { @@ -76,13 +73,21 @@ public class Column<T> implements Serializable { @Override public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof Column)) return false; + if (this == o) { + return true; + } + if (!(o instanceof Column)) { + return false; + } Column<?> column = (Column<?>) o; - if (sqlType != column.sqlType) return false; - if (!columnName.equals(column.columnName)) return false; + if (sqlType != column.sqlType) { + return false; + } + if (!columnName.equals(column.columnName)) { + return false; + } return val != null ? val.equals(column.val) : column.val == null; } @@ -97,10 +102,10 @@ public class Column<T> implements Serializable { @Override public String toString() { - return "Column{" + - "columnName='" + columnName + '\'' + - ", val=" + val + - ", sqlType=" + sqlType + - '}'; + return "Column{" + + "columnName='" + columnName + '\'' + + ", val=" + val + + ", sqlType=" + sqlType + + '}'; } } diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/ConnectionProvider.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/ConnectionProvider.java index 6804b5d..39b3ddf 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/ConnectionProvider.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/ConnectionProvider.java @@ -25,7 +25,7 @@ public interface ConnectionProvider extends Serializable { void prepare(); /** - * + * Get connection. * @return a DB connection over which the queries can be executed. */ Connection getConnection(); diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java index dbb0009..71c9488 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/common/HikariCPConnectionProvider.java @@ -21,14 +21,15 @@ import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressWarnings("checkstyle:AbbreviationAsWordInName") public class HikariCPConnectionProvider implements ConnectionProvider { private static final Logger LOG = LoggerFactory.getLogger(HikariCPConnectionProvider.class); private Map<String, Object> configMap; private transient HikariDataSource dataSource; - public HikariCPConnectionProvider(Map<String, Object> hikariCPConfigMap) { - this.configMap = hikariCPConfigMap; + public HikariCPConnectionProvider(Map<String, Object> configMap) { + this.configMap = configMap; } @Override diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java index 341dedf..32e98e2 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java @@ -31,7 +31,6 @@ public interface JdbcLookupMapper extends JdbcMapper { /** * declare what are the fields that this code will output. - * @param declarer */ void declareOutputFields(OutputFieldsDeclarer declarer); } diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java index 8cfa2a4..b3f5500 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java @@ -19,8 +19,7 @@ import org.apache.storm.tuple.ITuple; public interface JdbcMapper extends Serializable { /** - * - * @param tuple + * Get columns. * @return list of columns that represents one row in a DB table. */ List<Column> getColumns(ITuple tuple); diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java index ef141e7..8baaa8b 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java @@ -12,7 +12,6 @@ package org.apache.storm.jdbc.mapper; - import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.Validate; diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java index 1954ef3..8c3d11a 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java @@ -48,10 +48,11 @@ public class JdbcState implements State { protected void prepare() { options.connectionProvider.prepare(); - if (StringUtils.isBlank(options.insertQuery) && StringUtils.isBlank(options.tableName) && - StringUtils.isBlank(options.selectQuery)) { - throw new IllegalArgumentException("If you are trying to insert into DB you must supply either insertQuery or tableName." + - "If you are attempting to user a query state you must supply a select query."); + if (StringUtils.isBlank(options.insertQuery) + && StringUtils.isBlank(options.tableName) + && StringUtils.isBlank(options.selectQuery)) { + throw new IllegalArgumentException("If you are trying to insert into DB you must supply either insertQuery " + + "or tableName. If you are attempting to user a query state you must supply a select query."); } if (options.queryTimeoutSecs == null) { @@ -62,12 +63,12 @@ public class JdbcState implements State { } @Override - public void beginCommit(Long aLong) { + public void beginCommit(Long someLong) { LOG.debug("beginCommit is noop."); } @Override - public void commit(Long aLong) { + public void commit(Long someLong) { LOG.debug("commit is noop."); } diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java index 6e15786..7ed334e 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java @@ -26,7 +26,7 @@ public class JdbcStateFactory implements StateFactory { } @Override - public State makeState(Map<String, Object> map, IMetricsContext iMetricsContext, int partitionIndex, int numPartitions) { + public State makeState(Map<String, Object> map, IMetricsContext metricsContext, int partitionIndex, int numPartitions) { JdbcState state = new JdbcState(map, partitionIndex, numPartitions, options); state.prepare(); return state;