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 c1431fb STORM-3455: solr: fix all checkstyle warnings
new 351d219 Merge pull request #3073 from krichter722/checkstyle-solr
c1431fb is described below
commit c1431fb0f34de2b16bcb03fcc74f592d6099c571
Author: Karl-Philipp Richter <krich...@posteo.de>
AuthorDate: Thu Jul 4 21:38:01 2019 +0200
STORM-3455: solr: fix all checkstyle warnings
---
external/storm-solr/pom.xml | 2 +-
.../org/apache/storm/solr/bolt/SolrUpdateBolt.java | 12 ++++++------
.../org/apache/storm/solr/config/CountBasedCommit.java | 2 +-
.../java/org/apache/storm/solr/config/SolrConfig.java | 3 +++
.../org/apache/storm/solr/mapper/SolrFieldsMapper.java | 14 +++++++-------
.../org/apache/storm/solr/mapper/SolrJsonMapper.java | 4 +---
.../java/org/apache/storm/solr/schema/CopyField.java | 8 ++++----
.../main/java/org/apache/storm/solr/schema/Field.java | 8 ++++----
.../java/org/apache/storm/solr/schema/FieldType.java | 10 +++++-----
.../main/java/org/apache/storm/solr/schema/Schema.java | 18 +++++++++---------
.../apache/storm/solr/schema/SolrFieldTypeFinder.java | 10 +++++-----
.../solr/schema/builder/RestJsonSchemaBuilder.java | 4 +++-
.../solr/schema/builder/RestJsonSchemaBuilderV2.java | 2 +-
.../java/org/apache/storm/solr/trident/SolrState.java | 4 ++--
.../apache/storm/solr/trident/SolrStateFactory.java | 2 +-
15 files changed, 53 insertions(+), 50 deletions(-)
diff --git a/external/storm-solr/pom.xml b/external/storm-solr/pom.xml
index 14af06e..5deee1c 100644
--- a/external/storm-solr/pom.xml
+++ b/external/storm-solr/pom.xml
@@ -124,7 +124,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>47</maxAllowedViolations>
+ <maxAllowedViolations>0</maxAllowedViolations>
</configuration>
</plugin>
<plugin>
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
index f6c7c60..6706634 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/bolt/SolrUpdateBolt.java
@@ -60,9 +60,9 @@ public class SolrUpdateBolt extends
BaseTickTupleAwareRichBolt {
this.solrConfig = solrConfig;
this.solrMapper = solrMapper;
this.commitStgy = commitStgy;
- LOG.debug("Created {} with the following configuration: " +
- "[SolrConfig = {}], [SolrMapper = {}], [CommitStgy = {}]",
- this.getClass().getSimpleName(), solrConfig, solrMapper,
commitStgy);
+ LOG.debug("Created {} with the following configuration: "
+ + "[SolrConfig = {}], [SolrMapper = {}], [CommitStgy =
{}]",
+ this.getClass().getSimpleName(), solrConfig, solrMapper,
commitStgy);
}
@Override
@@ -78,9 +78,9 @@ public class SolrUpdateBolt extends
BaseTickTupleAwareRichBolt {
private int capacity() {
final int defArrListCpcty = 10;
- return (commitStgy instanceof CountBasedCommit) ?
- ((CountBasedCommit) commitStgy).getThreshold() :
- defArrListCpcty;
+ return (commitStgy instanceof CountBasedCommit)
+ ? ((CountBasedCommit) commitStgy).getThreshold()
+ : defArrListCpcty;
}
@Override
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/config/CountBasedCommit.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/config/CountBasedCommit.java
index 1a9c967..3fdcc89 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/config/CountBasedCommit.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/config/CountBasedCommit.java
@@ -21,7 +21,7 @@ public class CountBasedCommit implements SolrCommitStrategy {
private int count;
/**
- * Initializes a count based commit strategy with the specified threshold
+ * Initializes a count based commit strategy with the specified threshold.
*
* @param threshold The commit threshold, defining when
SolrInputDocuments should be committed to Solr
* */
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
index bd05e9d..8b36bf2 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/config/SolrConfig.java
@@ -25,6 +25,7 @@ public class SolrConfig implements Serializable {
private final boolean enableKerberos;
/**
+ * Constructor.
* @param zkHostString Zookeeper host string as defined in the {@link
CloudSolrClient} constructor
* */
public SolrConfig(String zkHostString) {
@@ -32,6 +33,7 @@ public class SolrConfig implements Serializable {
}
/**
+ * Constructor.
* @param zkHostString Zookeeper host string as defined in the {@link
CloudSolrClient} constructor
* @param tickTupleInterval interval for tick tuples
* */
@@ -40,6 +42,7 @@ public class SolrConfig implements Serializable {
}
/**
+ * Constructor.
* @param zkHostString Zookeeper host string as defined in the {@link
CloudSolrClient} constructor
* @param tickTupleInterval interval for tick tuples
* @param enableKerberos true to enable kerberos else false
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/mapper/SolrFieldsMapper.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/mapper/SolrFieldsMapper.java
index 1ff7aa3..f8950c0 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/mapper/SolrFieldsMapper.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/mapper/SolrFieldsMapper.java
@@ -12,6 +12,8 @@
package org.apache.storm.solr.mapper;
+import static
org.apache.storm.solr.schema.SolrFieldTypeFinder.FieldTypeWrapper;
+
import java.util.LinkedList;
import java.util.List;
import org.apache.solr.client.solrj.SolrClient;
@@ -27,8 +29,6 @@ import org.apache.storm.tuple.ITuple;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static
org.apache.storm.solr.schema.SolrFieldTypeFinder.FieldTypeWrapper;
-
public class SolrFieldsMapper implements SolrMapper {
private static final Logger log =
LoggerFactory.getLogger(SolrFieldsMapper.class);
private String collection;
@@ -119,11 +119,11 @@ public class SolrFieldsMapper implements SolrMapper {
@Override
public String toString() {
- return "SolrFieldsMapper{" +
- "collection='" + collection + '\'' +
- ", typeFinder=" + typeFinder +
- ", multiValueFieldToken='" + multiValueFieldToken + '\'' +
- '}';
+ return "SolrFieldsMapper{"
+ + "collection='" + collection + '\''
+ + ", typeFinder=" + typeFinder
+ + ", multiValueFieldToken='" + multiValueFieldToken + '\''
+ + '}';
}
public static class Builder {
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/mapper/SolrJsonMapper.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/mapper/SolrJsonMapper.java
index 2334a0e..3141b4b 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/mapper/SolrJsonMapper.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/mapper/SolrJsonMapper.java
@@ -44,9 +44,7 @@ public class SolrJsonMapper implements SolrMapper {
}
/**
- *
- * @param tuples
- * @return
+ * Maps to Solr request.
* @throws SolrMapperException if the tuple does not contain the
*/
@Override
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/CopyField.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/CopyField.java
index 2281c8f..1ecffe6 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/CopyField.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/CopyField.java
@@ -36,9 +36,9 @@ public class CopyField implements Serializable {
@Override
public String toString() {
- return "CopyField{" +
- "source='" + source + '\'' +
- ", dest='" + dest + '\'' +
- '}';
+ return "CopyField{"
+ + "source='" + source + '\''
+ + ", dest='" + dest + '\''
+ + '}';
}
}
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/Field.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/Field.java
index 43b0110..dffca2a 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/Field.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/Field.java
@@ -36,9 +36,9 @@ public class Field implements Serializable {
@Override
public String toString() {
- return "Field{" +
- "name='" + name + '\'' +
- ", type='" + type + '\'' +
- '}';
+ return "Field{"
+ + "name='" + name + '\''
+ + ", type='" + type + '\''
+ + '}';
}
}
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/FieldType.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/FieldType.java
index 240af4b..94282b4 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/FieldType.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/FieldType.java
@@ -47,10 +47,10 @@ public class FieldType implements Serializable {
@Override
public String toString() {
- return "FieldType{" +
- "name='" + name + '\'' +
- ", clazz='" + clazz + '\'' +
- ", multiValued=" + multiValued +
- '}';
+ return "FieldType{"
+ + "name='" + name + '\''
+ + ", clazz='" + clazz + '\''
+ + ", multiValued=" + multiValued
+ + '}';
}
}
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/Schema.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/Schema.java
index d9cdbac..c32549b 100644
--- a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/Schema.java
+++ b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/Schema.java
@@ -88,15 +88,15 @@ public class Schema implements Serializable {
@Override
public String toString() {
- return "Schema{" +
- "name='" + name + '\'' +
- ", version='" + version + '\'' +
- ", uniqueKey='" + uniqueKey + '\'' +
- ", fieldTypes=" + fieldTypes +
- ", fields=" + fields +
- ", dynamicFields=" + dynamicFields +
- ", copyFields=" + copyFields +
- '}';
+ return "Schema{"
+ + "name='" + name + '\''
+ + ", version='" + version + '\''
+ + ", uniqueKey='" + uniqueKey + '\''
+ + ", fieldTypes=" + fieldTypes
+ + ", fields=" + fields
+ + ", dynamicFields=" + dynamicFields
+ + ", copyFields=" + copyFields
+ + '}';
}
// Wrapper class handy for the client code to use the JSON parser to build
to use with JSON parser
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/SolrFieldTypeFinder.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/SolrFieldTypeFinder.java
index aa6802e..1e8f547 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/SolrFieldTypeFinder.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/SolrFieldTypeFinder.java
@@ -157,7 +157,7 @@ public class SolrFieldTypeFinder implements Serializable {
}
/**
- * Class wrapping all the information for fields and types
+ * Class wrapping all the information for fields and types.
* */
public static class FieldTypeWrapper implements Serializable {
Field field;
@@ -178,10 +178,10 @@ public class SolrFieldTypeFinder implements Serializable {
@Override
public String toString() {
- return "FieldTypeWrapper{" +
- "field=" + field +
- ", type=" + type +
- '}';
+ return "FieldTypeWrapper{"
+ + "field=" + field
+ + ", type=" + type
+ + '}';
}
}
}
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/builder/RestJsonSchemaBuilder.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/builder/RestJsonSchemaBuilder.java
index 405429c..072775c 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/builder/RestJsonSchemaBuilder.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/builder/RestJsonSchemaBuilder.java
@@ -32,7 +32,9 @@ public class RestJsonSchemaBuilder implements SchemaBuilder {
private Schema schema;
- /** Urls with the form http://localhost:8983/solr/gettingstarted/schema/
returns the schema in JSON format */
+ /**
+ * Urls with the form http://localhost:8983/solr/gettingstarted/schema/
returns the schema in JSON format.
+ */
public RestJsonSchemaBuilder(String solrHost, String solrPort, String
collection) throws IOException {
this(new URL("http://"; + solrHost + ":" + solrPort + "/solr/" +
collection + "/schema/"));
}
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/builder/RestJsonSchemaBuilderV2.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/builder/RestJsonSchemaBuilderV2.java
index aff8550..ac5f950 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/schema/builder/RestJsonSchemaBuilderV2.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/schema/builder/RestJsonSchemaBuilderV2.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Class that builds the {@link Schema} object from the schema returned by the
SchemaRequest
+ * Class that builds the {@link Schema} object from the schema returned by the
SchemaRequest.
*/
public class RestJsonSchemaBuilderV2 implements SchemaBuilder {
private static final Logger logger =
LoggerFactory.getLogger(RestJsonSchemaBuilderV2.class);
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrState.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrState.java
index 14b5717..46fafff 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrState.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrState.java
@@ -47,10 +47,10 @@ public class SolrState implements State {
}
@Override
- public void beginCommit(Long aLong) { }
+ public void beginCommit(Long someLong) { }
@Override
- public void commit(Long aLong) { }
+ public void commit(Long someLong) { }
public void updateState(List<TridentTuple> tuples) {
try {
diff --git
a/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java
b/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java
index b0ae4a2..8582bca 100644
---
a/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java
+++
b/external/storm-solr/src/main/java/org/apache/storm/solr/trident/SolrStateFactory.java
@@ -29,7 +29,7 @@ public class SolrStateFactory 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) {
SolrState state = new SolrState(solrConfig, solrMapper);
state.prepare();
return state;
