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
8038882d
Commit
8038882d
authored
Nov 16, 2016
by
Johnny Lim
Committed by
Phillip Webb
Nov 16, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-7403
parent
387a406a
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
21 additions
and
12 deletions
+21
-12
NamedMvcEndpoint.java
...framework/boot/actuate/endpoint/mvc/NamedMvcEndpoint.java
+1
-1
JooqExceptionTranslator.java
...work/boot/autoconfigure/jooq/JooqExceptionTranslator.java
+1
-1
ConditionalOnCloudPlatformTests.java
...oconfigure/condition/ConditionalOnCloudPlatformTests.java
+8
-0
WebMvcAutoConfigurationTests.java
.../boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
+1
-1
production-ready-features.adoc
...oot-docs/src/main/asciidoc/production-ready-features.adoc
+2
-2
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+1
-1
using-spring-boot.adoc
spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+1
-1
pom.xml
...ng-boot-samples/spring-boot-sample-test-nomockito/pom.xml
+1
-0
SampleTestNoMockitoApplicationTest.java
...ple/testnomockito/SampleTestNoMockitoApplicationTest.java
+1
-1
RunProcess.java
...ava/org/springframework/boot/loader/tools/RunProcess.java
+2
-2
ExplodedArchive.java
.../springframework/boot/loader/archive/ExplodedArchive.java
+1
-1
AbstractRunMojo.java
.../java/org/springframework/boot/maven/AbstractRunMojo.java
+1
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamedMvcEndpoint.java
View file @
8038882d
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
package
org
.
springframework
.
boot
.
actuate
.
endpoint
.
mvc
;
package
org
.
springframework
.
boot
.
actuate
.
endpoint
.
mvc
;
/**
/**
* A {@link MvcEndpoint} that also includes a logical name. Unlike {@link #getPath()
* A
n
{@link MvcEndpoint} that also includes a logical name. Unlike {@link #getPath()
* endpoints paths}, it should not be possible for a user to change the endpoint name.
* endpoints paths}, it should not be possible for a user to change the endpoint name.
* Names provide a consistent way to reference an endpoint, for example they may be used
* Names provide a consistent way to reference an endpoint, for example they may be used
* as the {@literal 'rel'} attribute in a HAL response.
* as the {@literal 'rel'} attribute in a HAL response.
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslator.java
View file @
8038882d
...
@@ -30,7 +30,7 @@ import org.springframework.jdbc.support.SQLExceptionTranslator;
...
@@ -30,7 +30,7 @@ import org.springframework.jdbc.support.SQLExceptionTranslator;
import
org.springframework.jdbc.support.SQLStateSQLExceptionTranslator
;
import
org.springframework.jdbc.support.SQLStateSQLExceptionTranslator
;
/**
/**
* Transforms {@link java.sql.SQLException} into a Spring-specific
@{
link
* Transforms {@link java.sql.SQLException} into a Spring-specific
{@
link
* DataAccessException}.
* DataAccessException}.
*
*
* @author Lukas Eder
* @author Lukas Eder
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java
View file @
8038882d
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
condition
;
package
org
.
springframework
.
boot
.
autoconfigure
.
condition
;
import
org.junit.After
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.springframework.boot.cloud.CloudPlatform
;
import
org.springframework.boot.cloud.CloudPlatform
;
...
@@ -33,6 +34,13 @@ public class ConditionalOnCloudPlatformTests {
...
@@ -33,6 +34,13 @@ public class ConditionalOnCloudPlatformTests {
private
final
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
();
private
final
AnnotationConfigApplicationContext
context
=
new
AnnotationConfigApplicationContext
();
@After
public
void
cleanUp
()
{
if
(
this
.
context
!=
null
)
{
this
.
context
.
close
();
}
}
@Test
@Test
public
void
outcomeWhenCloudfoundryPlatformNotPresentShouldNotMatch
()
public
void
outcomeWhenCloudfoundryPlatformNotPresentShouldNotMatch
()
throws
Exception
{
throws
Exception
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
View file @
8038882d
...
@@ -577,7 +577,7 @@ public class WebMvcAutoConfigurationTests {
...
@@ -577,7 +577,7 @@ public class WebMvcAutoConfigurationTests {
}
}
@Test
@Test
public
void
welcomePageMappingDoesNotHandleRequestThatDoNotAcceptTextHtml
()
public
void
welcomePageMappingDoesNotHandleRequest
s
ThatDoNotAcceptTextHtml
()
throws
Exception
{
throws
Exception
{
load
(
"spring.resources.static-locations:classpath:/welcome-page/"
);
load
(
"spring.resources.static-locations:classpath:/welcome-page/"
);
assertThat
(
this
.
context
.
getBeansOfType
(
WelcomePageHandlerMapping
.
class
))
assertThat
(
this
.
context
.
getBeansOfType
(
WelcomePageHandlerMapping
.
class
))
...
...
spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View file @
8038882d
...
@@ -953,7 +953,7 @@ documentation].
...
@@ -953,7 +953,7 @@ documentation].
==
Loggers
==
Loggers
Spring
Boot
Actuator
includes
the
ability
to
view
and
configure
the
log
levels
of
your
Spring
Boot
Actuator
includes
the
ability
to
view
and
configure
the
log
levels
of
your
application
at
runtime
.
You
can
view
either
the
entire
list
or
an
individual
logger
's
application
at
runtime
.
You
can
view
either
the
entire
list
or
an
individual
logger
's
configuration which is made up of both the explic
ti
ly configured logging level as well as
configuration which is made up of both the explic
it
ly configured logging level as well as
the effective logging level given to it by the logging framework. These levels can be:
the effective logging level given to it by the logging framework. These levels can be:
* `TRACE`
* `TRACE`
...
@@ -965,7 +965,7 @@ the effective logging level given to it by the logging framework. These levels
...
@@ -965,7 +965,7 @@ the effective logging level given to it by the logging framework. These levels
* `OFF`
* `OFF`
* `null`
* `null`
with `null` indicating that there is no explict configuration.
with `null` indicating that there is no explic
i
t configuration.
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
8038882d
...
@@ -3886,7 +3886,7 @@ abstraction expects. No further customization is applied on it.
...
@@ -3886,7 +3886,7 @@ abstraction expects. No further customization is applied on it.
EhCache 2.x is used if a file named `ehcache.xml` can be found at the root of the
EhCache 2.x is used if a file named `ehcache.xml` can be found at the root of the
classpath. If EhCache 2.x, the `EhCacheCacheManager` provided by the
classpath. If EhCache 2.x, the `EhCacheCacheManager` provided by the
`spring-boot-starter-cache` '`Starter`' and such file is present it is used to bootstrap
`spring-boot-starter-cache` '`Starter`' and such file is present it is used to bootstrap
the cache manager. An alternate configuration file can be provide
a
well using:
the cache manager. An alternate configuration file can be provide
d as
well using:
[source,properties,indent=0]
[source,properties,indent=0]
----
----
...
...
spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View file @
8038882d
...
@@ -769,7 +769,7 @@ dependencies out-of-the-box so you may want to have a look to the
...
@@ -769,7 +769,7 @@ dependencies out-of-the-box so you may want to have a look to the
{propdeps-plugin}[`propdeps-plugin`] in the meantime.
{propdeps-plugin}[`propdeps-plugin`] in the meantime.
TIP: repackaged archives do not contain devtools by default. If you want to use
TIP: repackaged archives do not contain devtools by default. If you want to use
<<using-boot-devtools-remote,certain remote devtools feature>>, you'll need to
en
able the
<<using-boot-devtools-remote,certain remote devtools feature>>, you'll need to
dis
able the
`excludeDevtools` build property to include it. The property is supported with both the
`excludeDevtools` build property to include it. The property is supported with both the
Maven and Gradle plugins.
Maven and Gradle plugins.
...
...
spring-boot-samples/spring-boot-sample-test-nomockito/pom.xml
View file @
8038882d
...
@@ -42,6 +42,7 @@
...
@@ -42,6 +42,7 @@
<dependency>
<dependency>
<groupId>
org.assertj
</groupId>
<groupId>
org.assertj
</groupId>
<artifactId>
assertj-core
</artifactId>
<artifactId>
assertj-core
</artifactId>
<scope>
test
</scope>
</dependency>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
spring-boot-samples/spring-boot-sample-test-nomockito/src/test/java/sample/testnomockito/SampleTestNoMockitoApplicationTest.java
View file @
8038882d
...
@@ -10,7 +10,7 @@ import org.springframework.test.context.junit4.SpringRunner;
...
@@ -10,7 +10,7 @@ import org.springframework.test.context.junit4.SpringRunner;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
/**
* Tests that {code ResetMocksTestExecutionListener} and
* Tests that {
@
code ResetMocksTestExecutionListener} and
* {@code MockitoTestExecutionListener} gracefully degrade when Mockito is not on the
* {@code MockitoTestExecutionListener} gracefully degrade when Mockito is not on the
* classpath.
* classpath.
*
*
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/RunProcess.java
View file @
8038882d
...
@@ -52,7 +52,7 @@ public class RunProcess {
...
@@ -52,7 +52,7 @@ public class RunProcess {
/**
/**
* Creates new {@link RunProcess} instance for the specified command.
* Creates new {@link RunProcess} instance for the specified command.
* @param command the program to execute and it
'
s arguments
* @param command the program to execute and its arguments
*/
*/
public
RunProcess
(
String
...
command
)
{
public
RunProcess
(
String
...
command
)
{
this
(
null
,
command
);
this
(
null
,
command
);
...
@@ -63,7 +63,7 @@ public class RunProcess {
...
@@ -63,7 +63,7 @@ public class RunProcess {
* command.
* command.
* @param workingDirectory the working directory of the child process or {@code null}
* @param workingDirectory the working directory of the child process or {@code null}
* to run in the working directory of the current Java process
* to run in the working directory of the current Java process
* @param command the program to execute and it
'
s arguments
* @param command the program to execute and its arguments
*/
*/
public
RunProcess
(
File
workingDirectory
,
String
...
command
)
{
public
RunProcess
(
File
workingDirectory
,
String
...
command
)
{
this
.
workingDirectory
=
workingDirectory
;
this
.
workingDirectory
=
workingDirectory
;
...
...
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
View file @
8038882d
...
@@ -65,7 +65,7 @@ public class ExplodedArchive implements Archive {
...
@@ -65,7 +65,7 @@ public class ExplodedArchive implements Archive {
* Create a new {@link ExplodedArchive} instance.
* Create a new {@link ExplodedArchive} instance.
* @param root the root folder
* @param root the root folder
* @param recursive if recursive searching should be used to locate the manifest.
* @param recursive if recursive searching should be used to locate the manifest.
* Defaults to {@code true}, folders with a large tree might want to set this to {code
* Defaults to {@code true}, folders with a large tree might want to set this to {
@
code
* false}.
* false}.
*/
*/
public
ExplodedArchive
(
File
root
,
boolean
recursive
)
{
public
ExplodedArchive
(
File
root
,
boolean
recursive
)
{
...
...
spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View file @
8038882d
...
@@ -89,7 +89,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
...
@@ -89,7 +89,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
/**
/**
* Current working directory to use for the application. If not specified, basedir
* Current working directory to use for the application. If not specified, basedir
* will be used NOTE: the use of working directory means that processes will be
* will be used
.
NOTE: the use of working directory means that processes will be
* started by forking a new JVM.
* started by forking a new JVM.
* @since 1.5
* @since 1.5
*/
*/
...
...
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