Checkstyle improvements.

jodconverter · Jan 7, 2020 · ff54e8b · ff54e8b
1 parent 1c2f7df
commit ff54e8b
Show file tree

Hide file tree

Showing 51 changed files with 112 additions and 167 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -215,14 +215,17 @@
             <message key="ws.notPreceded"
                      value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="2"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="2"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="2"/>
-        </module>
+
+        <!-- Disable Indentation Check, there's too much bug in it -->
+        <!-- See https://github.com/checkstyle/checkstyle/issues?q=is%3Aopen+is%3Aissue+label%3Aindentaion -->
+        <!--<module name="Indentation">-->
+        <!--<property name="basicOffset" value="2"/>-->
+        <!--<property name="braceAdjustment" value="0"/>-->
+        <!--<property name="caseIndent" value="2"/>-->
+        <!--<property name="throwsIndent" value="4"/>-->
+        <!--<property name="lineWrappingIndentation" value="4"/>-->
+        <!--<property name="arrayInitIndent" value="2"/>-->
+        <!--</module>-->
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
             <property name="allowedAbbreviationLength" value="1"/>
@@ -237,9 +240,7 @@
             <property name="separateLineBetweenGroups" value="true"/>
             <!--<property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>-->
             <property name="customImportOrderRules"
-                      value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE" />
-            <property name="specialImportsRegExp" value="^org\.(?!jodconverter)" />
-            <property name="thirdPartyPackageRegExp" value="^(com|org\.jodconverter)\." />
+                      value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###SAME_PACKAGE(2)" />
             <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
         </module>
         <module name="MethodParamPad">

diff --git a/gradle/java-projects.gradle b/gradle/java-projects.gradle
@@ -105,7 +105,7 @@ checkstyle {
 }
 
 // Disable checkstyle for test code
