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
94468e58
Commit
94468e58
authored
Aug 01, 2018
by
Johnny Lim
Committed by
Stephane Nicoll
Aug 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
See gh-13963
parent
4e45f36b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
EhCache2CacheAutoConfigurationTests.java
...oconfigure/cache/EhCache2CacheAutoConfigurationTests.java
+1
-1
EhCache3CacheAutoConfigurationTests.java
...oconfigure/cache/EhCache3CacheAutoConfigurationTests.java
+1
-1
getting-started.adoc
...t/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+1
-1
CollectionToDelimitedStringConverter.java
...rk/boot/convert/CollectionToDelimitedStringConverter.java
+2
-2
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache2CacheAutoConfigurationTests.java
View file @
94468e58
...
@@ -31,7 +31,7 @@ import org.springframework.cache.ehcache.EhCacheCacheManager;
...
@@ -31,7 +31,7 @@ import org.springframework.cache.ehcache.EhCacheCacheManager;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
/**
* Tests for {@link CacheAutoConfiguration
Tests
} with EhCache 2.
* Tests for {@link CacheAutoConfiguration} with EhCache 2.
*
*
* @author Stephane Nicoll
* @author Stephane Nicoll
* @author Andy Wilkinson
* @author Andy Wilkinson
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/EhCache3CacheAutoConfigurationTests.java
View file @
94468e58
...
@@ -30,7 +30,7 @@ import org.springframework.core.io.Resource;
...
@@ -30,7 +30,7 @@ import org.springframework.core.io.Resource;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
/**
* Tests for {@link CacheAutoConfiguration
Tests
} with EhCache 3.
* Tests for {@link CacheAutoConfiguration} with EhCache 3.
*
*
* @author Stephane Nicoll
* @author Stephane Nicoll
* @author Andy Wilkinson
* @author Andy Wilkinson
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
View file @
94468e58
...
@@ -465,7 +465,7 @@ feature, add the following dependency to your project:
...
@@ -465,7 +465,7 @@ feature, add the following dependency to your project:
</dependency>
</dependency>
----
----
WARNING:
p
roperties that are added late to the environment, such as when using
WARNING:
P
roperties that are added late to the environment, such as when using
`@PropertySource`, will not be taken into account.
`@PropertySource`, will not be taken into account.
NOTE: Once you're done with the migration, please make sure to remove this module from
NOTE: Once you're done with the migration, please make sure to remove this module from
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CollectionToDelimitedStringConverter.java
View file @
94468e58
...
@@ -73,10 +73,10 @@ final class CollectionToDelimitedStringConverter implements ConditionalGenericCo
...
@@ -73,10 +73,10 @@ final class CollectionToDelimitedStringConverter implements ConditionalGenericCo
}
}
return
source
.
stream
()
return
source
.
stream
()
.
map
((
element
)
->
convertElement
(
element
,
sourceType
,
targetType
))
.
map
((
element
)
->
convertElement
(
element
,
sourceType
,
targetType
))
.
collect
(
Collectors
.
joining
(
getDelimter
(
sourceType
)));
.
collect
(
Collectors
.
joining
(
getDelim
i
ter
(
sourceType
)));
}
}
private
CharSequence
getDelimter
(
TypeDescriptor
sourceType
)
{
private
CharSequence
getDelim
i
ter
(
TypeDescriptor
sourceType
)
{
Delimiter
annotation
=
sourceType
.
getAnnotation
(
Delimiter
.
class
);
Delimiter
annotation
=
sourceType
.
getAnnotation
(
Delimiter
.
class
);
return
(
annotation
!=
null
)
?
annotation
.
value
()
:
","
;
return
(
annotation
!=
null
)
?
annotation
.
value
()
:
","
;
}
}
...
...
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