(tomcat) 03/03: Remove deprecated code
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 8081af2086a89618a75a7091835fe56d2fc19364 Author: Mark Thomas AuthorDate: Fri Apr 26 16:07:21 2024 +0100 Remove deprecated code --- java/org/apache/coyote/http11/Constants.java | 36 1 file changed, 36 deletions(-) diff --git a/java/org/apache/coyote/http11/Constants.java b/java/org/apache/coyote/http11/Constants.java index b580819b28..7831aa5494 100644 --- a/java/org/apache/coyote/http11/Constants.java +++ b/java/org/apache/coyote/http11/Constants.java @@ -70,48 +70,12 @@ public final class Constants { public static final byte SEMI_COLON = (byte) ';'; -/** - * 'A'. - * - * @deprecated Unused. Will be removed in Tomcat 11. - */ -@Deprecated -public static final byte A = (byte) 'A'; - - -/** - * 'a'. - * - * @deprecated Unused. Will be removed in Tomcat 11. - */ -@Deprecated -public static final byte a = (byte) 'a'; - - -/** - * 'Z'. - * - * @deprecated Unused. Will be removed in Tomcat 11. - */ -@Deprecated -public static final byte Z = (byte) 'Z'; - - /** * '?'. */ public static final byte QUESTION = (byte) '?'; -/** - * Lower case offset. - * - * @deprecated Unused. Will be removed in Tomcat 11. - */ -@Deprecated -public static final byte LC_OFFSET = A - a; - - /* Various constant "strings" */ public static final String CONNECTION = "Connection"; public static final String CLOSE = "close"; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Remove deprecated code
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit b2154c7b618c9fa9dc6c8a169ce076bf0b3b53f8 Author: Mark Thomas AuthorDate: Mon Dec 6 08:02:42 2021 + Remove deprecated code --- java/org/apache/catalina/users/MemoryUserDatabase.java | 15 --- 1 file changed, 15 deletions(-) diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java index 207dec3..f8bad5c 100644 --- a/java/org/apache/catalina/users/MemoryUserDatabase.java +++ b/java/org/apache/catalina/users/MemoryUserDatabase.java @@ -527,21 +527,6 @@ public class MemoryUserDatabase implements UserDatabase { * location. * * @return true if the database is writable - * - * @deprecated Use {@link #isWritable()}. This method will be removed in - * Tomcat 10.1.x onwards. - */ -@Deprecated -public boolean isWriteable() { -return isWritable(); -} - - -/** - * Check for permissions to save this user database to persistent storage - * location. - * - * @return true if the database is writable */ public boolean isWritable() { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Remove deprecated code
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 678c7a0aaa5de05b99ce3cf005fe79504fe683bc Author: Mark Thomas AuthorDate: Fri Jul 23 16:19:25 2021 +0100 Remove deprecated code --- java/org/apache/catalina/core/Constants.java | 5 - 1 file changed, 5 deletions(-) diff --git a/java/org/apache/catalina/core/Constants.java b/java/org/apache/catalina/core/Constants.java index d7161ba..13b8334 100644 --- a/java/org/apache/catalina/core/Constants.java +++ b/java/org/apache/catalina/core/Constants.java @@ -18,11 +18,6 @@ package org.apache.catalina.core; public class Constants { -/** - * Unused. Will be removed in Apache Tomcat 10.1.x onwards. - */ -@Deprecated -public static final String Package = "org.apache.catalina.core"; public static final int MAJOR_VERSION = 5; public static final int MINOR_VERSION = 1; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 03/03: Remove deprecated code
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit cf7196b09d687c4ceb1c52830b405e1c60197181 Author: Mark Thomas AuthorDate: Fri Mar 13 12:01:17 2020 + Remove deprecated code --- .../apache/catalina/connector/CoyoteAdapter.java | 68 -- 1 file changed, 68 deletions(-) diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 2862eb2..1d21a24 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -1238,74 +1238,6 @@ public class CoyoteAdapter implements Adapter { /** - * Check that the URI is normalized following character decoding. This - * method checks for "\", 0, "//", "/./" and "/../". - * - * @param uriMB URI to be checked (should be chars) - * - * @return false if sequences that are supposed to be - * normalized are still present in the URI, otherwise - * true - * - * @deprecated This code will be removed in Apache Tomcat 10 onwards - */ -@Deprecated -public static boolean checkNormalize(MessageBytes uriMB) { - -CharChunk uriCC = uriMB.getCharChunk(); -char[] c = uriCC.getChars(); -int start = uriCC.getStart(); -int end = uriCC.getEnd(); - -int pos = 0; - -// Check for '\' and 0 -for (pos = start; pos < end; pos++) { -if (c[pos] == '\\') { -return false; -} -if (c[pos] == 0) { -return false; -} -} - -// Check for "//" -for (pos = start; pos < (end - 1); pos++) { -if (c[pos] == '/') { -if (c[pos + 1] == '/') { -return false; -} -} -} - -// Check for ending with "/." or "/.." -if (((end - start) >= 2) && (c[end - 1] == '.')) { -if ((c[end - 2] == '/') -|| ((c[end - 2] == '.') -&& (c[end - 3] == '/'))) { -return false; -} -} - -// Check for "/./" -if (uriCC.indexOf("/./", 0, 3, 0) >= 0) { -return false; -} - -// Check for "/../" -if (uriCC.indexOf("/../", 0, 4, 0) >= 0) { -return false; -} - -return true; - -} - - -// -- Protected Methods - - -/** * Copy an array of bytes to a different position. Used during * normalization. * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org