Merge branch '5.8.x'
This commit is contained in:
		
						commit
						d6302aabbc
					
				| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
/*
 | 
			
		||||
 * Copyright 2002-2021 the original author or authors.
 | 
			
		||||
 * Copyright 2002-2022 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.
 | 
			
		||||
| 
						 | 
				
			
			@ -155,13 +155,21 @@ public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>>
 | 
			
		|||
			setApplicationContext(context);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		/**
 | 
			
		||||
		 * @deprecated use {@link #requestMatchers(HttpMethod, String...)} instead
 | 
			
		||||
		 */
 | 
			
		||||
		@Override
 | 
			
		||||
		@Deprecated
 | 
			
		||||
		public MvcMatchersRequiresChannelUrl mvcMatchers(HttpMethod method, String... mvcPatterns) {
 | 
			
		||||
			List<MvcRequestMatcher> mvcMatchers = createMvcMatchers(method, mvcPatterns);
 | 
			
		||||
			return new MvcMatchersRequiresChannelUrl(mvcMatchers);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		/**
 | 
			
		||||
		 * @deprecated use {@link #requestMatchers(String...)} instead
 | 
			
		||||
		 */
 | 
			
		||||
		@Override
 | 
			
		||||
		@Deprecated
 | 
			
		||||
		public MvcMatchersRequiresChannelUrl mvcMatchers(String... patterns) {
 | 
			
		||||
			return mvcMatchers(null, patterns);
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -222,12 +222,20 @@ public final class ExpressionUrlAuthorizationConfigurer<H extends HttpSecurityBu
 | 
			
		|||
			setApplicationContext(context);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		/**
 | 
			
		||||
		 * @deprecated use {@link #requestMatchers(HttpMethod, String...)} instead
 | 
			
		||||
		 */
 | 
			
		||||
		@Override
 | 
			
		||||
		@Deprecated
 | 
			
		||||
		public MvcMatchersAuthorizedUrl mvcMatchers(HttpMethod method, String... mvcPatterns) {
 | 
			
		||||
			return new MvcMatchersAuthorizedUrl(createMvcMatchers(method, mvcPatterns));
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		/**
 | 
			
		||||
		 * @deprecated use {@link #requestMatchers(String...)} instead
 | 
			
		||||
		 */
 | 
			
		||||
		@Override
 | 
			
		||||
		@Deprecated
 | 
			
		||||
		public MvcMatchersAuthorizedUrl mvcMatchers(String... patterns) {
 | 
			
		||||
			return mvcMatchers(null, patterns);
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -202,12 +202,20 @@ public final class UrlAuthorizationConfigurer<H extends HttpSecurityBuilder<H>>
 | 
			
		|||
			setApplicationContext(context);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		/**
 | 
			
		||||
		 * @deprecated use {@link #requestMatchers(HttpMethod, String...)} instead
 | 
			
		||||
		 */
 | 
			
		||||
		@Override
 | 
			
		||||
		@Deprecated
 | 
			
		||||
		public MvcMatchersAuthorizedUrl mvcMatchers(HttpMethod method, String... mvcPatterns) {
 | 
			
		||||
			return new MvcMatchersAuthorizedUrl(createMvcMatchers(method, mvcPatterns));
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		/**
 | 
			
		||||
		 * @deprecated use {@link #requestMatchers(String...)} instead
 | 
			
		||||
		 */
 | 
			
		||||
		@Override
 | 
			
		||||
		@Deprecated
 | 
			
		||||
		public MvcMatchersAuthorizedUrl mvcMatchers(String... patterns) {
 | 
			
		||||
			return mvcMatchers(null, patterns);
 | 
			
		||||
		}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue