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 871c20f STORM-3432: solr-examples: fix all checkstyle warnings
new 220338f Merge pull request #3048 from
krichter722/checkstyle-solr-examples
871c20f is described below
commit 871c20f524930cf9d3e9c03b08266d33aea04d65
Author: Karl-Philipp Richter <krich...@posteo.de>
AuthorDate: Thu Jun 27 23:41:31 2019 +0200
STORM-3432: solr-examples: fix all checkstyle warnings
---
examples/storm-solr-examples/pom.xml | 2 +-
.../apache/storm/solr/spout/SolrFieldsSpout.java | 13 +++++------
.../org/apache/storm/solr/spout/SolrJsonSpout.java | 25 +++++++++++-----------
.../storm/solr/topology/SolrFieldsTopology.java | 19 ++++++++--------
.../storm/solr/topology/SolrJsonTopology.java | 6 +++---
.../solr/trident/SolrFieldsTridentTopology.java | 6 +++---
.../solr/trident/SolrJsonTridentTopology.java | 6 +++---
7 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/examples/storm-solr-examples/pom.xml
b/examples/storm-solr-examples/pom.xml
index ea89a03..81570d1 100644
--- a/examples/storm-solr-examples/pom.xml
+++ b/examples/storm-solr-examples/pom.xml
@@ -118,7 +118,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/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
index 2959eed..70b0e08 100644
---
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
+++
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrFieldsSpout.java
@@ -18,18 +18,19 @@
package org.apache.storm.solr.spout;
+import com.google.common.collect.Lists;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.apache.storm.solr.util.TestUtil;
import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.topology.OutputFieldsDeclarer;
import org.apache.storm.topology.base.BaseRichSpout;
import org.apache.storm.tuple.Fields;
import org.apache.storm.tuple.Values;
-import com.google.common.collect.Lists;
-import org.apache.storm.solr.util.TestUtil;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
public class SolrFieldsSpout extends BaseRichSpout {
private SpoutOutputCollector collector;
diff --git
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
index 4f52668..ed3fa76 100644
---
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
+++
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/spout/SolrJsonSpout.java
@@ -18,20 +18,21 @@
package org.apache.storm.solr.spout;
-import org.apache.storm.spout.SpoutOutputCollector;
-import org.apache.storm.task.TopologyContext;
-import org.apache.storm.topology.OutputFieldsDeclarer;
-import org.apache.storm.topology.base.BaseRichSpout;
-import org.apache.storm.tuple.Fields;
-import org.apache.storm.tuple.Values;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
-import org.apache.storm.solr.util.TestUtil;
import java.util.List;
import java.util.Map;
import java.util.Random;
+import org.apache.storm.solr.util.TestUtil;
+import org.apache.storm.spout.SpoutOutputCollector;
+import org.apache.storm.task.TopologyContext;
+import org.apache.storm.topology.OutputFieldsDeclarer;
+import org.apache.storm.topology.base.BaseRichSpout;
+import org.apache.storm.tuple.Fields;
+import org.apache.storm.tuple.Values;
+
public class SolrJsonSpout extends BaseRichSpout {
private SpoutOutputCollector collector;
private static final List<Values> listValues = Lists.newArrayList(
@@ -80,27 +81,27 @@ public class SolrJsonSpout extends BaseRichSpout {
public static class JsonSchema {
private String id;
private String date;
- private String dc_title;
+ private String dcTitle;
private static final Gson gson = new Gson();
public JsonSchema(String suffix) {
this.id = "id" + suffix;
this.date = TestUtil.getDate();
- this.dc_title = "dc_title" + suffix;
+ this.dcTitle = "dcTitle" + suffix;
}
- public JsonSchema(String id, String date, String dc_title) {
+ public JsonSchema(String id, String date, String dcTitle) {
this.id = id;
this.date = date;
- this.dc_title = dc_title;
+ this.dcTitle = dcTitle;
}
// copy constructor
public JsonSchema(JsonSchema jsonSchema) {
this.id = jsonSchema.id;
this.date = jsonSchema.date;
- this.dc_title = jsonSchema.dc_title;
+ this.dcTitle = jsonSchema.dcTitle;
}
public String toJson() {
diff --git
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrFieldsTopology.java
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrFieldsTopology.java
index 0157cfc..df9b709 100644
---
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrFieldsTopology.java
+++
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrFieldsTopology.java
@@ -18,24 +18,25 @@
package org.apache.storm.solr.topology;
+import java.io.IOException;
+
import org.apache.storm.generated.StormTopology;
-import org.apache.storm.solr.config.SolrConfig;
-import org.apache.storm.solr.schema.builder.RestJsonSchemaBuilderV2;
-import org.apache.storm.topology.TopologyBuilder;
import org.apache.storm.solr.bolt.SolrUpdateBolt;
import org.apache.storm.solr.config.CountBasedCommit;
import org.apache.storm.solr.config.SolrCommitStrategy;
+import org.apache.storm.solr.config.SolrConfig;
import org.apache.storm.solr.mapper.SolrFieldsMapper;
import org.apache.storm.solr.mapper.SolrMapper;
+import org.apache.storm.solr.schema.builder.RestJsonSchemaBuilderV2;
import org.apache.storm.solr.spout.SolrFieldsSpout;
-
-import java.io.IOException;
+import org.apache.storm.topology.TopologyBuilder;
public class SolrFieldsTopology extends SolrTopology {
- public static void main(String[] args) throws Exception {
- SolrFieldsTopology solrFieldsTopology = new SolrFieldsTopology();
- solrFieldsTopology.run(args);
- }
+
+ public static void main(String[] args) throws Exception {
+ SolrFieldsTopology solrFieldsTopology = new SolrFieldsTopology();
+ solrFieldsTopology.run(args);
+ }
protected SolrMapper getSolrMapper(SolrConfig solrConfig) throws
IOException {
return new SolrFieldsMapper.Builder(
diff --git
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrJsonTopology.java
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrJsonTopology.java
index d76ffb7..2c0a431 100644
---
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrJsonTopology.java
+++
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/topology/SolrJsonTopology.java
@@ -18,14 +18,14 @@
package org.apache.storm.solr.topology;
+import java.io.IOException;
+
import org.apache.storm.generated.StormTopology;
-import org.apache.storm.topology.TopologyBuilder;
import org.apache.storm.solr.bolt.SolrUpdateBolt;
import org.apache.storm.solr.mapper.SolrJsonMapper;
import org.apache.storm.solr.mapper.SolrMapper;
import org.apache.storm.solr.spout.SolrJsonSpout;
-
-import java.io.IOException;
+import org.apache.storm.topology.TopologyBuilder;
public class SolrJsonTopology extends SolrTopology {
public static void main(String[] args) throws Exception {
diff --git
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrFieldsTridentTopology.java
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrFieldsTridentTopology.java
index 2a230f6..cd574d7 100644
---
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrFieldsTridentTopology.java
+++
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrFieldsTridentTopology.java
@@ -18,16 +18,16 @@
package org.apache.storm.solr.trident;
+import java.io.IOException;
+
import org.apache.storm.generated.StormTopology;
import org.apache.storm.solr.config.SolrConfig;
-import org.apache.storm.tuple.Fields;
import org.apache.storm.solr.spout.SolrFieldsSpout;
import org.apache.storm.solr.topology.SolrFieldsTopology;
import org.apache.storm.trident.Stream;
import org.apache.storm.trident.TridentTopology;
import org.apache.storm.trident.state.StateFactory;
-
-import java.io.IOException;
+import org.apache.storm.tuple.Fields;
public class SolrFieldsTridentTopology extends SolrFieldsTopology {
public static void main(String[] args) throws Exception {
diff --git
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrJsonTridentTopology.java
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrJsonTridentTopology.java
index ae3e088..0ca9685 100644
---
a/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrJsonTridentTopology.java
+++
b/examples/storm-solr-examples/src/main/java/org/apache/storm/solr/trident/SolrJsonTridentTopology.java
@@ -18,15 +18,15 @@
package org.apache.storm.solr.trident;
+import java.io.IOException;
+
import org.apache.storm.generated.StormTopology;
-import org.apache.storm.tuple.Fields;
import org.apache.storm.solr.spout.SolrJsonSpout;
import org.apache.storm.solr.topology.SolrJsonTopology;
import org.apache.storm.trident.Stream;
import org.apache.storm.trident.TridentTopology;
import org.apache.storm.trident.state.StateFactory;
-
-import java.io.IOException;
+import org.apache.storm.tuple.Fields;
public class SolrJsonTridentTopology extends SolrJsonTopology {
public static void main(String[] args) throws Exception {
