Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AnnotatedBeanDefinitionReader should respect @Fallback qualifier analogous to @Primary #33533

Merged
merged 1 commit into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
AnnotatedBeanDefinitionReader should respect @fallback qualifier anal…
…ogous to @primary

Also add tests to cover qualifier classes.
  • Loading branch information
quaff committed Sep 18, 2024
commit 1d637a4d146b22e9db95ac9888cb42e6343c3429
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
* @author Chris Beams
* @author Sam Brannen
* @author Phillip Webb
* @author Yanming Zhou
* @since 3.0
* @see AnnotationConfigApplicationContext#register
*/
Expand Down Expand Up @@ -266,6 +267,9 @@ private <T> void doRegisterBean(Class<T> beanClass, @Nullable String name,
if (Primary.class == qualifier) {
abd.setPrimary(true);
}
else if (Fallback.class == qualifier) {
abd.setFallback(true);
}
else if (Lazy.class == qualifier) {
abd.setLazyInit(true);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* Copyright 2002-2024 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.context.annotation;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import org.junit.jupiter.api.Test;

import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.context.support.GenericApplicationContext;

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

/**
* @author Yanming Zhou
*/
class AnnotatedBeanDefinitionReaderTests {

@Test
void registerBeanWithQualifiers() {
GenericApplicationContext context = new GenericApplicationContext();
AnnotatedBeanDefinitionReader reader = new AnnotatedBeanDefinitionReader(context);

reader.registerBean(TestBean.class, "primary", Primary.class);
assertThat(context.getBeanDefinition("primary").isPrimary()).isTrue();

reader.registerBean(TestBean.class, "fallback", Fallback.class);
assertThat(context.getBeanDefinition("fallback").isFallback()).isTrue();

reader.registerBean(TestBean.class, "lazy", Lazy.class);
assertThat(context.getBeanDefinition("lazy").isLazyInit()).isTrue();

reader.registerBean(TestBean.class, "customQualifier", CustomQualifier.class);
assertThat(context.getBeanDefinition("customQualifier"))
.isInstanceOfSatisfying(AbstractBeanDefinition.class, abd ->
assertThat(abd.hasQualifier(CustomQualifier.class.getTypeName())).isTrue());
}

@Lazy(false)
static class TestBean {

}

@Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
@Qualifier
@interface CustomQualifier {

}
}