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
b9fd99e2
Commit
b9fd99e2
authored
Jun 02, 2017
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
3cf8e81a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
20 deletions
+18
-20
CachePublicMetrics.java
...ngframework/boot/actuate/endpoint/CachePublicMetrics.java
+3
-1
ConfigurationPropertiesReportEndpoint.java
...tuate/endpoint/ConfigurationPropertiesReportEndpoint.java
+2
-1
AbstractHealthIndicator.java
...ramework/boot/actuate/health/AbstractHealthIndicator.java
+1
-1
ConfigurationPropertiesReportEndpointSerializationTests.java
...figurationPropertiesReportEndpointSerializationTests.java
+3
-5
ConditionalOnBean.java
...ework/boot/autoconfigure/condition/ConditionalOnBean.java
+3
-4
ConditionalOnMissingBean.java
...oot/autoconfigure/condition/ConditionalOnMissingBean.java
+3
-3
SessionAutoConfiguration.java
.../boot/autoconfigure/session/SessionAutoConfiguration.java
+2
-4
LocalDevToolsAutoConfiguration.java
...evtools/autoconfigure/LocalDevToolsAutoConfiguration.java
+1
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/CachePublicMetrics.java
View file @
b9fd99e2
...
@@ -105,7 +105,8 @@ public class CachePublicMetrics implements PublicMetrics {
...
@@ -105,7 +105,8 @@ public class CachePublicMetrics implements PublicMetrics {
}
}
private
Cache
unwrapIfNecessary
(
Cache
cache
)
{
private
Cache
unwrapIfNecessary
(
Cache
cache
)
{
if
(
ClassUtils
.
isPresent
(
"org.springframework.cache.transaction.TransactionAwareCacheDecorator"
,
if
(
ClassUtils
.
isPresent
(
"org.springframework.cache.transaction.TransactionAwareCacheDecorator"
,
getClass
().
getClassLoader
()))
{
getClass
().
getClassLoader
()))
{
return
TransactionAwareCacheDecoratorHandler
.
unwrapIfNecessary
(
cache
);
return
TransactionAwareCacheDecoratorHandler
.
unwrapIfNecessary
(
cache
);
}
}
...
@@ -165,6 +166,7 @@ public class CachePublicMetrics implements PublicMetrics {
...
@@ -165,6 +166,7 @@ public class CachePublicMetrics implements PublicMetrics {
}
}
return
cache
;
return
cache
;
}
}
}
}
}
}
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java
View file @
b9fd99e2
...
@@ -340,7 +340,8 @@ public class ConfigurationPropertiesReportEndpoint
...
@@ -340,7 +340,8 @@ public class ConfigurationPropertiesReportEndpoint
// that's what the metadata generator does. This filter is not used if there
// that's what the metadata generator does. This filter is not used if there
// is JSON metadata for the property, so it's mainly for user-defined beans.
// is JSON metadata for the property, so it's mainly for user-defined beans.
return
(
setter
!=
null
)
return
(
setter
!=
null
)
||
ClassUtils
.
getPackageName
(
parentType
).
equals
(
ClassUtils
.
getPackageName
(
type
))
||
ClassUtils
.
getPackageName
(
parentType
)
.
equals
(
ClassUtils
.
getPackageName
(
type
))
||
Map
.
class
.
isAssignableFrom
(
type
)
||
Map
.
class
.
isAssignableFrom
(
type
)
||
Collection
.
class
.
isAssignableFrom
(
type
);
||
Collection
.
class
.
isAssignableFrom
(
type
);
}
}
...
...
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthIndicator.java
View file @
b9fd99e2
/*
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
...
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java
View file @
b9fd99e2
/*
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -217,11 +217,9 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
...
@@ -217,11 +217,9 @@ public class ConfigurationPropertiesReportEndpointSerializationTests {
Map
<
String
,
Object
>
propertiesMap
=
(
Map
<
String
,
Object
>)
nestedProperties
Map
<
String
,
Object
>
propertiesMap
=
(
Map
<
String
,
Object
>)
nestedProperties
.
get
(
"properties"
);
.
get
(
"properties"
);
assertThat
(
propertiesMap
).
containsOnlyKeys
(
"bar"
,
"name"
,
"map"
,
"list"
);
assertThat
(
propertiesMap
).
containsOnlyKeys
(
"bar"
,
"name"
,
"map"
,
"list"
);
Map
<
String
,
Object
>
map
=
(
Map
<
String
,
Object
>)
propertiesMap
Map
<
String
,
Object
>
map
=
(
Map
<
String
,
Object
>)
propertiesMap
.
get
(
"map"
);
.
get
(
"map"
);
assertThat
(
map
).
containsOnly
(
entry
(
"entryOne"
,
true
));
assertThat
(
map
).
containsOnly
(
entry
(
"entryOne"
,
true
));
List
<
String
>
list
=
(
List
<
String
>)
propertiesMap
List
<
String
>
list
=
(
List
<
String
>)
propertiesMap
.
get
(
"list"
);
.
get
(
"list"
);
assertThat
(
list
).
containsExactly
(
"abc"
);
assertThat
(
list
).
containsExactly
(
"abc"
);
}
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java
View file @
b9fd99e2
/*
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -29,9 +29,8 @@ import org.springframework.context.annotation.Conditional;
...
@@ -29,9 +29,8 @@ import org.springframework.context.annotation.Conditional;
/**
/**
* {@link Conditional} that only matches when the specified bean classes and/or names are
* {@link Conditional} that only matches when the specified bean classes and/or names are
* already contained in the {@link BeanFactory}.
* already contained in the {@link BeanFactory}. When placed on a {@code @Bean} method,
* When placed on a {@code @Bean} method, the bean class default to the return type of
* the bean class default to the return type of the factory method:
* the factory method:
*
*
* <pre class="code">
* <pre class="code">
* @Configuration
* @Configuration
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
View file @
b9fd99e2
/*
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -31,8 +31,8 @@ import org.springframework.context.annotation.Conditional;
...
@@ -31,8 +31,8 @@ import org.springframework.context.annotation.Conditional;
* {@link Conditional} that only matches when the specified bean classes and/or names are
* {@link Conditional} that only matches when the specified bean classes and/or names are
* not already contained in the {@link BeanFactory}.
* not already contained in the {@link BeanFactory}.
* <p>
* <p>
* When placed on a {@code @Bean} method, the bean class default to the return type of
* When placed on a {@code @Bean} method, the bean class default to the return type of
the
*
the
factory method:
* factory method:
*
*
* <pre class="code">
* <pre class="code">
* @Configuration
* @Configuration
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java
View file @
b9fd99e2
...
@@ -102,10 +102,8 @@ public class SessionAutoConfiguration {
...
@@ -102,10 +102,8 @@ public class SessionAutoConfiguration {
+
"auto-configured, check your configuration (session store "
+
"auto-configured, check your configuration (session store "
+
"type is '"
+
storeType
.
name
().
toLowerCase
()
+
"')"
);
+
"type is '"
+
storeType
.
name
().
toLowerCase
()
+
"')"
);
}
}
else
{
throw
new
IllegalArgumentException
(
"No Spring Session store is "
throw
new
IllegalArgumentException
(
"No Spring Session store is "
+
"configured: set the 'spring.session.store-type' property"
);
+
"configured: set the 'spring.session.store-type' property"
);
}
}
}
}
}
...
...
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java
View file @
b9fd99e2
/*
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
...
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