Browse Source

Polishing

pull/33582/head
Sam Brannen 1 year ago
parent
commit
7d99790c34
  1. 7
      spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java
  2. 2
      spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideBeanFactoryPostProcessor.java
  3. 2
      spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanWithResetIntegrationTests.java

7
spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* 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.
@ -22,7 +22,8 @@ import org.springframework.util.ObjectUtils; @@ -22,7 +22,8 @@ import org.springframework.util.ObjectUtils;
/**
* Holder for a key-value style attribute that is part of a bean definition.
* Keeps track of the definition source in addition to the key-value pair.
*
* <p>Keeps track of the definition source in addition to the key-value pair.
*
* @author Juergen Hoeller
* @since 2.5
@ -39,7 +40,7 @@ public class BeanMetadataAttribute implements BeanMetadataElement { @@ -39,7 +40,7 @@ public class BeanMetadataAttribute implements BeanMetadataElement {
/**
* Create a new AttributeValue instance.
* Create a new {@code AttributeValue} instance.
* @param name the name of the attribute (never {@code null})
* @param value the value of the attribute (possibly before type conversion)
*/

2
spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideBeanFactoryPostProcessor.java

@ -53,7 +53,7 @@ import org.springframework.util.StringUtils; @@ -53,7 +53,7 @@ import org.springframework.util.StringUtils;
* of the test class.
*
* <p>This processor does not work against a particular test class, it only prepares
* the bean factory for the identified, unique, set of bean overrides.
* the bean factory for the identified, unique set of bean overrides.
*
* @author Simon Baslé
* @author Stephane Nicoll

2
spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanWithResetIntegrationTests.java

@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test; @@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -110,7 +109,6 @@ public class MockitoBeanWithResetIntegrationTests { @@ -110,7 +109,6 @@ public class MockitoBeanWithResetIntegrationTests {
}
@Bean("factory")
@Qualifier("factory")
FailingExampleServiceFactory factory() {
return new FailingExampleServiceFactory();
}

Loading…
Cancel
Save