Merge pull request yasserg#353 from pgalbraith/PR/checkstyle-eclipse

Update Checkstyle to v8.12
13401095975 · Oct 4, 2018 · 0976bcf · 0976bcf
2 parents a2fd593 + c21594b
commit 0976bcf
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 3 deletions.
diff --git a/crawler4j/checkstyle.xml b/crawler4j/checkstyle.xml
@@ -9,7 +9,6 @@
             <property name="max" value="120"/>
             <property name="ignorePattern" value="^(package .*;)|(import .*;)|(\{@link .*)$"/>
         </module>
-        <module name="FileContentsHolder"/>
         <module name="SuppressWarningsHolder"/>
         <module name="JavadocMethod">
             <property name="allowMissingJavadoc" value="true"/>
@@ -38,6 +37,7 @@
         <module name="ImportOrder">
             <property name="groups" value="java,javax,org,com,*"/>
             <property name="ordered" value="true"/>
+            <property name="separated" value="true"/>
             <property name="caseSensitive" value="true"/>
             <!-- This ensures that static imports go first. -->
             <property name="option" value="top"/>

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/CrawlConfig.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/CrawlConfig.java
@@ -28,6 +28,7 @@
 import org.apache.http.conn.DnsResolver;
 import org.apache.http.impl.conn.SystemDefaultDnsResolver;
 import org.apache.http.message.BasicHeader;
+
 import edu.uci.ics.crawler4j.crawler.authentication.AuthInfo;
 
 public class CrawlConfig {

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/CrawlController.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/CrawlController.java
@@ -24,8 +24,10 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.EnvironmentConfig;
+
 import edu.uci.ics.crawler4j.fetcher.PageFetcher;
 import edu.uci.ics.crawler4j.frontier.DocIDServer;
 import edu.uci.ics.crawler4j.frontier.Frontier;

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/WebCrawler.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/WebCrawler.java
@@ -21,10 +21,12 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+
 import org.apache.http.HttpStatus;
 import org.apache.http.impl.EnglishReasonPhraseCatalog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import edu.uci.ics.crawler4j.crawler.exceptions.ContentFetchException;
 import edu.uci.ics.crawler4j.crawler.exceptions.PageBiggerThanMaxSizeException;
 import edu.uci.ics.crawler4j.crawler.exceptions.ParseException;

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/authentication/AuthInfo.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/authentication/AuthInfo.java
@@ -2,6 +2,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+
 import javax.swing.text.html.FormSubmitEvent.MethodType;
 
 /**

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/fetcher/PageFetcher.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/fetcher/PageFetcher.java
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.net.ssl.SSLContext;
 
 import org.apache.http.Header;

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/parser/Parser.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/parser/Parser.java
@@ -20,6 +20,7 @@
 import org.apache.tika.language.LanguageIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import edu.uci.ics.crawler4j.crawler.CrawlConfig;
 import edu.uci.ics.crawler4j.crawler.Page;
 import edu.uci.ics.crawler4j.crawler.exceptions.ParseException;

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/parser/TikaHtmlParser.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/parser/TikaHtmlParser.java
@@ -7,13 +7,15 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.tika.metadata.DublinCore;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.parser.ParseContext;
 import org.apache.tika.parser.html.HtmlMapper;
 import org.apache.tika.parser.html.HtmlParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import edu.uci.ics.crawler4j.crawler.CrawlConfig;
 import edu.uci.ics.crawler4j.crawler.Page;
 import edu.uci.ics.crawler4j.crawler.exceptions.ParseException;

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/url/TLDList.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/url/TLDList.java
@@ -12,6 +12,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
+
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/crawler4j/src/main/java/edu/uci/ics/crawler4j/url/WebURL.java b/crawler4j/src/main/java/edu/uci/ics/crawler4j/url/WebURL.java
@@ -18,7 +18,6 @@
 package edu.uci.ics.crawler4j.url;
 
 import java.io.Serializable;
-
 import java.util.Map;
 
 import com.sleepycat.persist.model.Entity;

diff --git a/crawler4j/src/test/java/edu/uci/ics/crawler4j/tests/fetcher/PageFetcherHtmlOnly.java b/crawler4j/src/test/java/edu/uci/ics/crawler4j/tests/fetcher/PageFetcherHtmlOnly.java
@@ -2,8 +2,10 @@
 
 import java.io.IOException;
 import java.util.Date;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpHead;
+
 import edu.uci.ics.crawler4j.crawler.CrawlConfig;
 import edu.uci.ics.crawler4j.crawler.exceptions.PageBiggerThanMaxSizeException;
 import edu.uci.ics.crawler4j.fetcher.PageFetchResult;

diff --git a/crawler4j/src/test/java/edu/uci/ics/crawler4j/tests/fetcher/PageFetcherHtmlTest.java b/crawler4j/src/test/java/edu/uci/ics/crawler4j/tests/fetcher/PageFetcherHtmlTest.java
@@ -1,11 +1,14 @@
 package edu.uci.ics.crawler4j.tests.fetcher;
 
 import java.io.IOException;
+
 import org.junit.Rule;
 import org.junit.Test;
+
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 import edu.uci.ics.crawler4j.crawler.CrawlConfig;
 import edu.uci.ics.crawler4j.crawler.Page;
 import edu.uci.ics.crawler4j.crawler.exceptions.PageBiggerThanMaxSizeException;

diff --git a/pom.xml b/pom.xml
@@ -59,6 +59,7 @@
         <wiremock.version>2.14.0</wiremock.version>
         <spock.version>1.1-groovy-2.4</spock.version>
         <groovy.version>2.4.12</groovy.version>
+        <checkstyle.version>8.12</checkstyle.version>
 
         <!-- Maven specific settings -->
         <encoding>UTF-8</encoding>
@@ -255,6 +256,8 @@
                                 <consoleOutput>true</consoleOutput>
                                 <failsOnError>true</failsOnError>
                                 <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                                <sourceDirectories>${project.compileSourceRoots}</sourceDirectories>
+                                <testSourceDirectories>${project.testCompileSourceRoots}</testSourceDirectories>
                             </configuration>
                             <goals>
                                 <goal>check</goal>
@@ -265,7 +268,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>7.1</version>
+                            <version>${checkstyle.version}</version>
                         </dependency>
                     </dependencies>
                 </plugin>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     import java.net.MalformedURLException;
     import java.net.URL;
     import javax.swing.text.html.FormSubmitEvent.MethodType;
     /**
@@ Expand Down @@