This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f57e3f7615dc5b3dafd3cddc70b373b321c86368 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Apr 3 16:50:58 2020 +0100 Refactoring: Extract inner class --- .../apache/catalina/core/ApplicationMapping.java | 51 +++------------------- .../catalina/core/ApplicationMappingImpl.java | 39 +++++++++++++++++ 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/java/org/apache/catalina/core/ApplicationMapping.java b/java/org/apache/catalina/core/ApplicationMapping.java index 4d28f7a..9e528b3 100644 --- a/java/org/apache/catalina/core/ApplicationMapping.java +++ b/java/org/apache/catalina/core/ApplicationMapping.java @@ -18,7 +18,6 @@ package org.apache.catalina.core; import org.apache.catalina.mapper.MappingData; import org.apache.catalina.servlet4preview.http.HttpServletMapping; -import org.apache.catalina.servlet4preview.http.MappingMatch; public class ApplicationMapping { @@ -36,7 +35,7 @@ public class ApplicationMapping { // This can happen when dispatching from an application provided // request object that does not provide the Servlet 4.0 mapping // data. - mapping = new MappingImpl("", "", null, ""); + mapping = new ApplicationMappingImpl("", "", null, ""); } else { String servletName; if (mappingData.wrapper == null) { @@ -45,23 +44,23 @@ public class ApplicationMapping { servletName = mappingData.wrapper.getName(); } if (mappingData.matchType == null) { - mapping = new MappingImpl("", "", null, servletName); + mapping = new ApplicationMappingImpl("", "", null, servletName); } else { switch (mappingData.matchType) { case CONTEXT_ROOT: - mapping = new MappingImpl("", "", mappingData.matchType, servletName); + mapping = new ApplicationMappingImpl("", "", mappingData.matchType, servletName); break; case DEFAULT: - mapping = new MappingImpl("", "/", mappingData.matchType, servletName); + mapping = new ApplicationMappingImpl("", "/", mappingData.matchType, servletName); break; case EXACT: - mapping = new MappingImpl(mappingData.wrapperPath.toString().substring(1), + mapping = new ApplicationMappingImpl(mappingData.wrapperPath.toString().substring(1), mappingData.wrapperPath.toString(), mappingData.matchType, servletName); break; case EXTENSION: String path = mappingData.wrapperPath.toString(); int extIndex = path.lastIndexOf('.'); - mapping = new MappingImpl(path.substring(1, extIndex), + mapping = new ApplicationMappingImpl(path.substring(1, extIndex), "*" + path.substring(extIndex), mappingData.matchType, servletName); break; case PATH: @@ -71,7 +70,7 @@ public class ApplicationMapping { } else { matchValue = mappingData.pathInfo.toString().substring(1); } - mapping = new MappingImpl(matchValue, mappingData.wrapperPath.toString() + "/*", + mapping = new ApplicationMappingImpl(matchValue, mappingData.wrapperPath.toString() + "/*", mappingData.matchType, servletName); break; } @@ -85,40 +84,4 @@ public class ApplicationMapping { public void recycle() { mapping = null; } - - private static class MappingImpl implements HttpServletMapping { - - private final String matchValue; - private final String pattern; - private final MappingMatch mappingType; - private final String servletName; - - public MappingImpl(String matchValue, String pattern, MappingMatch mappingType, - String servletName) { - this.matchValue = matchValue; - this.pattern = pattern; - this.mappingType = mappingType; - this.servletName = servletName; - } - - @Override - public String getMatchValue() { - return matchValue; - } - - @Override - public String getPattern() { - return pattern; - } - - @Override - public MappingMatch getMappingMatch() { - return mappingType; - } - - @Override - public String getServletName() { - return servletName; - } - } } diff --git a/java/org/apache/catalina/core/ApplicationMappingImpl.java b/java/org/apache/catalina/core/ApplicationMappingImpl.java new file mode 100644 index 0000000..e8d21c6 --- /dev/null +++ b/java/org/apache/catalina/core/ApplicationMappingImpl.java @@ -0,0 +1,39 @@ +package org.apache.catalina.core; + +import org.apache.catalina.servlet4preview.http.HttpServletMapping; +import org.apache.catalina.servlet4preview.http.MappingMatch; + +public class ApplicationMappingImpl implements HttpServletMapping { + + private final String matchValue; + private final String pattern; + private final MappingMatch mappingType; + private final String servletName; + + public ApplicationMappingImpl(String matchValue, String pattern, MappingMatch mappingType, String servletName) { + this.matchValue = matchValue; + this.pattern = pattern; + this.mappingType = mappingType; + this.servletName = servletName; + } + + @Override + public String getMatchValue() { + return matchValue; + } + + @Override + public String getPattern() { + return pattern; + } + + @Override + public MappingMatch getMappingMatch() { + return mappingType; + } + + @Override + public String getServletName() { + return servletName; + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org