Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
cabb7083
Commit
cabb7083
authored
Jul 21, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9827 from Johnny Lim
* gh-9827: Polish
parents
18cfd9d3
bd27d147
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
SUPPORT.adoc
SUPPORT.adoc
+2
-2
AutoConfigurations.java
...pringframework/boot/autoconfigure/AutoConfigurations.java
+1
-1
KafkaProperties.java
...ngframework/boot/autoconfigure/kafka/KafkaProperties.java
+1
-1
AbstractApplicationContextTester.java
...k/boot/test/context/AbstractApplicationContextTester.java
+3
-3
AssertProviderApplicationContextTests.java
...t/test/context/AssertProviderApplicationContextTests.java
+1
-1
Configurations.java
...ringframework/boot/context/annotation/Configurations.java
+2
-2
No files found.
SUPPORT.adoc
View file @
cabb7083
= Getting support for Spring Boot
== 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, prefer
r
ing to
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
described below.
...
...
@@ -24,4 +24,4 @@ https://gitter.im/spring-projects/spring-boot[#spring-boot room on Gitter].
== Pivotal Open Source Software Support
If you are interested in more dedicated support, Pivotal provides
https://pivotal.io/support/oss[premium support] for Spring Boot.
\ No newline at end of file
https://pivotal.io/support/oss[premium support] for Spring Boot.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java
View file @
cabb7083
...
...
@@ -31,7 +31,7 @@ import org.springframework.util.ClassUtils;
/**
* {@link Configurations} representing auto-configuration {@code @Configuration} classes.
*
* @author Philip Webb
* @author Phil
l
ip Webb
* @since 2.0.0
*/
public
class
AutoConfigurations
extends
Configurations
implements
Ordered
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
View file @
cabb7083
...
...
@@ -670,7 +670,7 @@ public class KafkaProperties {
SINGLE
,
/**
* Invokes the endpoint with a batch of ConsumerRecord.
* Invokes the endpoint with a batch of ConsumerRecord
s
.
*/
BATCH
;
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/context/AbstractApplicationContextTester.java
View file @
cabb7083
...
...
@@ -55,7 +55,7 @@ import org.springframework.util.ReflectionUtils;
* <pre class="code">
* @Test
* public someTest() {
* this.contex.withPropertyValues("spring.foo=biz").run((loaded) -> {
* this.contex
t
.withPropertyValues("spring.foo=biz").run((loaded) -> {
* assertThat(loaded).containsSingleBean(MyBean.class);
* // other assertions
* });
...
...
@@ -73,8 +73,8 @@ import org.springframework.util.ReflectionUtils;
* further checks are required on the cause of the failure: <pre class="code">
* @Test
* public someTest() {
* this.contex.withPropertyValues("spring.foo=fails").run((loaded) -> {
* assertThat(loaded).getFailure().hasCauseInstanceOf(BadPropertyExcepton.class);
* this.contex
t
.withPropertyValues("spring.foo=fails").run((loaded) -> {
* assertThat(loaded).getFailure().hasCauseInstanceOf(BadPropertyExcept
i
on.class);
* // other assertions
* });
* }</pre>
...
...
spring-boot-test/src/test/java/org/springframework/boot/test/context/AssertProviderApplicationContextTests.java
View file @
cabb7083
...
...
@@ -64,7 +64,7 @@ public class AssertProviderApplicationContextTests {
}
@Test
public
void
getWhenTypeIsNullShouldThrowEx
ec
ption
()
throws
Exception
{
public
void
getWhenTypeIsNullShouldThrowEx
ce
ption
()
throws
Exception
{
this
.
thrown
.
expect
(
IllegalArgumentException
.
class
);
this
.
thrown
.
expectMessage
(
"Type must not be null"
);
AssertProviderApplicationContext
.
get
(
null
,
ApplicationContext
.
class
,
...
...
spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java
View file @
cabb7083
...
...
@@ -98,7 +98,7 @@ public abstract class Configurations {
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 o
r
der that they
* would be registered.
* @param configurations the source configuration
* @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 o
r
der that they
* would be registered.
* @param configurations the source configuration
* @return configuration classes in registration order
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment