Refactor to allow removal of Constants class

apache · Apr 20, 2020 · 001104b · 001104b
1 parent 66468c8
commit 001104b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;