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
a03ddd33
Commit
a03ddd33
authored
Jun 07, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polishing
parent
bddf9232
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
14 deletions
+13
-14
CacheProperties.java
...ngframework/boot/autoconfigure/cache/CacheProperties.java
+1
-2
MustacheCompilerFactoryBean.java
...t/autoconfigure/mustache/MustacheCompilerFactoryBean.java
+1
-1
JooqExceptionTranslatorTests.java
...boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
+1
-1
WebMvcValidatorTests.java
...ramework/boot/autoconfigure/web/WebMvcValidatorTests.java
+1
-2
LoggerConfiguration.java
...org/springframework/boot/logging/LoggerConfiguration.java
+2
-1
UndertowEmbeddedServletContainerFactoryTests.java
...ndertow/UndertowEmbeddedServletContainerFactoryTests.java
+4
-4
AtomikosPropertiesTests.java
...gframework/boot/jta/atomikos/AtomikosPropertiesTests.java
+3
-3
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java
View file @
a03ddd33
...
@@ -202,8 +202,7 @@ public class CacheProperties {
...
@@ -202,8 +202,7 @@ public class CacheProperties {
*/
*/
private
Resource
config
;
private
Resource
config
;
@DeprecatedConfigurationProperty
(
replacement
=
"spring.hazelcast.config"
,
@DeprecatedConfigurationProperty
(
replacement
=
"spring.hazelcast.config"
,
reason
=
"Use general hazelcast auto-configuration instead."
)
reason
=
"Use general hazelcast auto-configuration instead."
)
@Deprecated
@Deprecated
public
Resource
getConfig
()
{
public
Resource
getConfig
()
{
return
this
.
config
;
return
this
.
config
;
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
View file @
a03ddd33
...
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.FactoryBean;
...
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.FactoryBean;
* @author Dave Syer
* @author Dave Syer
* @since 1.2.2
* @since 1.2.2
* @see MustacheResourceTemplateLoader
* @see MustacheResourceTemplateLoader
* @deprecated
as of 1.5
* @deprecated as of 1.5
*/
*/
@Deprecated
@Deprecated
public
class
MustacheCompilerFactoryBean
implements
FactoryBean
<
Mustache
.
Compiler
>
{
public
class
MustacheCompilerFactoryBean
implements
FactoryBean
<
Mustache
.
Compiler
>
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqExceptionTranslatorTests.java
View file @
a03ddd33
...
@@ -59,7 +59,7 @@ public class JooqExceptionTranslatorTests {
...
@@ -59,7 +59,7 @@ public class JooqExceptionTranslatorTests {
new
Object
[]
{
SQLDialect
.
POSTGRES_9_3
,
sqlException
(
"03000"
)
},
new
Object
[]
{
SQLDialect
.
POSTGRES_9_3
,
sqlException
(
"03000"
)
},
new
Object
[]
{
SQLDialect
.
POSTGRES_9_4
,
sqlException
(
"03000"
)
},
new
Object
[]
{
SQLDialect
.
POSTGRES_9_4
,
sqlException
(
"03000"
)
},
new
Object
[]
{
SQLDialect
.
POSTGRES_9_5
,
sqlException
(
"03000"
)
},
new
Object
[]
{
SQLDialect
.
POSTGRES_9_5
,
sqlException
(
"03000"
)
},
new
Object
[]
{
SQLDialect
.
SQLITE
,
sqlException
(
"21000"
)
}};
new
Object
[]
{
SQLDialect
.
SQLITE
,
sqlException
(
"21000"
)
}
};
}
}
private
static
SQLException
sqlException
(
String
sqlState
)
{
private
static
SQLException
sqlException
(
String
sqlState
)
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcValidatorTests.java
View file @
a03ddd33
...
@@ -54,8 +54,7 @@ public class WebMvcValidatorTests {
...
@@ -54,8 +54,7 @@ public class WebMvcValidatorTests {
@Test
@Test
public
void
wrapLocalValidatorFactoryBean
()
{
public
void
wrapLocalValidatorFactoryBean
()
{
WebMvcValidator
wrapper
=
load
(
WebMvcValidator
wrapper
=
load
(
LocalValidatorFactoryBeanConfig
.
class
);
LocalValidatorFactoryBeanConfig
.
class
);
assertThat
(
wrapper
.
supports
(
SampleData
.
class
)).
isTrue
();
assertThat
(
wrapper
.
supports
(
SampleData
.
class
)).
isTrue
();
MapBindingResult
errors
=
new
MapBindingResult
(
new
HashMap
<
String
,
Object
>(),
MapBindingResult
errors
=
new
MapBindingResult
(
new
HashMap
<
String
,
Object
>(),
"test"
);
"test"
);
...
...
spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
View file @
a03ddd33
...
@@ -102,7 +102,8 @@ public final class LoggerConfiguration {
...
@@ -102,7 +102,8 @@ public final class LoggerConfiguration {
rtn
=
rtn
&&
ObjectUtils
.
nullSafeEquals
(
this
.
name
,
other
.
name
);
rtn
=
rtn
&&
ObjectUtils
.
nullSafeEquals
(
this
.
name
,
other
.
name
);
rtn
=
rtn
&&
ObjectUtils
.
nullSafeEquals
(
this
.
configuredLevel
,
rtn
=
rtn
&&
ObjectUtils
.
nullSafeEquals
(
this
.
configuredLevel
,
other
.
configuredLevel
);
other
.
configuredLevel
);
rtn
=
rtn
&&
ObjectUtils
.
nullSafeEquals
(
this
.
effectiveLevel
,
other
.
effectiveLevel
);
rtn
=
rtn
&&
ObjectUtils
.
nullSafeEquals
(
this
.
effectiveLevel
,
other
.
effectiveLevel
);
return
rtn
;
return
rtn
;
}
}
return
super
.
equals
(
obj
);
return
super
.
equals
(
obj
);
...
...
spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
View file @
a03ddd33
...
@@ -263,11 +263,11 @@ public class UndertowEmbeddedServletContainerFactoryTests
...
@@ -263,11 +263,11 @@ public class UndertowEmbeddedServletContainerFactoryTests
}
}
private
ServletContainer
getServletContainerFromNewFactory
()
{
private
ServletContainer
getServletContainerFromNewFactory
()
{
UndertowEmbeddedServletContainer
container
=
(
UndertowEmbeddedServletContainer
)
UndertowEmbeddedServletContainer
container
=
(
UndertowEmbeddedServletContainer
)
getFactory
()
getFactory
()
.
getEmbeddedServletContainer
();
.
getEmbeddedServletContainer
();
try
{
try
{
return
((
DeploymentManager
)
ReflectionTestUtils
.
getField
(
container
,
"manager"
))
return
((
DeploymentManager
)
ReflectionTestUtils
.
getField
(
container
,
.
getDeployment
().
getServletContainer
();
"manager"
))
.
getDeployment
().
getServletContainer
();
}
}
finally
{
finally
{
container
.
stop
();
container
.
stop
();
...
...
spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosPropertiesTests.java
View file @
a03ddd33
...
@@ -75,8 +75,7 @@ public class AtomikosPropertiesTests {
...
@@ -75,8 +75,7 @@ public class AtomikosPropertiesTests {
assertThat
(
properties
).
contains
(
defaultOf
(
defaultSettings
,
assertThat
(
properties
).
contains
(
defaultOf
(
defaultSettings
,
"com.atomikos.icatch.max_timeout"
,
"com.atomikos.icatch.max_timeout"
,
"com.atomikos.icatch.default_jta_timeout"
,
"com.atomikos.icatch.default_jta_timeout"
,
"com.atomikos.icatch.max_actives"
,
"com.atomikos.icatch.max_actives"
,
"com.atomikos.icatch.enable_logging"
,
"com.atomikos.icatch.enable_logging"
,
"com.atomikos.icatch.serial_jta_transactions"
,
"com.atomikos.icatch.serial_jta_transactions"
,
"com.atomikos.icatch.force_shutdown_on_vm_exit"
,
"com.atomikos.icatch.force_shutdown_on_vm_exit"
,
"com.atomikos.icatch.log_base_name"
,
"com.atomikos.icatch.log_base_name"
,
...
@@ -96,7 +95,8 @@ public class AtomikosPropertiesTests {
...
@@ -96,7 +95,8 @@ public class AtomikosPropertiesTests {
private
Properties
loadDefaultSettings
()
{
private
Properties
loadDefaultSettings
()
{
try
{
try
{
Class
<?>
target
=
ClassUtils
.
forName
(
"com.atomikos.icatch.standalone.UserTransactionServiceImp"
,
Class
<?>
target
=
ClassUtils
.
forName
(
"com.atomikos.icatch.standalone.UserTransactionServiceImp"
,
getClass
().
getClassLoader
());
getClass
().
getClassLoader
());
Method
m
=
target
.
getMethod
(
"getDefaultProperties"
);
Method
m
=
target
.
getMethod
(
"getDefaultProperties"
);
m
.
setAccessible
(
true
);
m
.
setAccessible
(
true
);
...
...
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