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
c826310f
Commit
c826310f
authored
May 09, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
ba16f135
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
26 deletions
+27
-26
MetricsAutoConfigurationWithLog4j2AndLogbackTests.java
...cs/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java
+2
-3
HazelcastCacheMeterBinderProvider.java
...uate/metrics/cache/HazelcastCacheMeterBinderProvider.java
+1
-4
HibernateJpaConfiguration.java
...boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
+5
-4
HibernateJpaAutoConfigurationTests.java
...configure/orm/jpa/HibernateJpaAutoConfigurationTests.java
+19
-15
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationWithLog4j2AndLogbackTests.java
View file @
c826310f
...
...
@@ -43,9 +43,8 @@ public class MetricsAutoConfigurationWithLog4j2AndLogbackTests {
@Test
public
void
doesNotConfigureLogbackMetrics
()
{
this
.
contextRunner
.
run
((
context
)
->
{
assertThat
(
context
).
doesNotHaveBean
(
LogbackMetrics
.
class
);
});
this
.
contextRunner
.
run
(
(
context
)
->
assertThat
(
context
).
doesNotHaveBean
(
LogbackMetrics
.
class
));
}
}
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/cache/HazelcastCacheMeterBinderProvider.java
View file @
c826310f
...
...
@@ -16,7 +16,6 @@
package
org
.
springframework
.
boot
.
actuate
.
metrics
.
cache
;
import
com.hazelcast.core.IMap
;
import
com.hazelcast.spring.cache.HazelcastCache
;
import
io.micrometer.core.instrument.Tag
;
import
io.micrometer.core.instrument.binder.MeterBinder
;
...
...
@@ -32,10 +31,8 @@ public class HazelcastCacheMeterBinderProvider
implements
CacheMeterBinderProvider
<
HazelcastCache
>
{
@Override
@SuppressWarnings
(
"unchecked"
)
public
MeterBinder
getMeterBinder
(
HazelcastCache
cache
,
Iterable
<
Tag
>
tags
)
{
return
new
HazelcastCacheMetrics
((
IMap
<
Object
,
Object
>)
cache
.
getNativeCache
(),
tags
);
return
new
HazelcastCacheMetrics
(
cache
.
getNativeCache
(),
tags
);
}
}
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
View file @
c826310f
...
...
@@ -112,7 +112,8 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration {
ImplicitNamingStrategy
implicitNamingStrategy
,
List
<
HibernatePropertiesCustomizer
>
hibernatePropertiesCustomizers
)
{
if
(
physicalNamingStrategy
!=
null
||
implicitNamingStrategy
!=
null
)
{
LinkedList
<
HibernatePropertiesCustomizer
>
customizers
=
new
LinkedList
<>(
hibernatePropertiesCustomizers
);
LinkedList
<
HibernatePropertiesCustomizer
>
customizers
=
new
LinkedList
<>(
hibernatePropertiesCustomizers
);
customizers
.
addFirst
(
new
NamingStrategiesHibernatePropertiesCustomizer
(
physicalNamingStrategy
,
implicitNamingStrategy
));
return
customizers
;
...
...
@@ -129,9 +130,9 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration {
protected
Map
<
String
,
Object
>
getVendorProperties
()
{
Supplier
<
String
>
defaultDdlMode
=
()
->
this
.
defaultDdlAutoProvider
.
getDefaultDdlAuto
(
getDataSource
());
return
new
LinkedHashMap
<>(
getProperties
()
.
getHibernateProperties
(
new
HibernateSettings
().
ddlAuto
(
defaultDdlMode
)
.
hibernatePropertiesCustomizers
(
return
new
LinkedHashMap
<>(
getProperties
().
getHibernateProperties
(
new
HibernateSettings
(
)
.
ddlAuto
(
defaultDdlMode
).
hibernatePropertiesCustomizers
(
this
.
hibernatePropertiesCustomizers
)));
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java
View file @
c826310f
...
...
@@ -278,10 +278,11 @@ public class HibernateJpaAutoConfigurationTests
contextRunner
()
.
withUserConfiguration
(
TestPhysicalNamingStrategyConfiguration
.
class
)
.
run
((
context
)
->
{
Map
<
String
,
Object
>
hibernateProperties
=
context
.
getBean
(
HibernateJpaConfiguration
.
class
).
getVendorProperties
();
assertThat
(
hibernateProperties
).
contains
(
entry
(
"hibernate.physical_naming_strategy"
,
Map
<
String
,
Object
>
hibernateProperties
=
context
.
getBean
(
HibernateJpaConfiguration
.
class
)
.
getVendorProperties
();
assertThat
(
hibernateProperties
)
.
contains
(
entry
(
"hibernate.physical_naming_strategy"
,
context
.
getBean
(
"testPhysicalNamingStrategy"
)));
assertThat
(
hibernateProperties
)
.
doesNotContainKeys
(
"hibernate.ejb.naming_strategy"
);
...
...
@@ -293,10 +294,11 @@ public class HibernateJpaAutoConfigurationTests
contextRunner
()
.
withUserConfiguration
(
TestImplicitNamingStrategyConfiguration
.
class
)
.
run
((
context
)
->
{
Map
<
String
,
Object
>
hibernateProperties
=
context
.
getBean
(
HibernateJpaConfiguration
.
class
).
getVendorProperties
();
assertThat
(
hibernateProperties
).
contains
(
entry
(
"hibernate.implicit_naming_strategy"
,
Map
<
String
,
Object
>
hibernateProperties
=
context
.
getBean
(
HibernateJpaConfiguration
.
class
)
.
getVendorProperties
();
assertThat
(
hibernateProperties
)
.
contains
(
entry
(
"hibernate.implicit_naming_strategy"
,
context
.
getBean
(
"testImplicitNamingStrategy"
)));
assertThat
(
hibernateProperties
)
.
doesNotContainKeys
(
"hibernate.ejb.naming_strategy"
);
...
...
@@ -312,8 +314,9 @@ public class HibernateJpaAutoConfigurationTests
"spring.jpa.hibernate.naming.physical-strategy:com.example.Physical"
,
"spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit"
)
.
run
((
context
)
->
{
Map
<
String
,
Object
>
hibernateProperties
=
context
.
getBean
(
HibernateJpaConfiguration
.
class
).
getVendorProperties
();
Map
<
String
,
Object
>
hibernateProperties
=
context
.
getBean
(
HibernateJpaConfiguration
.
class
)
.
getVendorProperties
();
assertThat
(
hibernateProperties
).
contains
(
entry
(
"hibernate.physical_naming_strategy"
,
context
.
getBean
(
"testPhysicalNamingStrategy"
)),
...
...
@@ -335,10 +338,12 @@ public class HibernateJpaAutoConfigurationTests
"spring.jpa.hibernate.naming.physical-strategy:com.example.Physical"
,
"spring.jpa.hibernate.naming.implicit-strategy:com.example.Implicit"
)
.
run
((
context
)
->
{
Map
<
String
,
Object
>
hibernateProperties
=
context
.
getBean
(
HibernateJpaConfiguration
.
class
).
getVendorProperties
();
TestHibernatePropertiesCustomizerConfiguration
configuration
=
context
.
getBean
(
TestHibernatePropertiesCustomizerConfiguration
.
class
);
Map
<
String
,
Object
>
hibernateProperties
=
context
.
getBean
(
HibernateJpaConfiguration
.
class
)
.
getVendorProperties
();
TestHibernatePropertiesCustomizerConfiguration
configuration
=
context
.
getBean
(
TestHibernatePropertiesCustomizerConfiguration
.
class
);
assertThat
(
hibernateProperties
).
contains
(
entry
(
"hibernate.physical_naming_strategy"
,
configuration
.
physicalNamingStrategy
),
...
...
@@ -349,7 +354,6 @@ public class HibernateJpaAutoConfigurationTests
});
}
@Configuration
@TestAutoConfigurationPackage
(
City
.
class
)
static
class
TestInitializedJpaConfiguration
{
...
...
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