root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #11171 from izeye:assertion-location 

* pr/11171:
  Fix assertion locations
This commit is contained in:
Stephane Nicoll 2017-11-28 09:45:19 +01:00
parent 92d7395110 decf2dc1b7
commit fc503870bf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/AnnotationConfigReactiveWebServerApplicationContext.java
View File

@ -171,9 +171,9 @@ public class AnnotationConfigReactiveWebServerApplicationContext
* @see #refresh() * @see #refresh()
*/ */
public final void register(Class<?>... annotatedClasses) { public final void register(Class<?>... annotatedClasses) {
this.annotatedClasses = annotatedClasses;
Assert.notEmpty(annotatedClasses, Assert.notEmpty(annotatedClasses,
"At least one annotated class must be specified"); "At least one annotated class must be specified");
this.annotatedClasses = annotatedClasses;
} }
/** /**
@ -184,8 +184,8 @@ public class AnnotationConfigReactiveWebServerApplicationContext
* @see #refresh() * @see #refresh()
*/ */
public final void scan(String... basePackages) { public final void scan(String... basePackages) {
this.basePackages = basePackages;
Assert.notEmpty(basePackages, "At least one base package must be specified"); Assert.notEmpty(basePackages, "At least one base package must be specified");
this.basePackages = basePackages;
} }
@Override @Override

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/AnnotationConfigServletWebServerApplicationContext.java
View File

@ -169,9 +169,9 @@ public class AnnotationConfigServletWebServerApplicationContext
* @see #refresh() * @see #refresh()
*/ */
public final void register(Class<?>... annotatedClasses) { public final void register(Class<?>... annotatedClasses) {
this.annotatedClasses = annotatedClasses;
Assert.notEmpty(annotatedClasses, Assert.notEmpty(annotatedClasses,
"At least one annotated class must be specified"); "At least one annotated class must be specified");
this.annotatedClasses = annotatedClasses;
} }
/** /**
@ -182,8 +182,8 @@ public class AnnotationConfigServletWebServerApplicationContext
* @see #refresh() * @see #refresh()
*/ */
public final void scan(String... basePackages) { public final void scan(String... basePackages) {
this.basePackages = basePackages;
Assert.notEmpty(basePackages, "At least one base package must be specified"); Assert.notEmpty(basePackages, "At least one base package must be specified");
this.basePackages = basePackages;
} }
@Override @Override