Closes gh-9827
pull/9730/merge
Johnny Lim 7 years ago committed by Andy Wilkinson
parent 18cfd9d3dd
commit bd27d147d7

@ -1,7 +1,7 @@
= Getting support for Spring Boot = Getting support for Spring Boot
== GitHub issues == GitHub issues
We choose not use GitHub issues for general usage questions and support, prefering to We choose not use GitHub issues for general usage questions and support, preferring to
use issues solely for the tracking of bugs and enhancements. If you have a general use issues solely for the tracking of bugs and enhancements. If you have a general
usage question please do not open a GitHub issue, but use one of the other channels usage question please do not open a GitHub issue, but use one of the other channels
described below. described below.
@ -24,4 +24,4 @@ https://gitter.im/spring-projects/spring-boot[#spring-boot room on Gitter].
== Pivotal Open Source Software Support == Pivotal Open Source Software Support
If you are interested in more dedicated support, Pivotal provides If you are interested in more dedicated support, Pivotal provides
https://pivotal.io/support/oss[premium support] for Spring Boot. https://pivotal.io/support/oss[premium support] for Spring Boot.

@ -31,7 +31,7 @@ import org.springframework.util.ClassUtils;
/** /**
* {@link Configurations} representing auto-configuration {@code @Configuration} classes. * {@link Configurations} representing auto-configuration {@code @Configuration} classes.
* *
* @author Philip Webb * @author Phillip Webb
* @since 2.0.0 * @since 2.0.0
*/ */
public class AutoConfigurations extends Configurations implements Ordered { public class AutoConfigurations extends Configurations implements Ordered {

@ -670,7 +670,7 @@ public class KafkaProperties {
SINGLE, SINGLE,
/** /**
* Invokes the endpoint with a batch of ConsumerRecord. * Invokes the endpoint with a batch of ConsumerRecords.
*/ */
BATCH; BATCH;

@ -55,7 +55,7 @@ import org.springframework.util.ReflectionUtils;
* <pre class="code"> * <pre class="code">
* &#064;Test * &#064;Test
* public someTest() { * public someTest() {
* this.contex.withPropertyValues("spring.foo=biz").run((loaded) -&gt; { * this.context.withPropertyValues("spring.foo=biz").run((loaded) -&gt; {
* assertThat(loaded).containsSingleBean(MyBean.class); * assertThat(loaded).containsSingleBean(MyBean.class);
* // other assertions * // other assertions
* }); * });
@ -73,8 +73,8 @@ import org.springframework.util.ReflectionUtils;
* further checks are required on the cause of the failure: <pre class="code"> * further checks are required on the cause of the failure: <pre class="code">
* &#064;Test * &#064;Test
* public someTest() { * public someTest() {
* this.contex.withPropertyValues("spring.foo=fails").run((loaded) -&gt; { * this.context.withPropertyValues("spring.foo=fails").run((loaded) -&gt; {
* assertThat(loaded).getFailure().hasCauseInstanceOf(BadPropertyExcepton.class); * assertThat(loaded).getFailure().hasCauseInstanceOf(BadPropertyException.class);
* // other assertions * // other assertions
* }); * });
* }</pre> * }</pre>

@ -64,7 +64,7 @@ public class AssertProviderApplicationContextTests {
} }
@Test @Test
public void getWhenTypeIsNullShouldThrowExecption() throws Exception { public void getWhenTypeIsNullShouldThrowException() throws Exception {
this.thrown.expect(IllegalArgumentException.class); this.thrown.expect(IllegalArgumentException.class);
this.thrown.expectMessage("Type must not be null"); this.thrown.expectMessage("Type must not be null");
AssertProviderApplicationContext.get(null, ApplicationContext.class, AssertProviderApplicationContext.get(null, ApplicationContext.class,

@ -98,7 +98,7 @@ public abstract class Configurations {
protected abstract Configurations merge(Set<Class<?>> mergedClasses); protected abstract Configurations merge(Set<Class<?>> mergedClasses);
/** /**
* Return the classes from all the specified configurations in the oder that they * Return the classes from all the specified configurations in the order that they
* would be registered. * would be registered.
* @param configurations the source configuration * @param configurations the source configuration
* @return configuration classes in registration order * @return configuration classes in registration order
@ -108,7 +108,7 @@ public abstract class Configurations {
} }
/** /**
* Return the classes from all the specified configurations in the oder that they * Return the classes from all the specified configurations in the order that they
* would be registered. * would be registered.
* @param configurations the source configuration * @param configurations the source configuration
* @return configuration classes in registration order * @return configuration classes in registration order

Loading…
Cancel
Save