Merge debf1f9 into dee6048

tomdesair · Jun 30, 2021 · adfe7f5 · adfe7f5
2 parents dee6048 + debf1f9
commit adfe7f5
Show file tree

Hide file tree

Showing 35 changed files with 19 additions and 50 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,11 @@ language: java
 sudo: false # faster builds
 
 jdk:
-- openjdk12
-- oraclejdk11
-- openjdk9
+# Latest
+- openjdk16
+# LTS versions
+- openjdk11
 - openjdk8
-# https://docs.travis-ci.com/user/languages/java/#testing-against-multiple-jdks
-# - Oracle JDK 10 is not provided because it reached End of Life in October 2018.
-# - JDK 7 is not listed as the Sonar plugin requires Java 8. However, all JDKs compile with target version 7.
 
 addons:
   sonarcloud:

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -11,6 +11,11 @@
         <property name="eachLine" value="true"/>
     </module>
 
+    <module name="LineLength">
+        <property name="max" value="120"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+
     <module name="TreeWalker">
         <module name="TodoComment">
             <property name="severity" value="warning"/>
@@ -30,10 +35,6 @@
             <property name="allowByTailComment" value="true"/>
             <property name="allowNonPrintableEscapes" value="true"/>
         </module>
-        <module name="LineLength">
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
         <module name="AvoidStarImport"/>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
@@ -178,7 +179,7 @@
         <module name="CustomImportOrder">
             <property name="sortImportsInGroupAlphabetically" value="true"/>
             <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+            <property name="customImportOrderRules" value="STATIC###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="NoWhitespaceBefore">
@@ -235,4 +236,4 @@
         <property name="message" value="Line has trailing whitespace"/>
         <property name="fileExtensions" value="java, properties, cfg, css, js, xml"/>
     </module>
-</module>
+</module>
diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.2</version>
+                <version>0.8.7</version>
                 <executions>
                     <!--
                         Prepares the property pointing to the JaCoCo runtime agent which
@@ -233,6 +233,7 @@
         <profile>
             <id>run-sonar</id>
             <activation>
+                <jdk>[11, ]</jdk>
                 <property>
                     <name>env.SONAR_TOKEN</name>
                 </property>
@@ -311,7 +312,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.1.2</version>
                         <executions>
                             <execution>
                                 <id>verify-style</id>
@@ -331,11 +332,10 @@
                             <includeTestSourceDirectory>true</includeTestSourceDirectory>
                         </configuration>
                         <dependencies>
-                            <!-- Override dependencies to use checkstyle 8.5 (aligned with Codacy)-->
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>8.29</version>
+                                <version>8.44</version>
                             </dependency>
                         </dependencies>
                     </plugin>

diff --git a/src/main/java/me/desair/tus/server/HttpMethod.java b/src/main/java/me/desair/tus/server/HttpMethod.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server;
 
 import java.util.Set;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;

diff --git a/src/main/java/me/desair/tus/server/RequestValidator.java b/src/main/java/me/desair/tus/server/RequestValidator.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.exception.TusException;

diff --git a/src/main/java/me/desair/tus/server/TusExtension.java b/src/main/java/me/desair/tus/server/TusExtension.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.Collection;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.exception.TusException;

diff --git a/src/main/java/me/desair/tus/server/TusFileUploadService.java b/src/main/java/me/desair/tus/server/TusFileUploadService.java
@@ -9,6 +9,7 @@
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import me.desair.tus.server.checksum.ChecksumExtension;
 import me.desair.tus.server.concatenation.ConcatenationExtension;
 import me.desair.tus.server.core.CoreProtocol;

diff --git a/src/main/java/me/desair/tus/server/checksum/validation/ChecksumAlgorithmValidator.java b/src/main/java/me/desair/tus/server/checksum/validation/ChecksumAlgorithmValidator.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.checksum.validation;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/...in/java/me/desair/tus/server/concatenation/validation/NoUploadLengthOnFinalValidator.java b/...in/java/me/desair/tus/server/concatenation/validation/NoUploadLengthOnFinalValidator.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.concatenation.validation;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/...main/java/me/desair/tus/server/concatenation/validation/PartialUploadsExistValidator.java b/...main/java/me/desair/tus/server/concatenation/validation/PartialUploadsExistValidator.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.concatenation.validation;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/main/java/me/desair/tus/server/concatenation/validation/PatchFinalUploadValidator.java b/src/main/java/me/desair/tus/server/concatenation/validation/PatchFinalUploadValidator.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.concatenation.validation;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpMethod;

diff --git a/src/main/java/me/desair/tus/server/core/CoreHeadRequestHandler.java b/src/main/java/me/desair/tus/server/core/CoreHeadRequestHandler.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.Objects;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/main/java/me/desair/tus/server/core/CoreOptionsRequestHandler.java b/src/main/java/me/desair/tus/server/core/CoreOptionsRequestHandler.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.core;
 
 import java.util.Objects;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/main/java/me/desair/tus/server/core/CorePatchRequestHandler.java b/src/main/java/me/desair/tus/server/core/CorePatchRequestHandler.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.Objects;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/main/java/me/desair/tus/server/core/validation/ContentLengthValidator.java b/src/main/java/me/desair/tus/server/core/validation/ContentLengthValidator.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.core.validation;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/main/java/me/desair/tus/server/core/validation/IdExistsValidator.java b/src/main/java/me/desair/tus/server/core/validation/IdExistsValidator.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.core.validation;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpMethod;

