Author: markt
Date: Wed Dec 6 15:35:29 2017
New Revision: 1817302
URL: http://svn.apache.org/viewvc?rev=1817302&view=rev
Log:
SpotBugs
Avoid implicit use of platform default encoding
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/PEMFile.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/PEMFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/PEMFile.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/PEMFile.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/PEMFile.java Wed Dec 6
15:35:29 2017
@@ -18,8 +18,10 @@ package org.apache.tomcat.util.net.jsse;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
-import java.io.FileReader;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
@@ -71,7 +73,8 @@ class PEMFile {
this.filename = filename;
List<Part> parts = new ArrayList<>();
- try (BufferedReader in = new BufferedReader(new FileReader(filename)))
{
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(
+ new FileInputStream(filename), StandardCharsets.US_ASCII))) {
Part part = null;
String line;
while ((line = in.readLine()) != null) {
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Wed Dec 6 15:35:29 2017
@@ -383,7 +383,6 @@ public class TestDigestAuthenticator ext
}
private static String digest(String input) {
- return MD5Encoder.encode(
- ConcurrentMessageDigest.digestMD5(input.getBytes()));
+ return
MD5Encoder.encode(ConcurrentMessageDigest.digestMD5(input.getBytes()));
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TestSSOnonLoginAndDigestAuthenticator.java
Wed Dec 6 15:35:29 2017
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.authenticator;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -458,8 +459,8 @@ public class TestSSOnonLoginAndDigestAut
}
private static String digest(String input) {
- return MD5Encoder.encode(
- ConcurrentMessageDigest.digestMD5(input.getBytes()));
+ return MD5Encoder.encode(ConcurrentMessageDigest.digestMD5(
+ input.getBytes(StandardCharsets.UTF_8)));
}
/*
Modified:
tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/authenticator/TesterDigestAuthenticatorPerformance.java
Wed Dec 6 15:35:29 2017
@@ -17,6 +17,7 @@
package org.apache.catalina.authenticator;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.http.HttpServletResponse;
@@ -160,9 +161,9 @@ public class TesterDigestAuthenticatorPe
private static final String A2 = METHOD + ":" + CONTEXT_PATH + URI;
private static final String MD5A1 = MD5Encoder.encode(
- ConcurrentMessageDigest.digest("MD5", A1.getBytes()));
+ ConcurrentMessageDigest.digest("MD5",
A1.getBytes(StandardCharsets.UTF_8)));
private static final String MD5A2 = MD5Encoder.encode(
- ConcurrentMessageDigest.digest("MD5", A2.getBytes()));
+ ConcurrentMessageDigest.digest("MD5",
A2.getBytes(StandardCharsets.UTF_8)));
@@ -214,8 +215,8 @@ public class TesterDigestAuthenticatorPe
String response = MD5A1 + ":" + nonce + ":" + ncString + ":" +
cnonce + ":" + QOP + ":" + MD5A2;
- String md5response = MD5Encoder.encode(
- ConcurrentMessageDigest.digest("MD5",
response.getBytes()));
+ String md5response =
MD5Encoder.encode(ConcurrentMessageDigest.digest(
+ "MD5", response.getBytes(StandardCharsets.UTF_8)));
StringBuilder auth = new StringBuilder();
auth.append("Digest username=\"");
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Wed Dec 6
15:35:29 2017
@@ -931,7 +931,7 @@ public class TestRequest extends TomcatB
tomcat.start();
- byte[] body = "Test".getBytes();
+ byte[] body = "Test".getBytes(userAgentCharaceterEncoding);
ByteChunk bc = new ByteChunk();
Map<String,List<String>> reqHeaders = new HashMap<>();
reqHeaders.put("Content-Type",
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java Wed Dec
6 15:35:29 2017
@@ -105,8 +105,8 @@ public class TestSendFile extends Tomcat
}
w.flush();
}
- System.out
- .println("Created file:" + f.getAbsolutePath() + " with " +
f.length() + " bytes.");
+ System.out.println(
+ "Created file:" + f.getAbsolutePath() + " with " + f.length()
+ " bytes.");
return f;
}
Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
Wed Dec 6 15:35:29 2017
@@ -412,8 +412,8 @@ public class TestNonBlockingAPI extends
final int max = 5;
int count = 0;
long delay = 0;
- byte[] b = "WANTMORE".getBytes();
- byte[] f = "FINISHED".getBytes();
+ byte[] b = "WANTMORE".getBytes(StandardCharsets.ISO_8859_1);
+ byte[] f = "FINISHED".getBytes(StandardCharsets.ISO_8859_1);
public DataWriter(long delay) {
this.delay = delay;
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java Wed Dec
6 15:35:29 2017
@@ -17,6 +17,7 @@
package org.apache.catalina.tribes.demos;
import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ManagedChannel;
@@ -42,7 +43,7 @@ public class EchoRpcTest implements RpcC
this.message = message;
this.pause = pause;
this.options = options;
- this.rpc = new RpcChannel(name.getBytes(),channel,this);
+ this.rpc = new
RpcChannel(name.getBytes(StandardCharsets.UTF_8),channel,this);
this.timeout = timeout;
this.name = name;
}
Modified: tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java
(original)
+++ tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgrade.java Wed Dec
6 15:35:29 2017
@@ -26,6 +26,7 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
import java.net.Socket;
+import java.nio.charset.StandardCharsets;
import javax.net.SocketFactory;
import javax.servlet.ReadListener;
@@ -228,8 +229,9 @@ public class TestUpgrade extends TomcatB
throw new IllegalArgumentException(ioe);
}
- BufferedReader reader = new BufferedReader(new
InputStreamReader(is));
- Writer writer = new OutputStreamWriter(os);
+ BufferedReader reader =
+ new BufferedReader(new InputStreamReader(is,
StandardCharsets.UTF_8));
+ Writer writer = new OutputStreamWriter(os, StandardCharsets.UTF_8);
this.writer = writer;
this.reader = reader;
Modified:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
(original)
+++
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeInternalHandler.java
Wed Dec 6 15:35:29 2017
@@ -27,6 +27,7 @@ import java.io.Writer;
import java.net.Socket;
import java.nio.ByteBuffer;
import java.nio.channels.CompletionHandler;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import javax.net.SocketFactory;
@@ -159,8 +160,9 @@ public class TestUpgradeInternalHandler
throw new IllegalArgumentException(ioe);
}
- BufferedReader reader = new BufferedReader(new
InputStreamReader(is));
- Writer writer = new OutputStreamWriter(os);
+ BufferedReader reader =
+ new BufferedReader(new InputStreamReader(is,
StandardCharsets.UTF_8));
+ Writer writer = new OutputStreamWriter(os, StandardCharsets.UTF_8);
this.writer = writer;
this.reader = reader;
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
Wed Dec 6 15:35:29 2017
@@ -18,6 +18,7 @@ package org.apache.tomcat.websocket;
import java.net.URI;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -39,8 +40,8 @@ import org.apache.tomcat.websocket.Teste
public class TestWsPingPongMessages extends WebSocketBaseTest {
- ByteBuffer applicationData = ByteBuffer.wrap(new String("mydata")
- .getBytes());
+ ByteBuffer applicationData =
+ ByteBuffer.wrap(new
String("mydata").getBytes(StandardCharsets.UTF_8));
@Test
public void testPingPongMessages() throws Exception {
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=1817302&r1=1817301&r2=1817302&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
Wed Dec 6 15:35:29 2017
@@ -256,13 +256,7 @@ public class CompressionServletResponseW
if (debug > 1) {
System.out.println("character encoding is " + charEnc);
}
- // HttpServletResponse.getCharacterEncoding() shouldn't return null
- // according the spec, so feel free to remove that "if"
- if (charEnc != null) {
- writer = new PrintWriter(new OutputStreamWriter(stream, charEnc));
- } else {
- writer = new PrintWriter(stream);
- }
+ writer = new PrintWriter(new OutputStreamWriter(stream, charEnc));
return writer;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
