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
bc81d0a0
Commit
bc81d0a0
authored
Jun 27, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9610 from izeye:polish-20170627
* pr/9610: Polish
parents
74a71b01
533c418a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
JpaBatchConfigurer.java
...ramework/boot/autoconfigure/batch/JpaBatchConfigurer.java
+1
-1
OnClassCondition.java
...mework/boot/autoconfigure/condition/OnClassCondition.java
+1
-1
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+1
-1
SpringApplicationAdminMXBean.java
...ingframework/boot/admin/SpringApplicationAdminMXBean.java
+1
-1
MapBinder.java
...ringframework/boot/context/properties/bind/MapBinder.java
+1
-1
ConfigurationPropertyName.java
.../context/properties/source/ConfigurationPropertyName.java
+3
-3
ConfigurationPropertySources.java
...ntext/properties/source/ConfigurationPropertySources.java
+2
-2
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JpaBatchConfigurer.java
View file @
bc81d0a0
...
...
@@ -41,9 +41,9 @@ public class JpaBatchConfigurer extends BasicBatchConfigurer {
* Create a new {@link BasicBatchConfigurer} instance.
* @param properties the batch properties
* @param dataSource the underlying data source
* @param entityManagerFactory the entity manager factory (or {@code null})
* @param transactionManagerCustomizers transaction manager customizers (or
* {@code null})
* @param entityManagerFactory the entity manager factory (or {@code null})
*/
protected
JpaBatchConfigurer
(
BatchProperties
properties
,
DataSource
dataSource
,
TransactionManagerCustomizers
transactionManagerCustomizers
,
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
View file @
bc81d0a0
...
...
@@ -306,7 +306,7 @@ class OnClassCondition extends SpringBootCondition
this
.
autoConfigurationMetadata
);
}
private
ConditionOutcome
[]
getOutcomes
(
final
String
[]
autoConfigurationClasses
,
private
ConditionOutcome
[]
getOutcomes
(
String
[]
autoConfigurationClasses
,
int
start
,
int
end
,
AutoConfigurationMetadata
autoConfigurationMetadata
)
{
ConditionOutcome
[]
outcomes
=
new
ConditionOutcome
[
end
-
start
];
for
(
int
i
=
start
;
i
<
end
;
i
++)
{
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
bc81d0a0
...
...
@@ -5434,7 +5434,7 @@ configuration is usually found.
If you want to customize the primary configuration, you can use a nested
`@TestConfiguration` class. Unlike a nested `@Configuration` class which would be used
instead of
a
your application's primary configuration, a nested `@TestConfiguration` class
instead of your application's primary configuration, a nested `@TestConfiguration` class
will be used in addition to your application's primary configuration.
NOTE: Spring's test framework will cache application contexts between tests. Therefore, as
...
...
spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java
View file @
bc81d0a0
...
...
@@ -17,7 +17,7 @@
package
org
.
springframework
.
boot
.
admin
;
/**
* A MBean contract to control and monitor a running {@code SpringApplication} via JMX.
* A
n
MBean contract to control and monitor a running {@code SpringApplication} via JMX.
* Intended for internal use only.
*
* @author Stephane Nicoll
...
...
spring-boot/src/main/java/org/springframework/boot/context/properties/bind/MapBinder.java
View file @
bc81d0a0
...
...
@@ -134,7 +134,7 @@ class MapBinder extends AggregateBinder<Map<Object, Object>> {
int
start
=
this
.
root
.
getNumberOfElements
()
+
1
;
int
size
=
name
.
getNumberOfElements
();
for
(
int
i
=
start
;
i
<
size
;
i
++)
{
if
(
name
.
I
sNumericIndex
(
i
))
{
if
(
name
.
i
sNumericIndex
(
i
))
{
return
name
.
chop
(
i
);
}
}
...
...
spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
View file @
bc81d0a0
...
...
@@ -95,7 +95,7 @@ public final class ConfigurationPropertyName
}
/**
* Return if the
an
element in the name is indexed.
* Return if the element in the name is indexed.
* @param elementIndex the index of the element
* @return {@code true} if the element is indexed
*/
...
...
@@ -104,11 +104,11 @@ public final class ConfigurationPropertyName
}
/**
* Return if the
an
element in the name is indexed and numeric.
* Return if the element in the name is indexed and numeric.
* @param elementIndex the index of the element
* @return {@code true} if the element is indexed and numeric
*/
public
boolean
I
sNumericIndex
(
int
elementIndex
)
{
public
boolean
i
sNumericIndex
(
int
elementIndex
)
{
return
isIndexed
(
elementIndex
)
&&
isNumeric
(
getElement
(
elementIndex
,
Form
.
ORIGINAL
));
}
...
...
spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java
View file @
bc81d0a0
...
...
@@ -109,7 +109,7 @@ public final class ConfigurationPropertySources {
* {@link StubPropertySource stub property sources}. Updates to the underlying source
* will be automatically tracked.
* @param sources the Spring property sources to adapt
* @return an {@link Iterable} containing
a single
newly adapted
* @return an {@link Iterable} containing newly adapted
* {@link SpringConfigurationPropertySource} instances
*/
public
static
Iterable
<
ConfigurationPropertySource
>
from
(
...
...
@@ -124,7 +124,7 @@ public final class ConfigurationPropertySources {
* This method will flatten any nested property sources and will filter all
* {@link StubPropertySource stub property sources}.
* @param sources the Spring property sources to adapt
* @return an {@link Iterable} containing
a single
newly adapted
* @return an {@link Iterable} containing newly adapted
* {@link SpringConfigurationPropertySource} instances
*/
public
static
Iterable
<
ConfigurationPropertySource
>
from
(
...
...
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