Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-985 - Remove references to single-argument assertion methods.

Browse Source
This commit is contained in:
Christoph Strobl
2017-01-31 11:31:30 +01:00
committed by Oliver Gierke
parent 49817278b7
commit 3e048a6dca
55 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/springframework/data/config/BeanComponentDefinitionBuilder.java
View File

@@ -43,8 +43,8 @@ public class BeanComponentDefinitionBuilder {
*/
public BeanComponentDefinitionBuilder(Element defaultSource, ParserContext context) {
Assert.notNull(defaultSource);
Assert.notNull(context);
Assert.notNull(defaultSource, "DefaultSource must not be null!");
Assert.notNull(context, "Context must not be null!");
this.defaultSource = defaultSource;
this.context = context;
@@ -58,7 +58,7 @@ public class BeanComponentDefinitionBuilder {
*/
public BeanComponentDefinition getComponent(BeanDefinitionBuilder builder) {
Assert.notNull(builder);
Assert.notNull(builder, "Builder must not be null!");
AbstractBeanDefinition definition = builder.getRawBeanDefinition();
String name = BeanDefinitionReaderUtils.generateBeanName(definition, context.getRegistry(), context.isNested());
@@ -76,7 +76,7 @@ public class BeanComponentDefinitionBuilder {
*/
public BeanComponentDefinition getComponentIdButFallback(BeanDefinitionBuilder builder, String fallback) {
Assert.hasText(fallback);
Assert.hasText(fallback, "Fallback component id must not be null or empty!");
String id = defaultSource.getAttribute("id");
return getComponent(builder, StringUtils.hasText(id) ? id : fallback);
@@ -104,8 +104,8 @@ public class BeanComponentDefinitionBuilder {
*/
public BeanComponentDefinition getComponent(BeanDefinitionBuilder builder, String name, Object rawSource) {
Assert.notNull(builder);
Assert.hasText(name);
Assert.notNull(builder, "Builder must not be null!");
Assert.hasText(name, "Name of bean must not be null or empty!");
AbstractBeanDefinition definition = builder.getRawBeanDefinition();
definition.setSource(context.extractSource(rawSource));