From c8b3cea2003fde972f202fc18d402eff3eef65a5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 10 May 2018 15:45:16 +0100 Subject: [PATCH] Clarify that registration bean URL patterns use Servlet spec format Closes gh-13080 --- .../boot/web/servlet/AbstractFilterRegistrationBean.java | 9 +++++---- .../boot/web/servlet/ServletRegistrationBean.java | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java index 563e2468b9cb..9abb58a96f47 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -157,8 +157,8 @@ public void setUrlPatterns(Collection urlPatterns) { } /** - * Return a mutable collection of URL patterns that the filter will be registered - * against. + * Return a mutable collection of URL patterns, as defined in the Servlet + * specification, that the filter will be registered against. * @return the URL patterns */ public Collection getUrlPatterns() { @@ -166,7 +166,8 @@ public Collection getUrlPatterns() { } /** - * Add URL patterns that the filter will be registered against. + * Add URL patterns, as defined in the Servlet specification, that the filter will be + * registered against. * @param urlPatterns the URL patterns */ public void addUrlPatterns(String... urlPatterns) { diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java index 4da9bcceeca4..840d4e0ae215 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,7 +128,8 @@ public void setUrlMappings(Collection urlMappings) { } /** - * Return a mutable collection of the URL mappings for the servlet. + * Return a mutable collection of the URL mappings, as defined in the Servlet + * specification, for the servlet. * @return the urlMappings */ public Collection getUrlMappings() { @@ -136,7 +137,7 @@ public Collection getUrlMappings() { } /** - * Add URL mappings for the servlet. + * Add URL mappings, as defined in the Servlet specification, for the servlet. * @param urlMappings the mappings to add * @see #setUrlMappings(Collection) */