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
70adefc8
Commit
70adefc8
authored
May 26, 2016
by
Johnny Lim
Committed by
Stephane Nicoll
May 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-6046
parent
6f5bd2e1
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
15 additions
and
17 deletions
+15
-17
autoconfig.adoc
spring-boot-actuator-docs/src/main/asciidoc/autoconfig.adoc
+1
-1
index.adoc
spring-boot-actuator-docs/src/main/asciidoc/index.adoc
+1
-1
DefaultErrorViewResolver.java
...work/boot/autoconfigure/web/DefaultErrorViewResolver.java
+1
-1
OnBeanConditionTypeDeductionFailureTests.java
...e/condition/OnBeanConditionTypeDeductionFailureTests.java
+0
-1
TemplateAvailabilityProvidersTests.java
...onfigure/template/TemplateAvailabilityProvidersTests.java
+1
-1
appendix-application-properties.adoc
...cs/src/main/asciidoc/appendix-application-properties.adoc
+1
-1
appendix-executable-jar-format.adoc
...ocs/src/main/asciidoc/appendix-executable-jar-format.adoc
+1
-1
spring-boot-cli.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc
+1
-1
spring-boot-features.adoc
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+4
-4
SpringBootMockServletContext.java
...ringframework/boot/test/SpringBootMockServletContext.java
+1
-1
SpringBootMockServletContext.java
...work/boot/test/mock/web/SpringBootMockServletContext.java
+1
-1
TestRestTemplate.java
...pringframework/boot/test/web/client/TestRestTemplate.java
+1
-1
additional-spring-configuration-metadata.json
...es/META-INF/additional-spring-configuration-metadata.json
+1
-1
ImageBannerTests.java
.../test/java/org/springframework/boot/ImageBannerTests.java
+0
-1
No files found.
spring-boot-actuator-docs/src/main/asciidoc/autoconfig.adoc
View file @
70adefc8
=== /autoconfig
This endpoint is a report on the Spring Boot auto-configuration process that happened when
your application started up. It lists all the
`@Conditional` annotations that were
your application started up. It lists all the `@Conditional` annotations that were
evaluated as the context started and in each case it gives an indication of if (and why)
the condition matched. A positive match results in a bean being included in the context,
and a negative result means the opposite (the bean's class may not even be loaded).
...
...
spring-boot-actuator-docs/src/main/asciidoc/index.adoc
View file @
70adefc8
...
...
@@ -62,7 +62,7 @@ on the classpath by default) then the Actuator endpoint responses are enhanced w
hypermedia in the form of "links". The default media type for responses is
http://stateless.co/hal_specification.html[HAL], resulting in each resource having an
extra property called "_links". You can change the media type to another one supported by
Spring HATEOAS by providing your own
`@EnableHypermedia` annotation and custom providers
Spring HATEOAS by providing your own `@EnableHypermedia` annotation and custom providers
as necessary.
Example enhanced "/metrics" endpoint with additional "_links":
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java
View file @
70adefc8
...
...
@@ -152,7 +152,7 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
}
/**
* {@link View} backed by a HTML resource.
* {@link View} backed by a
n
HTML resource.
*/
private
static
class
HtmlResourceView
implements
View
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/OnBeanConditionTypeDeductionFailureTests.java
View file @
70adefc8
...
...
@@ -49,7 +49,6 @@ public class OnBeanConditionTypeDeductionFailureTests {
fail
(
"Context refresh was successful"
);
}
catch
(
Exception
ex
)
{
ex
.
printStackTrace
();
Throwable
beanTypeDeductionException
=
findBeanTypeDeductionException
(
ex
);
assertThat
(
beanTypeDeductionException
)
.
hasMessage
(
"Failed to deduce bean type for "
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProvidersTests.java
View file @
70adefc8
...
...
@@ -196,7 +196,7 @@ public class TemplateAvailabilityProvidersTests {
}
@Test
public
void
getProvderWhenCacheDisabledShouldNotUseCache
()
throws
Exception
{
public
void
getProv
i
derWhenCacheDisabledShouldNotUseCache
()
throws
Exception
{
given
(
this
.
provider
.
isTemplateAvailable
(
this
.
view
,
this
.
environment
,
this
.
classLoader
,
this
.
resourceLoader
)).
willReturn
(
true
);
this
.
environment
.
setProperty
(
"spring.template.provider.cache"
,
"false"
);
...
...
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View file @
70adefc8
...
...
@@ -31,7 +31,7 @@ content into your application; rather pick only the properties that you need.
# BANNER
banner.charset=UTF-8 # Banner file encoding.
banner.location=classpath:banner.txt # Banner file location.
banner.image.location=classpath:banner.gif #
(Banner image file location,
jpg/png can also be used).
banner.image.location=classpath:banner.gif #
Banner image file location (
jpg/png can also be used).
banner.image.width= # Width of the banner image in chars (default 76)
banner.image.height= # Height of the banner image in chars (default based on image height)
banner.image.margin= # Left hand image margin in chars (default 2)
...
...
spring-boot-docs/src/main/asciidoc/appendix-executable-jar-format.adoc
View file @
70adefc8
...
...
@@ -97,7 +97,7 @@ a traditional web container should be placed in `WEB-INF/lib-provided`.
The core class used to support loading nested jars is
`org.springframework.boot.loader.jar.JarFile`. It allows you to load jar
content from a standard jar file, or from nested child jar data. When first loaded, the
location of each
`JarEntry` is mapped to a physical file offset of the outer jar:
location of each `JarEntry` is mapped to a physical file offset of the outer jar:
[indent=0]
----
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc
View file @
70adefc8
...
...
@@ -228,7 +228,7 @@ For example, the following declaration:
@DependencyManagementBom("com.example.custom-bom:1.0.0")
----
Will pick up
`custom-bom-1.0.0.pom` in a Maven repository under
Will pick up `custom-bom-1.0.0.pom` in a Maven repository under
`com/example/custom-versions/1.0.0/`.
When multiple BOMs are specified they are applied in the order that they're declared.
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
70adefc8
...
...
@@ -52,7 +52,7 @@ such as the user that launched the application.
The banner that is printed on start up can be changed by adding a `banner.txt` file
to your classpath, or by setting `banner.location` to the location of such a file.
If the file has an unusual encoding you can set `banner.charset` (default is `UTF-8`).
In addition a text file, you can also add a `banner.gif`, `banner.jpg` or `banner.png`
In addition
to
a text file, you can also add a `banner.gif`, `banner.jpg` or `banner.png`
image file to your classpath, or set a `banner.image.location` property. Images will be
converted into an ASCII art representation and printed above any text banner.
...
...
@@ -1741,7 +1741,7 @@ this:
+- <other public assets>
----
To map all `5xx` errors using a
freem
arker template, you'd have a structure like this:
To map all `5xx` errors using a
FreeM
arker template, you'd have a structure like this:
[source,indent=0,subs="verbatim,quotes,attributes"]
----
...
...
@@ -1750,7 +1750,7 @@ To map all `5xx` errors using a freemarker template, you'd have a structure like
+- java/
| + <source code>
+- resources/
+- template/
+- template
s
/
+- error/
| +- 5xx.ftl
+- <other templates>
...
...
@@ -1786,7 +1786,7 @@ will then pick up any unhandled exceptions.
For applications that aren't using Spring MVC, you can use the `ErrorPageRegistrar`
interface to directly register `ErrorPages`. This abstraction works directly with the
underlying embedded servlet container and will work even if you don't have a Spring MVC
`DispatcherServlet`
`DispatcherServlet`
.
[source,java,indent=0,subs="verbatim,quotes,attributes"]
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/SpringBootMockServletContext.java
View file @
70adefc8
...
...
@@ -20,7 +20,7 @@ import org.springframework.core.io.ResourceLoader;
import
org.springframework.mock.web.MockServletContext
;
/**
* {@link MockServletContext} implementation for Spring Boot. Respects well
know
Spring
* {@link MockServletContext} implementation for Spring Boot. Respects well
-known
Spring
* Boot resource locations and uses an empty directory for "/" if no locations can be
* found.
*
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/mock/web/SpringBootMockServletContext.java
View file @
70adefc8
...
...
@@ -27,7 +27,7 @@ import org.springframework.core.io.ResourceLoader;
import
org.springframework.mock.web.MockServletContext
;
/**
* {@link MockServletContext} implementation for Spring Boot. Respects well
know
Spring
* {@link MockServletContext} implementation for Spring Boot. Respects well
-known
Spring
* Boot resource locations and uses an empty directory for "/" if no locations can be
* found.
*
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View file @
70adefc8
...
...
@@ -66,7 +66,7 @@ import org.springframework.web.util.UriTemplateHandler;
* Apache Http Client 4.3.2 or better is available (recommended) it will be used as the
* client, and by default configured to ignore cookies and redirects.
* <p>
* Note: To prevent injection problems this class interna
tiona
lly does not extend
* Note: To prevent injection problems this class internally does not extend
* {@link RestTemplate}. If you need access to the underlying {@link RestTemplate} use
* {@link #getRestTemplate()}.
*
...
...
spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View file @
70adefc8
...
...
@@ -35,7 +35,7 @@
{
"name"
:
"banner.image.margin"
,
"type"
:
"java.lang.Integer"
,
"description"
:
"Left hand image
height
(in chars)."
"description"
:
"Left hand image
margin
(in chars)."
},
{
"name"
:
"banner.image.invert"
,
...
...
spring-boot/src/test/java/org/springframework/boot/ImageBannerTests.java
View file @
70adefc8
...
...
@@ -121,7 +121,6 @@ public class ImageBannerTests {
AnsiOutput
.
setEnabled
(
AnsiOutput
.
Enabled
.
NEVER
);
String
banner
=
printBanner
(
"gradient.gif"
,
"banner.image.width=10"
,
"banner.image.margin=0"
);
System
.
out
.
println
(
banner
);
assertThat
(
banner
).
contains
(
"@#8&o:*. "
);
}
...
...
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