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
a9afe0a9
Commit
a9afe0a9
authored
Feb 20, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting
parent
d3074a08
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
25 additions
and
16 deletions
+25
-16
OpenTsdbGaugeWriter.java
...rk/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java
+2
-2
RabbitListenerContainerFactoryConfigurer.java
...figure/amqp/RabbitListenerContainerFactoryConfigurer.java
+4
-3
JobLauncherCommandLineRunner.java
...oot/autoconfigure/batch/JobLauncherCommandLineRunner.java
+2
-1
ElasticsearchAutoConfiguration.java
...re/data/elasticsearch/ElasticsearchAutoConfiguration.java
+2
-1
DataSourceAutoConfiguration.java
.../boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
+2
-1
JmsAnnotationDrivenConfiguration.java
...t/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
+2
-1
JmsListenerContainerFactoryConfigurer.java
...oconfigure/jms/JmsListenerContainerFactoryConfigurer.java
+2
-2
JmsAutoConfigurationTests.java
...ork/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
+5
-3
FileEncodingApplicationListener.java
...amework/boot/context/FileEncodingApplicationListener.java
+2
-1
ServletListenerRegistrationBean.java
...oot/context/embedded/ServletListenerRegistrationBean.java
+2
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java
View file @
a9afe0a9
...
...
@@ -80,8 +80,8 @@ public class OpenTsdbGaugeWriter implements GaugeWriter {
private
OpenTsdbNamingStrategy
namingStrategy
=
new
DefaultOpenTsdbNamingStrategy
();
/**
* Creates a new {@code OpenTsdbGaugeWriter} with the default connect (10 seconds)
*
and
read (30 seconds) timeouts.
* Creates a new {@code OpenTsdbGaugeWriter} with the default connect (10 seconds)
and
* read (30 seconds) timeouts.
*/
public
OpenTsdbGaugeWriter
()
{
this
(
DEFAULT_CONNECT_TIMEOUT
,
DEFAULT_READ_TIMEOUT
);
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitListenerContainerFactoryConfigurer.java
View file @
a9afe0a9
...
...
@@ -42,8 +42,8 @@ public final class RabbitListenerContainerFactoryConfigurer {
}
/**
* Create a new and pre-configured {@link SimpleRabbitListenerContainerFactory}
instance
* for the specified {@link ConnectionFactory}.
* Create a new and pre-configured {@link SimpleRabbitListenerContainerFactory}
*
instance
for the specified {@link ConnectionFactory}.
* @param connectionFactory the {@link ConnectionFactory} to use.
* @return a pre-configured {@link SimpleRabbitListenerContainerFactory}
*/
...
...
@@ -57,7 +57,8 @@ public final class RabbitListenerContainerFactoryConfigurer {
/**
* Apply the default settings for the specified jms listener container factory. The
* factory can be further tuned and default settings can be overridden.
* @param factory the {@link SimpleRabbitListenerContainerFactory} instance to configure
* @param factory the {@link SimpleRabbitListenerContainerFactory} instance to
* configure
* @param connectionFactory the {@link ConnectionFactory} to use
*/
public
void
configure
(
SimpleRabbitListenerContainerFactory
factory
,
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
View file @
a9afe0a9
...
...
@@ -66,7 +66,8 @@ import org.springframework.util.StringUtils;
public
class
JobLauncherCommandLineRunner
implements
CommandLineRunner
,
ApplicationEventPublisherAware
{
private
static
final
Log
logger
=
LogFactory
.
getLog
(
JobLauncherCommandLineRunner
.
class
);
private
static
final
Log
logger
=
LogFactory
.
getLog
(
JobLauncherCommandLineRunner
.
class
);
private
JobParametersConverter
converter
=
new
DefaultJobParametersConverter
();
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java
View file @
a9afe0a9
...
...
@@ -66,7 +66,8 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
DEFAULTS
=
Collections
.
unmodifiableMap
(
defaults
);
}
private
static
final
Log
logger
=
LogFactory
.
getLog
(
ElasticsearchAutoConfiguration
.
class
);
private
static
final
Log
logger
=
LogFactory
.
getLog
(
ElasticsearchAutoConfiguration
.
class
);
@Autowired
private
ElasticsearchProperties
properties
;
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View file @
a9afe0a9
...
...
@@ -67,7 +67,8 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
@Import
({
Registrar
.
class
,
DataSourcePoolMetadataProvidersConfiguration
.
class
})
public
class
DataSourceAutoConfiguration
{
private
static
final
Log
logger
=
LogFactory
.
getLog
(
DataSourceAutoConfiguration
.
class
);
private
static
final
Log
logger
=
LogFactory
.
getLog
(
DataSourceAutoConfiguration
.
class
);
/**
* Determines if the {@code dataSource} being used by Spring was created from
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsAnnotationDrivenConfiguration.java
View file @
a9afe0a9
...
...
@@ -49,7 +49,8 @@ class JmsAnnotationDrivenConfiguration {
@Bean
@ConditionalOnMissingBean
(
name
=
"jmsListenerContainerFactory"
)
public
DefaultJmsListenerContainerFactory
jmsListenerContainerFactory
(
JmsListenerContainerFactoryConfigurer
configurer
,
ConnectionFactory
connectionFactory
)
{
JmsListenerContainerFactoryConfigurer
configurer
,
ConnectionFactory
connectionFactory
)
{
return
configurer
.
createJmsListenerContainerFactory
(
connectionFactory
);
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JmsListenerContainerFactoryConfigurer.java
View file @
a9afe0a9
...
...
@@ -50,8 +50,8 @@ public final class JmsListenerContainerFactoryConfigurer {
}
/**
* Set the {@link JtaTransactionManager} to use or {@code null} if the JTA
* s
upport s
hould not be used.
* Set the {@link JtaTransactionManager} to use or {@code null} if the JTA
support
* should not be used.
* @param transactionManager the {@link JtaTransactionManager}
*/
@Autowired
(
required
=
false
)
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java
View file @
a9afe0a9
...
...
@@ -214,8 +214,9 @@ public class JmsAutoConfigurationTests {
@Test
public
void
testCustomContainerFactoryWithConfigurer
()
{
this
.
context
=
doLoad
(
new
Class
<?>[]{
TestConfiguration9
.
class
,
EnableJmsConfiguration
.
class
},
"spring.jms.listener.autoStartup=false"
);
this
.
context
=
doLoad
(
new
Class
<?>[]
{
TestConfiguration9
.
class
,
EnableJmsConfiguration
.
class
},
"spring.jms.listener.autoStartup=false"
);
assertTrue
(
this
.
context
.
containsBean
(
"jmsListenerContainerFactory"
));
JmsListenerContainerFactory
<?>
jmsListenerContainerFactory
=
this
.
context
.
getBean
(
"customListenerContainerFactory"
,
JmsListenerContainerFactory
.
class
);
...
...
@@ -223,7 +224,8 @@ public class JmsAutoConfigurationTests {
jmsListenerContainerFactory
.
getClass
());
DefaultMessageListenerContainer
listenerContainer
=
((
DefaultJmsListenerContainerFactory
)
jmsListenerContainerFactory
)
.
createListenerContainer
(
mock
(
JmsListenerEndpoint
.
class
));
assertEquals
(
DefaultMessageListenerContainer
.
CACHE_CONSUMER
,
listenerContainer
.
getCacheLevel
());
assertEquals
(
DefaultMessageListenerContainer
.
CACHE_CONSUMER
,
listenerContainer
.
getCacheLevel
());
assertFalse
(
listenerContainer
.
isAutoStartup
());
}
...
...
spring-boot/src/main/java/org/springframework/boot/context/FileEncodingApplicationListener.java
View file @
a9afe0a9
...
...
@@ -46,7 +46,8 @@ import org.springframework.core.Ordered;
public
class
FileEncodingApplicationListener
implements
ApplicationListener
<
ApplicationEnvironmentPreparedEvent
>,
Ordered
{
private
static
final
Log
logger
=
LogFactory
.
getLog
(
FileEncodingApplicationListener
.
class
);
private
static
final
Log
logger
=
LogFactory
.
getLog
(
FileEncodingApplicationListener
.
class
);
@Override
public
int
getOrder
()
{
...
...
spring-boot/src/main/java/org/springframework/boot/context/embedded/ServletListenerRegistrationBean.java
View file @
a9afe0a9
...
...
@@ -59,7 +59,8 @@ import org.springframework.util.ClassUtils;
public
class
ServletListenerRegistrationBean
<
T
extends
EventListener
>
extends
RegistrationBean
{
private
static
final
Log
logger
=
LogFactory
.
getLog
(
ServletListenerRegistrationBean
.
class
);
private
static
final
Log
logger
=
LogFactory
.
getLog
(
ServletListenerRegistrationBean
.
class
);
private
static
final
Set
<
Class
<?>>
SUPPORTED_TYPES
;
...
...
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