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
db2092e2
Commit
db2092e2
authored
Apr 26, 2016
by
Johnny Lim
Committed by
Stephane Nicoll
Apr 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
Closes gh-5798
parent
34e3e3c8
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
15 deletions
+15
-15
ISSUE_TEMPLATE.md
.github/ISSUE_TEMPLATE.md
+1
-1
EnableAutoConfigurationImportSelector.java
.../autoconfigure/EnableAutoConfigurationImportSelector.java
+1
-1
CouchbaseProperties.java
...ork/boot/autoconfigure/couchbase/CouchbaseProperties.java
+2
-2
appendix-application-properties.adoc
...cs/src/main/asciidoc/appendix-application-properties.adoc
+2
-2
production-ready-features.adoc
...oot-docs/src/main/asciidoc/production-ready-features.adoc
+1
-1
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
InfoProperties.java
...in/java/org/springframework/boot/info/InfoProperties.java
+5
-5
ConfigFileApplicationListenerTests.java
...ot/context/config/ConfigFileApplicationListenerTests.java
+1
-1
No files found.
.github/ISSUE_TEMPLATE.md
View file @
db2092e2
...
...
@@ -9,7 +9,7 @@ working as you expect it to, on Stack Overflow using the spring-boot tag.
Bug report
Please provide details of the problem, including the version of Spring Boot that you
are using. If possible, please provide a testcase or sample application that reproduces
are using. If possible, please provide a test
case or sample application that reproduces
the problem. This makes it much easier for us to diagnose the problem and to verify that
we have fixed it.
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfigurationImportSelector.java
View file @
db2092e2
...
...
@@ -143,7 +143,7 @@ public class EnableAutoConfigurationImportSelector
List
<
String
>
configurations
=
SpringFactoriesLoader
.
loadFactoryNames
(
getSpringFactoriesLoaderFactoryClass
(),
getBeanClassLoader
());
Assert
.
notEmpty
(
configurations
,
"No auto configuration classes found in META-INF/spring.factories. If you"
"No auto configuration classes found in META-INF/spring.factories. If you
"
+
"are using a custom packaging, make sure that file is correct."
);
return
configurations
;
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java
View file @
db2092e2
...
...
@@ -115,12 +115,12 @@ public class CouchbaseProperties {
public
static
class
Endpoints
{
/**
* Number of sockets per node against the
K
ey/value service.
* Number of sockets per node against the
k
ey/value service.
*/
private
int
keyValue
=
1
;
/**
* Number of sockets per node against the
Q
uery (N1QL) service.
* Number of sockets per node against the
q
uery (N1QL) service.
*/
private
int
query
=
1
;
...
...
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View file @
db2092e2
...
...
@@ -792,9 +792,9 @@ content into your application; rather pick only the properties that you need.
spring.activemq.in-memory=true # Specify if the default broker URL should be in memory. Ignored if an explicit broker has been specified.
spring.activemq.password= # Login password of the broker.
spring.activemq.user= # Login user of the broker.
spring.activemq.packages.trust-all=false # Trust all packages
spring.activemq.packages.trust-all=false # Trust all packages
.
spring.activemq.packages.trusted= # Comma-separated list of specific packages to trust (when not trusting all packages).
spring.activemq.pool.configuration.*= # See PooledConnectionFactory
spring.activemq.pool.configuration.*= # See PooledConnectionFactory
.
spring.activemq.pool.enabled=false # Whether a PooledConnectionFactory should be created instead of a regular ConnectionFactory.
spring.activemq.pool.expiry-timeout=0 # Connection expiration timeout in milliseconds.
spring.activemq.pool.idle-timeout=30000 # Connection idle timeout in milliseconds.
...
...
spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View file @
db2092e2
...
...
@@ -237,7 +237,7 @@ creating a bean of type `MvcEndpoint`. Your `MvcEndpoint` is not a `@Controller`
can
use
`@
RequestMapping
`
(
and
`@
Managed
*`)
to
expose
resources
.
TIP
:
If
you
are
doing
this
as
a
library
feature
consider
adding
a
configuration
class
annoated
with
`@
ManagementContextConfiguration
`
to
`/
META
-
INF
/
spring
.
factories
`
under
the
anno
t
ated
with
`@
ManagementContextConfiguration
`
to
`/
META
-
INF
/
spring
.
factories
`
under
the
key
`
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
ManagementContextConfiguration
`.
If
you
do
that
then
the
endpoint
will
move
to
a
child
context
with
all
the
other
MVC
endpoints
if
your
users
ask
for
a
separate
management
port
or
address
.
A
configuration
...
...
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
db2092e2
...
...
@@ -3374,7 +3374,7 @@ control over the whole configuration.
====
It is also possible to customize some of the `CouchbaseEnvironment` settings. For instance
the following configuration changes the timeout to use to open a new `Bucket` and enable
the following configuration changes the timeout to use to open a new `Bucket` and enable
s
SSL support:
[source,properties,indent=0]
...
...
spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View file @
db2092e2
...
...
@@ -525,7 +525,7 @@ configuration to replace specific parts of the auto-configuration. For example,
you add your own `DataSource` bean, the default embedded database support will back away.
If you need to find out what auto-configuration is currently being applied, and why,
start your application with the `--debug` switch. This will enable
s
debug logs for a
start your application with the `--debug` switch. This will enable debug logs for a
selection of core loggers and log an auto-configuration report to the console.
...
...
spring-boot/src/main/java/org/springframework/boot/info/InfoProperties.java
View file @
db2092e2
...
...
@@ -41,23 +41,23 @@ public class InfoProperties implements Iterable<InfoProperties.Entry> {
* @param entries the information to expose
*/
public
InfoProperties
(
Properties
entries
)
{
Assert
.
notNull
(
entries
,
"
Propert
ies must not be null"
);
Assert
.
notNull
(
entries
,
"
Entr
ies must not be null"
);
this
.
entries
=
copy
(
entries
);
}
/**
* Return the value of the specified property or {@code null}.
* @param
property the id
of the property
* @param
key the key
of the property
* @return the property value
*/
public
String
get
(
String
propert
y
)
{
return
this
.
entries
.
getProperty
(
propert
y
);
public
String
get
(
String
ke
y
)
{
return
this
.
entries
.
getProperty
(
ke
y
);
}
/**
* Return the value of the specified property as a {@link Date} or {@code null} if the
* value is not a valid {@link Long} representation of an epoch time.
* @param key the
id
of the property
* @param key the
key
of the property
* @return the property value
*/
public
Date
getDate
(
String
key
)
{
...
...
spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
View file @
db2092e2
...
...
@@ -539,7 +539,7 @@ public class ConfigFileApplicationListenerTests {
}
@Test
public
void
yamlSetsMultiProfilesWithW
ith
espace
()
throws
Exception
{
public
void
yamlSetsMultiProfilesWithW
hit
espace
()
throws
Exception
{
this
.
initializer
.
setSearchNames
(
"testsetmultiprofileswhitespace"
);
this
.
initializer
.
postProcessEnvironment
(
this
.
environment
,
this
.
application
);
assertThat
(
this
.
environment
.
getActiveProfiles
()).
containsExactly
(
"dev"
,
...
...
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