Author: markt Date: Thu May 4 13:32:29 2017 New Revision: 1793801 URL: http://svn.apache.org/viewvc?rev=1793801&view=rev Log: Remove deprecated code
Modified: tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java Modified: tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java?rev=1793801&r1=1793800&r2=1793801&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java Thu May 4 13:32:29 2017 @@ -19,12 +19,9 @@ package org.apache.catalina.util; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.util.BitSet; -import org.apache.tomcat.util.buf.B2CConverter; - /** * * This class is very similar to the java.net.URLEncoder class. @@ -130,28 +127,6 @@ public class URLEncoder { } - /** - * URL encodes the provided path using the given encoding. - * - * @param path The path to encode - * @param encoding The encoding to use to convert the path to bytes - * - * @return The encoded path - * - * @deprecated This will be removed in Tomcat 9.0.x - */ - @Deprecated - public String encode(String path, String encoding) { - Charset charset; - try { - charset = B2CConverter.getCharset(encoding); - } catch (UnsupportedEncodingException e) { - charset = Charset.defaultCharset(); - } - return encode(path, charset); - } - - /** * URL encodes the provided path using the given character set. * Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java?rev=1793801&r1=1793800&r2=1793801&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java Thu May 4 13:32:29 2017 @@ -36,13 +36,5 @@ public abstract class Resolver { public abstract boolean resolveResource(int type, String name); - /** - * @return The name of the encoding to use to %nn encode URIs - * - * @deprecated This will be removed in Tomcat 9.0.x - */ - @Deprecated - public abstract String getUriEncoding(); - public abstract Charset getUriCharset(); } Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java?rev=1793801&r1=1793800&r2=1793801&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java Thu May 4 13:32:29 2017 @@ -179,12 +179,6 @@ public class ResolverImpl extends Resolv } @Override - @Deprecated - public String getUriEncoding() { - return request.getConnector().getURIEncoding(); - } - - @Override public Charset getUriCharset() { return request.getConnector().getURICharset(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org