diff --git a/src/main/java/me/desair/tus/server/core/validation/UploadOffsetValidator.java b/src/main/java/me/desair/tus/server/core/validation/UploadOffsetValidator.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.Objects;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/main/java/me/desair/tus/server/creation/CreationPatchRequestHandler.java b/src/main/java/me/desair/tus/server/creation/CreationPatchRequestHandler.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.creation;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/main/java/me/desair/tus/server/creation/CreationPostRequestHandler.java b/src/main/java/me/desair/tus/server/creation/CreationPostRequestHandler.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.creation;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 

diff --git a/src/main/java/me/desair/tus/server/creation/validation/PostURIValidator.java b/src/main/java/me/desair/tus/server/creation/validation/PostURIValidator.java
@@ -2,7 +2,6 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpMethod;

diff --git a/src/main/java/me/desair/tus/server/download/DownloadGetRequestHandler.java b/src/main/java/me/desair/tus/server/download/DownloadGetRequestHandler.java
@@ -4,7 +4,6 @@
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;
@@ -44,7 +43,8 @@ public void process(HttpMethod method, TusServletRequest servletRequest,
 
             servletResponse.setHeader(HttpHeader.CONTENT_DISPOSITION,
                     String.format(CONTENT_DISPOSITION_FORMAT, info.getFileName(),
-                            URLEncoder.encode(info.getFileName(), StandardCharsets.UTF_8.toString()).replace("+","%20")));
+                            URLEncoder.encode(info.getFileName(),
+                            StandardCharsets.UTF_8.toString()).replace("+","%20")));
 
             servletResponse.setHeader(HttpHeader.CONTENT_TYPE, info.getFileMimeType());
 

diff --git a/src/main/java/me/desair/tus/server/termination/TerminationDeleteRequestHandler.java b/src/main/java/me/desair/tus/server/termination/TerminationDeleteRequestHandler.java
@@ -1,7 +1,6 @@
 package me.desair.tus.server.termination;
 
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpMethod;

diff --git a/src/main/java/me/desair/tus/server/upload/UploadInfo.java b/src/main/java/me/desair/tus/server/upload/UploadInfo.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.util.Utils;

diff --git a/src/main/java/me/desair/tus/server/util/AbstractTusExtension.java b/src/main/java/me/desair/tus/server/util/AbstractTusExtension.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpMethod;

diff --git a/src/main/java/me/desair/tus/server/util/TusServletRequest.java b/src/main/java/me/desair/tus/server/util/TusServletRequest.java
@@ -12,7 +12,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 

diff --git a/src/main/java/me/desair/tus/server/util/TusServletResponse.java b/src/main/java/me/desair/tus/server/util/TusServletResponse.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 

diff --git a/src/main/java/me/desair/tus/server/util/Utils.java b/src/main/java/me/desair/tus/server/util/Utils.java
@@ -18,7 +18,6 @@
 import java.nio.file.Path;
 import java.util.LinkedList;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/test/java/me/desair/tus/server/ITTusFileUploadService.java b/src/test/java/me/desair/tus/server/ITTusFileUploadService.java
@@ -20,7 +20,6 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.exception.TusException;

diff --git a/src/test/java/me/desair/tus/server/core/CorePatchRequestHandlerTest.java b/src/test/java/me/desair/tus/server/core/CorePatchRequestHandlerTest.java
@@ -12,7 +12,6 @@
 
 import java.io.InputStream;
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/test/java/me/desair/tus/server/core/ITCoreProtocol.java b/src/test/java/me/desair/tus/server/core/ITCoreProtocol.java
@@ -8,7 +8,6 @@
 import static org.mockito.Mockito.when;
 
 import java.io.InputStream;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.AbstractTusExtensionIntegrationTest;

diff --git a/src/test/java/me/desair/tus/server/creation/CreationPatchRequestHandlerTest.java b/src/test/java/me/desair/tus/server/creation/CreationPatchRequestHandlerTest.java
@@ -11,7 +11,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/test/java/me/desair/tus/server/creation/CreationPostRequestHandlerTest.java b/src/test/java/me/desair/tus/server/creation/CreationPostRequestHandlerTest.java
@@ -10,7 +10,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;

diff --git a/src/test/java/me/desair/tus/server/creation/ITCreationExtension.java b/src/test/java/me/desair/tus/server/creation/ITCreationExtension.java
@@ -11,7 +11,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.AbstractTusExtensionIntegrationTest;

diff --git a/src/test/java/me/desair/tus/server/download/DownloadGetRequestHandlerTest.java b/src/test/java/me/desair/tus/server/download/DownloadGetRequestHandlerTest.java
@@ -11,7 +11,6 @@
 
 import java.io.OutputStream;
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpHeader;
@@ -111,8 +110,7 @@ public void testWithCompletedUploadWithoutMetadata() throws Exception {
         assertThat(servletResponse.getStatus(), is(HttpServletResponse.SC_OK));
         assertThat(servletResponse.getHeader(HttpHeader.CONTENT_LENGTH), is("10"));
         assertThat(servletResponse.getHeader(HttpHeader.CONTENT_DISPOSITION),
-                is("attachment; filename=\"" + id.toString() + "\""
-                        + "; filename*=UTF-8''"+id.toString()));
+                is("attachment; filename=\"" + id.toString() + "\"; filename*=UTF-8''" + id.toString()));
         assertThat(servletResponse.getHeader(HttpHeader.CONTENT_TYPE), is("application/octet-stream"));
     }
 

diff --git a/src/test/java/me/desair/tus/server/termination/TerminationDeleteRequestHandlerTest.java b/src/test/java/me/desair/tus/server/termination/TerminationDeleteRequestHandlerTest.java
@@ -10,7 +10,6 @@
 import static org.mockito.Mockito.when;
 
 import java.util.UUID;
-
 import javax.servlet.http.HttpServletResponse;
 
 import me.desair.tus.server.HttpMethod;