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
387a406a
Commit
387a406a
authored
Nov 16, 2016
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.4.x' into 1.5.x
parents
4a6b49ef
b3e0a371
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
7 deletions
+0
-7
LoggersMvcEndpointTests.java
...rk/boot/actuate/endpoint/mvc/LoggersMvcEndpointTests.java
+0
-1
HttpMessageConvertersAutoConfigurationTests.java
...gure/web/HttpMessageConvertersAutoConfigurationTests.java
+0
-5
ResourceMatcherTests.java
...mework/boot/cli/command/archive/ResourceMatcherTests.java
+0
-1
No files found.
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/LoggersMvcEndpointTests.java
View file @
387a406a
...
@@ -95,7 +95,6 @@ public class LoggersMvcEndpointTests {
...
@@ -95,7 +95,6 @@ public class LoggersMvcEndpointTests {
.
singletonList
(
new
LoggerConfiguration
(
"ROOT"
,
null
,
LogLevel
.
DEBUG
)));
.
singletonList
(
new
LoggerConfiguration
(
"ROOT"
,
null
,
LogLevel
.
DEBUG
)));
String
expected
=
"{\"levels\":[\"OFF\",\"FATAL\",\"ERROR\",\"WARN\",\"INFO\",\"DEBUG\",\"TRACE\"],"
String
expected
=
"{\"levels\":[\"OFF\",\"FATAL\",\"ERROR\",\"WARN\",\"INFO\",\"DEBUG\",\"TRACE\"],"
+
"\"loggers\":{\"ROOT\":{\"configuredLevel\":null,\"effectiveLevel\":\"DEBUG\"}}}"
;
+
"\"loggers\":{\"ROOT\":{\"configuredLevel\":null,\"effectiveLevel\":\"DEBUG\"}}}"
;
System
.
out
.
println
(
expected
);
this
.
mvc
.
perform
(
get
(
"/loggers"
)).
andExpect
(
status
().
isOk
())
this
.
mvc
.
perform
(
get
(
"/loggers"
)).
andExpect
(
status
().
isOk
())
.
andExpect
(
content
().
json
(
expected
));
.
andExpect
(
content
().
json
(
expected
));
}
}
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java
View file @
387a406a
...
@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.web;
...
@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.web;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
...
@@ -220,10 +219,6 @@ public class HttpMessageConvertersAutoConfigurationTests {
...
@@ -220,10 +219,6 @@ public class HttpMessageConvertersAutoConfigurationTests {
RepositoryRestMvcConfiguration
.
class
,
RepositoryRestMvcConfiguration
.
class
,
HttpMessageConvertersAutoConfiguration
.
class
);
HttpMessageConvertersAutoConfiguration
.
class
);
this
.
context
.
refresh
();
this
.
context
.
refresh
();
Map
<
String
,
MappingJackson2HttpMessageConverter
>
beansOfType
=
this
.
context
.
getBeansOfType
(
MappingJackson2HttpMessageConverter
.
class
);
System
.
out
.
println
(
beansOfType
);
BeanDefinition
beanDefinition
=
this
.
context
BeanDefinition
beanDefinition
=
this
.
context
.
getBeanDefinition
(
"mappingJackson2HttpMessageConverter"
);
.
getBeanDefinition
(
"mappingJackson2HttpMessageConverter"
);
assertThat
(
beanDefinition
.
getFactoryBeanName
()).
isEqualTo
(
assertThat
(
beanDefinition
.
getFactoryBeanName
()).
isEqualTo
(
...
...
spring-boot-cli/src/test/java/org/springframework/boot/cli/command/archive/ResourceMatcherTests.java
View file @
387a406a
...
@@ -139,7 +139,6 @@ public class ResourceMatcherTests {
...
@@ -139,7 +139,6 @@ public class ResourceMatcherTests {
.
find
(
Arrays
.
asList
(
new
File
(
"src/test/resources/resource-matcher/one"
),
.
find
(
Arrays
.
asList
(
new
File
(
"src/test/resources/resource-matcher/one"
),
new
File
(
"src/test/resources/resource-matcher/two"
),
new
File
(
"src/test/resources/resource-matcher/two"
),
new
File
(
"src/test/resources/resource-matcher/three"
)));
new
File
(
"src/test/resources/resource-matcher/three"
)));
System
.
out
.
println
(
matchedResources
);
List
<
String
>
paths
=
new
ArrayList
<
String
>();
List
<
String
>
paths
=
new
ArrayList
<
String
>();
for
(
MatchedResource
resource
:
matchedResources
)
{
for
(
MatchedResource
resource
:
matchedResources
)
{
paths
.
add
(
resource
.
getName
());
paths
.
add
(
resource
.
getName
());
...
...
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