* - {@link Class} - A Java class to be loaded by {@link AnnotatedBeanDefinitionReader}
*
diff --git a/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java b/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
index 5f8f425749..6ba21b4c84 100644
--- a/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
@@ -405,7 +405,7 @@ public class SpringApplicationBuilder {
/**
* Default properties for the environment. Multiple calls to this method are
* cumulative.
- * @param defaults
+ * @param defaults the default properties
* @return the current builder
* @see SpringApplicationBuilder#properties(String...)
*/
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java
index 319d990499..e748511346 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/ContextIdApplicationContextInitializer.java
@@ -68,7 +68,8 @@ public class ContextIdApplicationContextInitializer implements
}
/**
- * @param name
+ * Create a new {@link ContextIdApplicationContextInitializer} instance.
+ * @param name the name of the application (can include placeholders)
*/
public ContextIdApplicationContextInitializer(String name) {
this.name = name;
@@ -91,7 +92,6 @@ public class ContextIdApplicationContextInitializer implements
private String getApplicationId(ConfigurableEnvironment environment) {
String name = environment.resolvePlaceholders(this.name);
String index = environment.resolvePlaceholders(INDEX_PATTERN);
-
String profiles = StringUtils.arrayToCommaDelimitedString(environment
.getActiveProfiles());
if (StringUtils.hasText(profiles)) {
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
index 8ce9f32c8f..25f83e8227 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
@@ -114,28 +114,32 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
}
/**
- * @param propertySources
+ * Set the property sources to bind.
+ * @param propertySources the property sources
*/
public void setPropertySources(PropertySources propertySources) {
this.propertySources = propertySources;
}
/**
- * @param validator the validator to set
+ * Set the bean validator used to validate property fields.
+ * @param validator the validator
*/
public void setValidator(Validator validator) {
this.validator = validator;
}
/**
- * @param conversionService the conversionService to set
+ * Set the conversion service used to convert property values.
+ * @param conversionService the conversion service
*/
public void setConversionService(ConversionService conversionService) {
this.conversionService = conversionService;
}
/**
- * @param beans the bean meta data to set
+ * Set the bean meta-data store.
+ * @param beans the bean meta data store
*/
public void setBeanMetaDataStore(ConfigurationBeanFactoryMetaData beans) {
this.beans = beans;
@@ -163,11 +167,9 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
@Override
public void afterPropertiesSet() throws Exception {
-
if (this.propertySources == null) {
this.propertySources = deducePropertySources();
}
-
if (this.validator == null) {
this.validator = getOptionalBean(VALIDATOR_BEAN_NAME, Validator.class);
if (this.validator == null && isJsr303Present()) {
@@ -176,7 +178,6 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
this.ownedValidator = true;
}
}
-
if (this.conversionService == null) {
this.conversionService = getOptionalBean(
ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME,
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java
index 15f1ab685f..e51433e18f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationProperties.java
@@ -42,6 +42,7 @@ public @interface EnableConfigurationProperties {
/**
* Convenient way to quickly register {@link ConfigurationProperties} beans with
* Spring. Standard Spring Beans will also be scanned regardless of this value.
+ * @return {@link ConfigurationProperties} beans to register
*/
Class[] value() default {};
diff --git a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java
index aa2b5d21f4..f453a8a515 100644
--- a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourceLoader.java
@@ -45,7 +45,7 @@ public interface PropertySourceLoader {
* used to load multi-document files (such as YAML). Simple property formats should
* {@code null} when asked to load a profile.
* @return a property source or {@code null}
- * @throws IOException
+ * @throws IOException if the source cannot be loaded
*/
PropertySource load(String name, Resource resource, String profile)
throws IOException;
diff --git a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
index c3942851cf..3abfeeff91 100644
--- a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
@@ -69,7 +69,7 @@ public class PropertySourcesLoader {
* Load the specified resource (if possible) and add it as the first source.
* @param resource the source resource (may be {@code null}).
* @return the loaded property source or {@code null}
- * @throws IOException
+ * @throws IOException if the source cannot be loaded
*/
public PropertySource load(Resource resource) throws IOException {
return load(resource, null);
@@ -81,7 +81,7 @@ public class PropertySourcesLoader {
* @param resource the source resource (may be {@code null}).
* @param profile a specific profile to load or {@code null} to load the default.
* @return the loaded property source or {@code null}
- * @throws IOException
+ * @throws IOException if the source cannot be loaded
*/
public PropertySource load(Resource resource, String profile) throws IOException {
return load(resource, resource.getDescription(), profile);
@@ -94,7 +94,7 @@ public class PropertySourcesLoader {
* @param name the root property name (may be {@code null}).
* @param profile a specific profile to load or {@code null} to load the default.
* @return the loaded property source or {@code null}
- * @throws IOException
+ * @throws IOException if the source cannot be loaded
*/
public PropertySource load(Resource resource, String name, String profile)
throws IOException {
@@ -115,7 +115,7 @@ public class PropertySourcesLoader {
* @param name the root property name (may be {@code null}).
* @param profile a specific profile to load or {@code null} to load the default.
* @return the loaded property source or {@code null}
- * @throws IOException
+ * @throws IOException if the source cannot be loaded
*/
public PropertySource load(Resource resource, String group, String name,
String profile) throws IOException {
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
index 5222846035..aee38163de 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
@@ -118,7 +118,7 @@ public class AtomikosProperties {
/**
* Specifies whether VM shutdown should trigger forced shutdown of the transaction
* core. Defaults to false.
- * @param forceShutdownOnVmExit
+ * @param forceShutdownOnVmExit if VM shutdown should be forced
*/
public void setForceShutdownOnVmExit(boolean forceShutdownOnVmExit) {
set("force_shutdown_on_vm_exit", forceShutdownOnVmExit);
diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityScan.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityScan.java
index 7b179fb309..95f3391658 100644
--- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityScan.java
+++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityScan.java
@@ -53,16 +53,17 @@ public @interface EntityScan {
* Alias for the {@link #basePackages()} attribute. Allows for more concise annotation
* declarations e.g.: {@code @EntityScan("org.my.pkg")} instead of
* {@code @EntityScan(basePackages="org.my.pkg")}.
+ * @return the base packages to scan
*/
String[] value() default {};
/**
- * Base packages to scan for annotated entities.
- *
- * {@link #value()} is an alias for (and mutually exclusive with) this attribute.
+ * Base packages to scan for annotated entities. {@link #value()} is an alias for (and
+ * mutually exclusive with) this attribute.
*
* Use {@link #basePackageClasses()} for a type-safe alternative to String-based
* package names.
+ * @return the base packages to scan
*/
String[] basePackages() default {};
@@ -72,6 +73,7 @@ public @interface EntityScan {
*
* Consider creating a special no-op marker class or interface in each package that
* serves no purpose other than being referenced by this attribute.
+ * @return classes form the base packages to scan
*/
Class[] basePackageClasses() default {};
diff --git a/spring-boot/src/main/java/org/springframework/boot/test/IntegrationTest.java b/spring-boot/src/main/java/org/springframework/boot/test/IntegrationTest.java
index 2a2d14c478..b1726e059b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/test/IntegrationTest.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/IntegrationTest.java
@@ -56,6 +56,7 @@ public @interface IntegrationTest {
/**
* Properties in form {@literal key=value} that should be added to the Spring
* {@link Environment} before the test runs.
+ * @return the environment properties
*/
String[] value() default {};
diff --git a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java
index bfb75784c0..f78addce2d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java
@@ -45,31 +45,37 @@ public @interface SpringApplicationConfiguration {
/**
* @see ContextConfiguration#locations()
+ * @return the context configuration locations
*/
String[] locations() default {};
/**
* @see ContextConfiguration#classes()
+ * @return the context configuration classes
*/
Class[] classes() default {};
/**
* @see ContextConfiguration#initializers()
+ * @return the context configuration initializers
*/
Class>[] initializers() default {};
/**
* @see ContextConfiguration#inheritLocations()
+ * @return if context locations should be inherited
*/
boolean inheritLocations() default true;
/**
* @see ContextConfiguration#inheritInitializers()
+ * @return if context initializers should be inherited
*/
boolean inheritInitializers() default true;
/**
* @see ContextConfiguration#name()
+ * @return if context configuration name
*/
String name() default "";
diff --git a/spring-boot/src/main/java/org/springframework/boot/test/WebIntegrationTest.java b/spring-boot/src/main/java/org/springframework/boot/test/WebIntegrationTest.java
index b1b8ecfcfd..2231079425 100644
--- a/spring-boot/src/main/java/org/springframework/boot/test/WebIntegrationTest.java
+++ b/spring-boot/src/main/java/org/springframework/boot/test/WebIntegrationTest.java
@@ -49,6 +49,7 @@ public @interface WebIntegrationTest {
/**
* Properties in form {@literal key=value} that should be added to the Spring
* {@link Environment} before the test runs.
+ * @return properties to add to the context
*/
String[] value() default {};
@@ -57,6 +58,7 @@ public @interface WebIntegrationTest {
* {@link Environment} property which usually triggers listening on a random port.
* Often used in conjunction with a @Value("${local.server.port}")
* injected field on the test.
+ * @return if a random port should be used
*/
boolean randomPort() default false;