Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AllNestedConditions.java

@@ -28,16 +28,24 @@ import org.springframework.context.annotation.Condition;
  * <pre class="code">
  * static class OnJndiAndProperty extends AllNestedConditions {
  *
+ *    OnJndiAndProperty() {
+ *        super(ConfigurationPhase.PARSE_CONFIGURATION);
+ *    }
+ *
  *    &#064;ConditionalOnJndi()
  *    static class OnJndi {
  *    }
-
+ *
  *    &#064;ConditionalOnProperty("something")
  *    static class OnProperty {
  *    }
  *
  * }
  * </pre>
+ * <p>
+ * The {@link ConfigurationPhase} should be specified according to the conditions that
+ * are defined. In the example above, all conditions are static and can be evaluated
+ * early so {@code PARSE_CONFIGURATION} is a right fit.
  *
  * @author Phillip Webb
  * @since 1.3.0

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AnyNestedCondition.java

@@ -30,16 +30,24 @@ import org.springframework.core.annotation.Order;
  * <pre class="code">
  * static class OnJndiOrProperty extends AnyNestedCondition {
  *
+ *    OnJndiOrProperty() {
+ *        super(ConfigurationPhase.PARSE_CONFIGURATION);
+ *    }
+ *
  *    &#064;ConditionalOnJndi()
  *    static class OnJndi {
  *    }
-
+ *
  *    &#064;ConditionalOnProperty("something")
  *    static class OnProperty {
  *    }
  *
  * }
  * </pre>
+ * <p>
+ * The {@link ConfigurationPhase} should be specified according to the conditions that
+ * are defined. In the example above, all conditions are static and can be evaluated
+ * early so {@code PARSE_CONFIGURATION} is a right fit.
  *
  * @author Phillip Webb
  * @since 1.2.0

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java

@@ -28,16 +28,24 @@ import org.springframework.context.annotation.Condition;
  * <pre class="code">
  * static class OnNeitherJndiNorProperty extends NoneOfNestedConditions {
  *
+ *    OnNeitherJndiNorProperty() {
+ *        super(ConfigurationPhase.PARSE_CONFIGURATION);
+ *    }
+ *
  *    &#064;ConditionalOnJndi()
  *    static class OnJndi {
  *    }
-
+ *
  *    &#064;ConditionalOnProperty("something")
  *    static class OnProperty {
  *    }
  *
  * }
  * </pre>
+ * <p>
+ * The {@link ConfigurationPhase} should be specified according to the conditions that
+ * are defined. In the example above, all conditions are static and can be evaluated
+ * early so {@code PARSE_CONFIGURATION} is a right fit.
  *
  * @author Phillip Webb
  * @since 1.3.0