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
885c2889
Commit
885c2889
authored
Feb 08, 2019
by
Johnny Lim
Committed by
Stephane Nicoll
Feb 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-15873
parent
7bdcee5e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
14 deletions
+9
-14
CONTRIBUTING.adoc
CONTRIBUTING.adoc
+1
-1
DynatracePropertiesConfigAdapter.java
...cs/export/dynatrace/DynatracePropertiesConfigAdapter.java
+1
-1
spring-boot-features.adoc
...ing-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+1
-1
SslServerCustomizer.java
...ramework/boot/web/embedded/netty/SslServerCustomizer.java
+1
-3
SslBuilderCustomizer.java
...work/boot/web/embedded/undertow/SslBuilderCustomizer.java
+1
-3
CollectionBinderTests.java
...k/boot/context/properties/bind/CollectionBinderTests.java
+3
-3
SslServerCustomizerTests.java
...ork/boot/web/embedded/jetty/SslServerCustomizerTests.java
+1
-2
No files found.
CONTRIBUTING.adoc
View file @
885c2889
...
...
@@ -181,7 +181,7 @@ work with m2eclipse, we provide an additional Eclipse plugin that you can instal
===== Install the Spring Formatter plugin
* Select "`Help`" -> "`Install New Software`".
* Add `https://dl.bintray.com/spring/javaformat-eclipse/` as a site.
* Install "Spring Java Format"
* Install "Spring Java Format"
.
NOTE: The plugin is optional. Projects can be imported without the plugins, your code
changes just won't be automatically formatted.
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/dynatrace/DynatracePropertiesConfigAdapter.java
View file @
885c2889
...
...
@@ -23,7 +23,7 @@ import org.springframework.boot.actuate.autoconfigure.metrics.export.properties.
/**
* Adapter to convert {@link DynatraceProperties} to a {@link DynatraceConfig}.
*
* @author Andy Wilkinson
*
* @author Andy Wilkinson
*/
class
DynatracePropertiesConfigAdapter
extends
StepRegistryPropertiesConfigAdapter
<
DynatraceProperties
>
...
...
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
885c2889
...
...
@@ -6395,7 +6395,7 @@ configured as it requires an `AsyncTaskExecutor` implementation (named
an `AsyncConfigurer` wrapping your custom `Executor`.
The auto-configured `TaskExecutorBuilder` allows you to easily create instances that
reproduce
s
what the auto-configuration does by default.
reproduce what the auto-configuration does by default.
====
The thread pool uses 8 core threads that can grow and shrink according to the load. Those
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java
View file @
885c2889
...
...
@@ -152,9 +152,7 @@ public class SslServerCustomizer implements NettyServerCustomizer {
if
(
resource
==
null
)
{
return
null
;
}
else
{
return
loadStore
(
type
,
provider
,
resource
,
password
);
}
return
loadStore
(
type
,
provider
,
resource
,
password
);
}
private
KeyStore
loadStore
(
String
type
,
String
provider
,
String
resource
,
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/SslBuilderCustomizer.java
View file @
885c2889
...
...
@@ -182,9 +182,7 @@ class SslBuilderCustomizer implements UndertowBuilderCustomizer {
if
(
resource
==
null
)
{
return
null
;
}
else
{
return
loadStore
(
type
,
provider
,
resource
,
password
);
}
return
loadStore
(
type
,
provider
,
resource
,
password
);
}
private
KeyStore
loadStore
(
String
type
,
String
provider
,
String
resource
,
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/CollectionBinderTests.java
View file @
885c2889
...
...
@@ -450,8 +450,8 @@ public class CollectionBinderTests {
MockConfigurationPropertySource
source
=
new
MockConfigurationPropertySource
();
source
.
put
(
"foo.values[0]"
,
"foo-bar,bar-baz"
);
this
.
sources
.
add
(
source
);
BeanWithEnum
s
etCollection
result
=
this
.
binder
.
bind
(
"foo"
,
Bindable
.
of
(
BeanWithEnum
s
etCollection
.
class
)).
get
();
BeanWithEnum
S
etCollection
result
=
this
.
binder
.
bind
(
"foo"
,
Bindable
.
of
(
BeanWithEnum
S
etCollection
.
class
)).
get
();
assertThat
(
result
.
getValues
().
get
(
0
)).
containsExactly
(
ExampleEnum
.
FOO_BAR
,
ExampleEnum
.
BAR_BAZ
);
}
...
...
@@ -574,7 +574,7 @@ public class CollectionBinderTests {
}
public
static
class
BeanWithEnum
s
etCollection
{
public
static
class
BeanWithEnum
S
etCollection
{
private
List
<
EnumSet
<
ExampleEnum
>>
values
;
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/SslServerCustomizerTests.java
View file @
885c2889
...
...
@@ -82,8 +82,7 @@ public class SslServerCustomizerTests {
}
@Test
public
void
configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException
()
throws
Exception
{
public
void
configureSslWhenSslIsEnabledWithNoKeyStoreThrowsWebServerException
()
{
Ssl
ssl
=
new
Ssl
();
SslServerCustomizer
customizer
=
new
SslServerCustomizer
(
null
,
ssl
,
null
,
null
);
assertThatExceptionOfType
(
Exception
.
class
)
...
...
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