/*
 * Copyright 2002-2019 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.
 * You may obtain a copy of the License at
 *
 *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.web.servlet.mvc.method.annotation;

import java.util.List;

import org.junit.jupiter.api.Test;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.mock.web.test.MockServletContext;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.context.annotation.RequestScope;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import org.springframework.web.method.ControllerAdviceBean;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;

/**
 * Integration tests for request-scoped {@link ControllerAdvice @ControllerAdvice} beans.
 *
 * @author Sam Brannen
 * @since 5.2.2
 */
class RequestScopedControllerAdviceIntegrationTests {

	@Test // gh-23985
	void loadContextWithRequestScopedControllerAdvice() {
		AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
		context.setServletContext(new MockServletContext());
		context.register(Config.class);

		assertThatCode(context::refresh).doesNotThrowAnyException();

		List<ControllerAdviceBean> adviceBeans = ControllerAdviceBean.findAnnotatedBeans(context);
		assertThat(adviceBeans).size().isEqualTo(1);
		assertThat(adviceBeans.get(0))//
				.returns(RequestScopedControllerAdvice.class, ControllerAdviceBean::getBeanType)//
				.returns(42, ControllerAdviceBean::getOrder);

		context.close();
	}


	@Configuration
	@EnableWebMvc
	static class Config {

		@Bean
		@RequestScope
		RequestScopedControllerAdvice requestScopedControllerAdvice() {
			return new RequestScopedControllerAdvice();
		}
	}

	@ControllerAdvice
	@Order(42)
	static class RequestScopedControllerAdvice implements Ordered {

		@Override
		public int getOrder() {
			return 99;
		}
	}

}

@@ -1605,18 +1605,19 @@
 since 5.
-2.
+1.1
 2%0A */%0Acl

Update @since tag