You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/31 16:09:47 UTC
[tomcat] branch 9.0.x updated: Deprecate MappingData.contextPath as
it is unused
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 68a4097 Deprecate MappingData.contextPath as it is unused
68a4097 is described below
commit 68a4097dc1bdaa4b0e59c7bb751bf820015f4cf4
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/catalina/mapper/Mapper.java | 2 ++
java/org/apache/catalina/mapper/MappingData.java | 4 ++++
test/org/apache/catalina/mapper/TestMapper.java | 2 ++
webapps/docs/changelog.xml | 3 +++
4 files changed, 11 insertions(+)
diff --git a/java/org/apache/catalina/mapper/Mapper.java b/java/org/apache/catalina/mapper/Mapper.java
index a049ba3..78ba6f7 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -732,6 +732,7 @@ public final class Mapper {
* Map the specified URI.
* @throws IOException
*/
+ @SuppressWarnings("deprecation") // contextPath
private final void internalMap(CharChunk host, CharChunk uri,
String version, MappingData mappingData) throws IOException {
@@ -1064,6 +1065,7 @@ public final class Mapper {
/**
* Exact mapping.
*/
+ @SuppressWarnings("deprecation") // contextPath
private final void internalMapExactWrapper
(MappedWrapper[] wrappers, CharChunk path, MappingData mappingData) {
MappedWrapper wrapper = exactFind(wrappers, path);
diff --git a/java/org/apache/catalina/mapper/MappingData.java b/java/org/apache/catalina/mapper/MappingData.java
index c95c4c2..3a02537 100644
--- a/java/org/apache/catalina/mapper/MappingData.java
+++ b/java/org/apache/catalina/mapper/MappingData.java
@@ -38,6 +38,10 @@ public class MappingData {
public Wrapper wrapper = null;
public boolean jspWildCard = false;
+ /**
+ * @deprecated Unused. This will be removed in Tomcat 10.
+ */
+ @Deprecated
public final MessageBytes contextPath = MessageBytes.newInstance();
public final MessageBytes requestPath = MessageBytes.newInstance();
public final MessageBytes wrapperPath = MessageBytes.newInstance();
diff --git a/test/org/apache/catalina/mapper/TestMapper.java b/test/org/apache/catalina/mapper/TestMapper.java
index f155f10..23a08d1 100644
--- a/test/org/apache/catalina/mapper/TestMapper.java
+++ b/test/org/apache/catalina/mapper/TestMapper.java
@@ -241,6 +241,7 @@ public class TestMapper extends LoggingBaseTest {
}
@Test
+ @SuppressWarnings("deprecation") // contextPath
public void testMap() throws Exception {
MappingData mappingData = new MappingData();
MessageBytes host = MessageBytes.newInstance();
@@ -492,6 +493,7 @@ public class TestMapper extends LoggingBaseTest {
}
@Test
+ @SuppressWarnings("deprecation") // contextPath
public void testContextListConcurrencyBug56653() throws Exception {
final Host host = createHost("localhost");
final Context contextRoot = createContext("ROOT");
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3d4d2df..b9b61b5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org