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
4b9f6869
Commit
4b9f6869
authored
Sep 05, 2016
by
Johnny Lim
Committed by
Stephane Nicoll
Sep 05, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-6817
parent
b7da0bd3
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
13 additions
and
18 deletions
+13
-18
EndpointWebMvcChildContextConfiguration.java
...utoconfigure/EndpointWebMvcChildContextConfiguration.java
+0
-5
HalBrowserMvcEndpointServerServletPathIntegrationTests.java
...lBrowserMvcEndpointServerServletPathIntegrationTests.java
+1
-1
SpringBootRepositoryRestConfigurer.java
...nfigure/data/rest/SpringBootRepositoryRestConfigurer.java
+1
-1
LiquibaseAutoConfigurationTests.java
...oconfigure/liquibase/LiquibaseAutoConfigurationTests.java
+1
-1
Installer.java
...g/springframework/boot/cli/command/install/Installer.java
+4
-4
README.adoc
spring-boot-starters/README.adoc
+1
-1
DefinitionsParser.java
...ngframework/boot/test/mock/mockito/DefinitionsParser.java
+2
-2
MockDefinition.java
...pringframework/boot/test/mock/mockito/MockDefinition.java
+1
-1
ExampleGenericService.java
...boot/test/mock/mockito/example/ExampleGenericService.java
+1
-1
ExampleGenericServiceCaller.java
...est/mock/mockito/example/ExampleGenericServiceCaller.java
+1
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
View file @
4b9f6869
...
...
@@ -374,11 +374,6 @@ public class EndpointWebMvcChildContextConfiguration {
super
(
TomcatEmbeddedServletContainerFactory
.
class
);
}
@Override
public
int
getOrder
()
{
return
1
;
}
@Override
public
void
customize
(
TomcatEmbeddedServletContainerFactory
container
)
{
AccessLogValve
accessLogValve
=
findAccessLogValve
(
container
);
...
...
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerServletPathIntegrationTests.java
View file @
4b9f6869
...
...
@@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import
static
org
.
springframework
.
hateoas
.
mvc
.
ControllerLinkBuilder
.
linkTo
;
/**
* Integration tests for {@link HalBrowserMvcEndpoint} when a custom server
contex
t path
* Integration tests for {@link HalBrowserMvcEndpoint} when a custom server
servle
t path
* has been configured.
*
* @author Dave Syer
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java
View file @
4b9f6869
...
...
@@ -24,7 +24,7 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapt
import
org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
;
/**
* A {@code RepositoryRestConfigurer} that applies
that applies
configuration items from
* A {@code RepositoryRestConfigurer} that applies configuration items from
* the {@code spring.data.rest} namespace to Spring Data REST. Also, if a
* {@link Jackson2ObjectMapperBuilder} is available, it is used to configure Spring Data
* REST's {@link ObjectMapper ObjectMappers}.
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java
View file @
4b9f6869
...
...
@@ -256,7 +256,7 @@ public class LiquibaseAutoConfigurationTests {
}
@Test
public
void
testLiquibaseDat
e
Source
()
{
public
void
testLiquibaseDat
a
Source
()
{
this
.
context
.
register
(
LiquibaseDataSourceConfiguration
.
class
,
EmbeddedDataSourceConfiguration
.
class
,
LiquibaseAutoConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
);
...
...
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java
View file @
4b9f6869
...
...
@@ -92,15 +92,15 @@ class Installer {
}
public
void
install
(
List
<
String
>
artifactIdentifiers
)
throws
Exception
{
File
lib
Directory
=
getDefaultExtDirectory
();
lib
Directory
.
mkdirs
();
Log
.
info
(
"Installing into: "
+
lib
Directory
);
File
ext
Directory
=
getDefaultExtDirectory
();
ext
Directory
.
mkdirs
();
Log
.
info
(
"Installing into: "
+
ext
Directory
);
List
<
File
>
artifactFiles
=
this
.
dependencyResolver
.
resolve
(
artifactIdentifiers
);
for
(
File
artifactFile
:
artifactFiles
)
{
int
installCount
=
getInstallCount
(
artifactFile
);
if
(
installCount
==
0
)
{
FileCopyUtils
.
copy
(
artifactFile
,
new
File
(
lib
Directory
,
artifactFile
.
getName
()));
new
File
(
ext
Directory
,
artifactFile
.
getName
()));
}
setInstallCount
(
artifactFile
,
installCount
+
1
);
}
...
...
spring-boot-starters/README.adoc
View file @
4b9f6869
...
...
@@ -100,7 +100,7 @@ do as they were designed before this was clarified.
| Charon reverse proxy
| https://github.com/mkopylec/charon-spring-boot-starter
| http://www.wiremock.org[WireMock] and Spring RESTDocs
| http://www.wiremock.org[WireMock] and Spring REST
Docs
| https://github.com/ePages-de/restdocs-wiremock
| https://cxf.apache.org/docs/springboot.html[Apache CXF]
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
View file @
4b9f6869
...
...
@@ -125,8 +125,8 @@ class DefinitionsParser {
private
Set
<
ResolvableType
>
getOrDeduceTypes
(
AnnotatedElement
element
,
Class
<?>[]
value
)
{
Set
<
ResolvableType
>
types
=
new
LinkedHashSet
<
ResolvableType
>();
for
(
Class
<?>
type
:
value
)
{
types
.
add
(
ResolvableType
.
forClass
(
type
));
for
(
Class
<?>
clazz
:
value
)
{
types
.
add
(
ResolvableType
.
forClass
(
clazz
));
}
if
(
types
.
isEmpty
()
&&
element
instanceof
Field
)
{
types
.
add
(
ResolvableType
.
forField
((
Field
)
element
));
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java
View file @
4b9f6869
...
...
@@ -77,7 +77,7 @@ class MockDefinition extends Definition {
/**
* Return the type that should be mocked.
* @return the
class
to mock; never {@code null}
* @return the
type
to mock; never {@code null}
*/
public
ResolvableType
getTypeToMock
()
{
return
this
.
typeToMock
;
...
...
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java
View file @
4b9f6869
...
...
@@ -19,7 +19,7 @@ package org.springframework.boot.test.mock.mockito.example;
/**
* Example service interface for mocking tests.
*
* @param <T>
T
he generic type
* @param <T>
t
he generic type
* @author Phillip Webb
*/
public
interface
ExampleGenericService
<
T
>
{
...
...
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java
View file @
4b9f6869
...
...
@@ -42,7 +42,7 @@ public class ExampleGenericServiceCaller {
}
public
String
sayGreeting
()
{
return
"I say "
+
+
this
.
integerService
.
greeting
()
+
" "
return
"I say "
+
this
.
integerService
.
greeting
()
+
" "
+
this
.
stringService
.
greeting
();
}
...
...
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