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
de01e7aa
Commit
de01e7aa
authored
May 23, 2018
by
Johnny Lim
Committed by
Stephane Nicoll
May 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
See gh-13243
parent
f91b5374
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
10 deletions
+9
-10
HibernateMetricsAutoConfiguration.java
...re/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java
+1
-1
package-info.java
...t/actuate/autoconfigure/metrics/orm/jpa/package-info.java
+1
-1
HibernateMetricsAutoConfigurationTests.java
...trics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
+3
-4
HealthWebEndpointResponseMapperTests.java
.../actuate/health/HealthWebEndpointResponseMapperTests.java
+2
-2
production-ready-features.adoc
...oot-docs/src/main/asciidoc/production-ready-features.adoc
+1
-1
AbstractRunMojo.java
.../java/org/springframework/boot/maven/AbstractRunMojo.java
+1
-1
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java
View file @
de01e7aa
...
@@ -71,7 +71,7 @@ public class HibernateMetricsAutoConfiguration {
...
@@ -71,7 +71,7 @@ public class HibernateMetricsAutoConfiguration {
}
}
/**
/**
* Get the name of a {@link EntityManagerFactory} based on its {@code beanName}.
* Get the name of a
n
{@link EntityManagerFactory} based on its {@code beanName}.
* @param beanName the name of the {@link EntityManagerFactory} bean
* @param beanName the name of the {@link EntityManagerFactory} bean
* @return a name for the given entity manager factory
* @return a name for the given entity manager factory
*/
*/
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/package-info.java
View file @
de01e7aa
...
@@ -15,6 +15,6 @@
...
@@ -15,6 +15,6 @@
*/
*/
/**
/**
* Auto-configuration for J
DBC
metrics.
* Auto-configuration for J
PA
metrics.
*/
*/
package
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
metrics
.
orm
.
jpa
;
package
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
metrics
.
orm
.
jpa
;
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java
View file @
de01e7aa
...
@@ -128,7 +128,7 @@ public class HibernateMetricsAutoConfigurationTests {
...
@@ -128,7 +128,7 @@ public class HibernateMetricsAutoConfigurationTests {
.
withUserConfiguration
(
.
withUserConfiguration
(
NonHibernateEntityManagerFactoryConfiguration
.
class
)
NonHibernateEntityManagerFactoryConfiguration
.
class
)
.
run
((
context
)
->
{
.
run
((
context
)
->
{
// ensure EntityManagerFactory is not a
n
Hibernate SessionFactory
// ensure EntityManagerFactory is not a Hibernate SessionFactory
assertThatThrownBy
(()
->
context
.
getBean
(
EntityManagerFactory
.
class
)
assertThatThrownBy
(()
->
context
.
getBean
(
EntityManagerFactory
.
class
)
.
unwrap
(
SessionFactory
.
class
))
.
unwrap
(
SessionFactory
.
class
))
.
isInstanceOf
(
PersistenceException
.
class
);
.
isInstanceOf
(
PersistenceException
.
class
);
...
@@ -178,9 +178,8 @@ public class HibernateMetricsAutoConfigurationTests {
...
@@ -178,9 +178,8 @@ public class HibernateMetricsAutoConfigurationTests {
DataSource
ds
)
{
DataSource
ds
)
{
Map
<
String
,
String
>
jpaProperties
=
new
HashMap
<>();
Map
<
String
,
String
>
jpaProperties
=
new
HashMap
<>();
jpaProperties
.
put
(
"hibernate.generate_statistics"
,
"true"
);
jpaProperties
.
put
(
"hibernate.generate_statistics"
,
"true"
);
EntityManagerFactoryBuilder
builder
=
new
EntityManagerFactoryBuilder
(
return
new
EntityManagerFactoryBuilder
(
new
HibernateJpaVendorAdapter
(),
new
HibernateJpaVendorAdapter
(),
jpaProperties
,
null
);
jpaProperties
,
null
).
dataSource
(
ds
).
packages
(
PACKAGE_CLASSES
).
build
();
return
builder
.
dataSource
(
ds
).
packages
(
PACKAGE_CLASSES
).
build
();
}
}
}
}
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthWebEndpointResponseMapperTests.java
View file @
de01e7aa
...
@@ -46,7 +46,7 @@ public class HealthWebEndpointResponseMapperTests {
...
@@ -46,7 +46,7 @@ public class HealthWebEndpointResponseMapperTests {
private
final
HealthStatusHttpMapper
statusHttpMapper
=
new
HealthStatusHttpMapper
();
private
final
HealthStatusHttpMapper
statusHttpMapper
=
new
HealthStatusHttpMapper
();
private
Set
<
String
>
autorizedRoles
=
Collections
.
singleton
(
"ACTUATOR"
);
private
Set
<
String
>
aut
h
orizedRoles
=
Collections
.
singleton
(
"ACTUATOR"
);
@Test
@Test
public
void
mapDetailsWithDisableDetailsDoesNotInvokeSupplier
()
{
public
void
mapDetailsWithDisableDetailsDoesNotInvokeSupplier
()
{
...
@@ -122,7 +122,7 @@ public class HealthWebEndpointResponseMapperTests {
...
@@ -122,7 +122,7 @@ public class HealthWebEndpointResponseMapperTests {
private
HealthWebEndpointResponseMapper
createMapper
(
ShowDetails
showDetails
)
{
private
HealthWebEndpointResponseMapper
createMapper
(
ShowDetails
showDetails
)
{
return
new
HealthWebEndpointResponseMapper
(
this
.
statusHttpMapper
,
showDetails
,
return
new
HealthWebEndpointResponseMapper
(
this
.
statusHttpMapper
,
showDetails
,
this
.
autorizedRoles
);
this
.
aut
h
orizedRoles
);
}
}
}
}
spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View file @
de01e7aa
...
@@ -1809,7 +1809,7 @@ Auto-configuration enables the instrumentation of all available Hibernate
...
@@ -1809,7 +1809,7 @@ Auto-configuration enables the instrumentation of all available Hibernate
Metrics are also tagged by the name of the `EntityManagerFactory` that is derived from
Metrics are also tagged by the name of the `EntityManagerFactory` that is derived from
the bean name.
the bean name.
To enable statistics, the standardJPA property `hibernate.generate_statistics` must be
To enable statistics, the standard
JPA property `hibernate.generate_statistics` must be
set to `true`. You can enable that on the auto-configured `EntityManagerFactory` as shown
set to `true`. You can enable that on the auto-configured `EntityManagerFactory` as shown
in the following example:
in the following example:
...
...
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View file @
de01e7aa
...
@@ -318,7 +318,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
...
@@ -318,7 +318,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
/**
/**
* Resolve the environment variables to use.
* Resolve the environment variables to use.
* @return a {@link EnvVariables} defining the environment variables
* @return a
n
{@link EnvVariables} defining the environment variables
*/
*/
protected
EnvVariables
resolveEnvVariables
()
{
protected
EnvVariables
resolveEnvVariables
()
{
return
new
EnvVariables
(
this
.
environmentVariables
);
return
new
EnvVariables
(
this
.
environmentVariables
);
...
...
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