[tomcat] branch 7.0.x updated: Deprecate MappingData.contextPath as it is unused

[markt]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
     new 7a811e8  Deprecate MappingData.contextPath as it is unused
7a811e8 is described below

commit 7a811e8fe8b844bdc4d4b465ec73258606abd163
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 31 16:07:15 2020 +0000

    Deprecate MappingData.contextPath as it is unused
---
 java/org/apache/tomcat/util/http/mapper/Mapper.java      | 2 ++
 java/org/apache/tomcat/util/http/mapper/MappingData.java | 4 ++++
 test/org/apache/tomcat/util/http/mapper/TestMapper.java  | 2 ++
 webapps/docs/changelog.xml                               | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/java/org/apache/tomcat/util/http/mapper/Mapper.java 
b/java/org/apache/tomcat/util/http/mapper/Mapper.java
index e1d72f8..a959ba9 100644
--- a/java/org/apache/tomcat/util/http/mapper/Mapper.java
+++ b/java/org/apache/tomcat/util/http/mapper/Mapper.java
@@ -770,6 +770,7 @@ public final class Mapper {
     /**
      * Map the specified URI.
      */
+    @SuppressWarnings("deprecation") // contextPath
     private final void internalMap(CharChunk host, CharChunk uri,
             String version, MappingData mappingData) throws Exception {
 
@@ -1087,6 +1088,7 @@ public final class Mapper {
     /**
      * Exact mapping.
      */
+    @SuppressWarnings("deprecation") // contextPath
     private final void internalMapExactWrapper
         (Wrapper[] wrappers, CharChunk path, MappingData mappingData) {
         Wrapper wrapper = exactFind(wrappers, path);
diff --git a/java/org/apache/tomcat/util/http/mapper/MappingData.java 
b/java/org/apache/tomcat/util/http/mapper/MappingData.java
index d714180..2a4c764 100644
--- a/java/org/apache/tomcat/util/http/mapper/MappingData.java
+++ b/java/org/apache/tomcat/util/http/mapper/MappingData.java
@@ -33,6 +33,10 @@ public class MappingData {
     public Object wrapper = null;
     public boolean jspWildCard = false;
 
+    /**
+     * @deprecated Unused. This will be removed in Tomcat 10.
+     */
+    @Deprecated
     public MessageBytes contextPath = MessageBytes.newInstance();
     public MessageBytes requestPath = MessageBytes.newInstance();
     public MessageBytes wrapperPath = MessageBytes.newInstance();
diff --git a/test/org/apache/tomcat/util/http/mapper/TestMapper.java 
b/test/org/apache/tomcat/util/http/mapper/TestMapper.java
index 3389d37..55d7a2b 100644
--- a/test/org/apache/tomcat/util/http/mapper/TestMapper.java
+++ b/test/org/apache/tomcat/util/http/mapper/TestMapper.java
@@ -219,6 +219,7 @@ public class TestMapper extends LoggingBaseTest {
     }
 
     @Test
+    @SuppressWarnings("deprecation") // contextPath
     public void testMap() throws Exception {
         MappingData mappingData = new MappingData();
         MessageBytes host = MessageBytes.newInstance();
@@ -444,6 +445,7 @@ public class TestMapper extends LoggingBaseTest {
     }
 
     @Test
+    @SuppressWarnings("deprecation") // contextPath
     public void testContextListConcurrencyBug56653() throws Exception {
         final Object host = new Object(); // "localhost";
         final Object contextRoot = new Object(); // "ROOT";
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 08d71e3..1962d6b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,6 +118,9 @@
         <bug>64089</bug>: Add <code>${...}</code> property replacement support
         to XML external entity definitions. (markt)
       </fix>
+      <scode>
+        Deprecate <code>MappingData.contextPath</code> as it is unused. (markt)
+      </scode>
     </changelog>
   </subsection>
   <subsection name="Coyote">


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