[tomcat] branch 9.0.x updated: Refactor to allow removal of Constants class

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 0ee74f4  Refactor to allow removal of Constants class
0ee74f4 is described below

commit 0ee74f415f2fbfd16ccf851711a9741836af3139
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Apr 20 10:36:10 2020 +0100

    Refactor to allow removal of Constants class
---
 java/org/apache/catalina/servlets/Constants.java      | 5 ++++-
 java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/servlets/Constants.java 
b/java/org/apache/catalina/servlets/Constants.java
index 52f4bdc..a40e96c 100644
--- a/java/org/apache/catalina/servlets/Constants.java
+++ b/java/org/apache/catalina/servlets/Constants.java
@@ -18,7 +18,10 @@
 
 package org.apache.catalina.servlets;
 
-
+/**
+ * Unused. Will be removed in Tomcat 10.
+ */
+@Deprecated
 public class Constants {
 
     public static final String Package = "org.apache.catalina.servlets";
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index e7f7041..a7968b1 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -141,7 +141,7 @@ public class DefaultServlet extends HttpServlet {
     /**
      * The string manager for this package.
      */
-    protected static final StringManager sm = 
StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = 
StringManager.getManager(DefaultServlet.class);
 
     private static final DocumentBuilderFactory factory;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org