-//[checkstyleTest, checkstyleIntegTest]*.enabled = false
+[checkstyleTest, checkstyleIntegTest]*.enabled = false
 
 // Configures the checkstyle tasks
 tasks.withType(Checkstyle) {

diff --git a/jodconverter-cli/src/integTest/java/org/jodconverter/cli/OnlineConvertITest.java b/jodconverter-cli/src/integTest/java/org/jodconverter/cli/OnlineConvertITest.java
@@ -29,14 +29,13 @@
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
 import org.apache.commons.io.FileUtils;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import org.jodconverter.cli.util.ExitException;
 import org.jodconverter.cli.util.NoExitResource;
 import org.jodconverter.cli.util.ResetExitExceptionResource;

diff --git a/jodconverter-core/src/main/java/org/jodconverter/document/DocumentFormat.java b/jodconverter-core/src/main/java/org/jodconverter/document/DocumentFormat.java
@@ -33,15 +33,14 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.commons.lang3.Validate;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /** Contains the required information used to deal with a specific document format . */
 public class DocumentFormat {

diff --git a/jodconverter-core/src/main/java/org/jodconverter/document/JsonDocumentFormatRegistry.java b/jodconverter-core/src/main/java/org/jodconverter/document/JsonDocumentFormatRegistry.java
@@ -26,10 +26,9 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.io.IOUtils;
-
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import org.apache.commons.io.IOUtils;
 
 import org.jodconverter.document.DocumentFormat.Builder;
 

diff --git a/...r-core/src/test/java/org/jodconverter/document/DumpJsonDefaultDocumentFormatRegistry.java b/...r-core/src/test/java/org/jodconverter/document/DumpJsonDefaultDocumentFormatRegistry.java
@@ -22,13 +22,12 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 /** Executable class that dumps a JSON version of the DefaultDocumentFormatRegistry. */
 final class DumpJsonDefaultDocumentFormatRegistry {
 

diff --git a/jodconverter-local/src/integTest/java/org/jodconverter/filter/DefaultFilterChainITest.java b/jodconverter-local/src/integTest/java/org/jodconverter/filter/DefaultFilterChainITest.java
@@ -30,13 +30,12 @@
 import java.lang.reflect.Modifier;
 import java.nio.charset.StandardCharsets;
 
+import com.sun.star.lang.XComponent;
 import org.apache.commons.io.FileUtils;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.sun.star.lang.XComponent;
-
 import org.jodconverter.AbstractOfficeITest;
 import org.jodconverter.LocalConverter;
 import org.jodconverter.filter.text.PageCounterFilter;

diff --git a/...-local/src/integTest/java/org/jodconverter/office/OfficeProcessManagerPoolEntryITest.java b/...-local/src/integTest/java/org/jodconverter/office/OfficeProcessManagerPoolEntryITest.java
@@ -32,13 +32,12 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.junit.Test;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.frame.TerminationVetoException;
 import com.sun.star.frame.XTerminateListener;
 import com.sun.star.lang.EventObject;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.process.PureJavaProcessManager;
 

diff --git a/jodconverter-local/src/integTest/java/org/jodconverter/office/utils/InfoITest.java b/jodconverter-local/src/integTest/java/org/jodconverter/office/utils/InfoITest.java
@@ -23,13 +23,12 @@
 
 import java.io.File;
 
+import com.sun.star.uno.XComponentContext;
 import org.apache.commons.io.FileUtils;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import com.sun.star.uno.XComponentContext;
-
 import org.jodconverter.AbstractOfficeITest;
 import org.jodconverter.LocalConverter;
 import org.jodconverter.filter.Filter;

diff --git a/...onverter-local/src/integTest/java/org/jodconverter/task/AbstractLocalOfficeTaskITest.java b/...onverter-local/src/integTest/java/org/jodconverter/task/AbstractLocalOfficeTaskITest.java
@@ -21,13 +21,12 @@
 
 import java.io.File;
 
-import org.junit.Test;
-
 import com.sun.star.lang.EventObject;
 import com.sun.star.lang.XComponent;
 import com.sun.star.util.CloseVetoException;
 import com.sun.star.util.XCloseListener;
 import com.sun.star.util.XCloseable;
+import org.junit.Test;
 
 import org.jodconverter.AbstractOfficeITest;
 import org.jodconverter.document.DefaultDocumentFormatRegistry;

diff --git a/jodconverter-local/src/main/java/org/jodconverter/LocalConverter.java b/jodconverter-local/src/main/java/org/jodconverter/LocalConverter.java
@@ -23,9 +23,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang3.Validate;
-
 import com.sun.star.document.UpdateDocMode;
+import org.apache.commons.lang3.Validate;
 
 import org.jodconverter.document.DocumentFormatRegistry;
 import org.jodconverter.filter.DefaultFilterChain;

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/NoopFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/NoopFilter.java
@@ -19,11 +19,10 @@
 
 package org.jodconverter.filter;
 
+import com.sun.star.lang.XComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.star.lang.XComponent;
-
 import org.jodconverter.office.OfficeContext;
 
 /** This filter does nothing except calling the next filter in the chain. */

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/PageCounterFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/PageCounterFilter.java
@@ -19,13 +19,12 @@
 
 package org.jodconverter.filter;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.office.OfficeContext;
 import org.jodconverter.office.utils.Calc;

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/RefreshFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/RefreshFilter.java
@@ -19,11 +19,10 @@
 
 package org.jodconverter.filter;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.lang.XComponent;
 import com.sun.star.util.XRefreshable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.office.OfficeContext;
 import org.jodconverter.office.utils.Lo;

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/draw/PageSelectorFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/draw/PageSelectorFilter.java
@@ -19,13 +19,12 @@
 
 package org.jodconverter.filter.draw;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.drawing.XDrawPage;
 import com.sun.star.drawing.XDrawPages;
 import com.sun.star.drawing.XDrawPagesSupplier;
 import com.sun.star.lang.XComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.filter.Filter;
 import org.jodconverter.filter.FilterChain;

diff --git a/...r-local/src/main/java/org/jodconverter/filter/text/AbstractTextContentInserterFilter.java b/...r-local/src/main/java/org/jodconverter/filter/text/AbstractTextContentInserterFilter.java
@@ -23,9 +23,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.awt.Size;
 import com.sun.star.frame.XController;
 import com.sun.star.text.RelOrientation;
@@ -37,6 +34,8 @@
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextViewCursor;
 import com.sun.star.text.XTextViewCursorSupplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.filter.Filter;
 import org.jodconverter.office.utils.Lo;

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/text/DocumentInserterFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/text/DocumentInserterFilter.java
@@ -23,14 +23,13 @@
 
 import java.io.File;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.document.XDocumentInsertable;
 import com.sun.star.lang.XComponent;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.filter.Filter;
 import org.jodconverter.filter.FilterChain;

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/text/GraphicInserterFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/text/GraphicInserterFilter.java
@@ -25,14 +25,10 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.UUID;
-
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.drawing.XShape;
@@ -44,6 +40,8 @@
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.filter.FilterChain;
 import org.jodconverter.office.LocalOfficeContext;

diff --git a/...onverter-local/src/main/java/org/jodconverter/filter/text/LinkedImagesEmbedderFilter.java b/...onverter-local/src/main/java/org/jodconverter/filter/text/LinkedImagesEmbedderFilter.java
@@ -19,9 +19,6 @@
 
 package org.jodconverter.filter.text;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameContainer;
@@ -34,6 +31,8 @@
 import com.sun.star.uno.Any;
 import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.XComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.filter.Filter;
 import org.jodconverter.filter.FilterChain;
@@ -108,15 +107,15 @@ private static void convertLinkedImagesToEmbedded(
           }
         } else {
           final String name = xPropSet.getPropertyValue("LinkDisplayName").toString();
-          final String graphicURL = xPropSet.getPropertyValue("GraphicURL").toString();
+          final String graphicUrl = xPropSet.getPropertyValue("GraphicURL").toString();
           // Only ones that are not embedded
-          if (!graphicURL.contains("vnd.sun.")) {
+          if (!graphicUrl.contains("vnd.sun.")) {
             // Creating bitmap container service
             final XNameContainer bitmapContainer =
                 Lo.createInstanceMSF(
                     document, XNameContainer.class, "com.sun.star.drawing.BitmapTable");
             if (!bitmapContainer.hasByName(name)) {
-              bitmapContainer.insertByName(name, graphicURL);
+              bitmapContainer.insertByName(name, graphicUrl);
               xPropSet.setPropertyValue("GraphicURL", bitmapContainer.getByName(name).toString());
             }
           }

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/text/PageCounterFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/text/PageCounterFilter.java
@@ -19,13 +19,12 @@
 
 package org.jodconverter.filter.text;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.AnyConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.filter.Filter;
 import org.jodconverter.filter.FilterChain;

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/text/PageMarginsFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/text/PageMarginsFilter.java
@@ -19,9 +19,6 @@
 
 package org.jodconverter.filter.text;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
@@ -30,6 +27,8 @@
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.filter.Filter;
 import org.jodconverter.filter.FilterChain;

diff --git a/jodconverter-local/src/main/java/org/jodconverter/filter/text/PageSelectorFilter.java b/jodconverter-local/src/main/java/org/jodconverter/filter/text/PageSelectorFilter.java
@@ -19,9 +19,6 @@
 
 package org.jodconverter.filter.text;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.sun.star.datatransfer.XTransferable;
 import com.sun.star.datatransfer.XTransferableSupplier;
 import com.sun.star.frame.XController;
@@ -32,6 +29,8 @@
 import com.sun.star.text.XTextViewCursor;
 import com.sun.star.text.XTextViewCursorSupplier;
 import com.sun.star.view.XSelectionSupplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.jodconverter.filter.Filter;
 import org.jodconverter.filter.FilterChain;