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
8ee47758
Commit
8ee47758
authored
Sep 04, 2018
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
2af8a961
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
14 additions
and
23 deletions
+14
-23
OnlyOnceLoggingDenyMeterFilter.java
...autoconfigure/metrics/OnlyOnceLoggingDenyMeterFilter.java
+4
-2
CloudFoundryWebFluxEndpointIntegrationTests.java
...reactive/CloudFoundryWebFluxEndpointIntegrationTests.java
+0
-7
MetricsRun.java
...k/boot/actuate/autoconfigure/metrics/test/MetricsRun.java
+1
-0
SecurityDataConfiguration.java
...oot/autoconfigure/security/SecurityDataConfiguration.java
+1
-3
ClientsConfiguredCondition.java
...re/security/oauth2/client/ClientsConfiguredCondition.java
+1
-1
RedisAutoConfigurationTests.java
...autoconfigure/data/redis/RedisAutoConfigurationTests.java
+2
-2
TomcatWebServerFactoryCustomizerTests.java
...e/web/embedded/TomcatWebServerFactoryCustomizerTests.java
+1
-0
KafkaStreamsBeanExample.java
...ingframework/boot/docs/kafka/KafkaStreamsBeanExample.java
+1
-1
WebMvcTypeExcludeFilter.java
...st/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java
+1
-0
SpringBootMockMvcBuilderCustomizerTests.java
.../web/servlet/SpringBootMockMvcBuilderCustomizerTests.java
+1
-1
LombokAccessLevelOverwriteDefaultProperties.java
...e/lombok/LombokAccessLevelOverwriteDefaultProperties.java
+1
-0
SpringApplicationJsonEnvironmentPostProcessor.java
...ot/env/SpringApplicationJsonEnvironmentPostProcessor.java
+0
-6
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/OnlyOnceLoggingDenyMeterFilter.java
View file @
8ee47758
...
@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
...
@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import
java.util.function.Supplier
;
import
java.util.function.Supplier
;
import
io.micrometer.core.instrument.Meter
;
import
io.micrometer.core.instrument.Meter
;
import
io.micrometer.core.instrument.Meter.Id
;
import
io.micrometer.core.instrument.config.MeterFilter
;
import
io.micrometer.core.instrument.config.MeterFilter
;
import
io.micrometer.core.instrument.config.MeterFilterReply
;
import
io.micrometer.core.instrument.config.MeterFilterReply
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -28,7 +29,8 @@ import org.slf4j.LoggerFactory;
...
@@ -28,7 +29,8 @@ import org.slf4j.LoggerFactory;
import
org.springframework.util.Assert
;
import
org.springframework.util.Assert
;
/**
/**
* {@link MeterFilter} to log only once a warning message and deny {@link Meter.Id}.
* {@link MeterFilter} to log only once a warning message and deny a {@link Meter}
* {@link Id}.
*
*
* @author Jon Schneider
* @author Jon Schneider
* @author Dmytro Nosan
* @author Dmytro Nosan
...
@@ -49,7 +51,7 @@ public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter {
...
@@ -49,7 +51,7 @@ public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter {
}
}
@Override
@Override
public
MeterFilterReply
accept
(
Meter
.
Id
id
)
{
public
MeterFilterReply
accept
(
Id
id
)
{
if
(
this
.
logger
.
isWarnEnabled
()
if
(
this
.
logger
.
isWarnEnabled
()
&&
this
.
alreadyWarned
.
compareAndSet
(
false
,
true
))
{
&&
this
.
alreadyWarned
.
compareAndSet
(
false
,
true
))
{
this
.
logger
.
warn
(
this
.
message
.
get
());
this
.
logger
.
warn
(
this
.
message
.
get
());
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/CloudFoundryWebFluxEndpointIntegrationTests.java
View file @
8ee47758
...
@@ -167,13 +167,6 @@ public class CloudFoundryWebFluxEndpointIntegrationTests {
...
@@ -167,13 +167,6 @@ public class CloudFoundryWebFluxEndpointIntegrationTests {
.
jsonPath
(
"_links.test-part"
).
doesNotExist
()));
.
jsonPath
(
"_links.test-part"
).
doesNotExist
()));
}
}
private
AnnotationConfigReactiveWebServerApplicationContext
createApplicationContext
(
Class
<?>...
config
)
{
AnnotationConfigReactiveWebServerApplicationContext
context
=
new
AnnotationConfigReactiveWebServerApplicationContext
();
context
.
register
(
config
);
return
context
;
}
private
ContextConsumer
<
AssertableReactiveWebApplicationContext
>
withWebTestClient
(
private
ContextConsumer
<
AssertableReactiveWebApplicationContext
>
withWebTestClient
(
Consumer
<
WebTestClient
>
clientConsumer
)
{
Consumer
<
WebTestClient
>
clientConsumer
)
{
return
(
context
)
->
{
return
(
context
)
->
{
...
...
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsRun.java
View file @
8ee47758
...
@@ -93,6 +93,7 @@ public final class MetricsRun {
...
@@ -93,6 +93,7 @@ public final class MetricsRun {
return
(
contextRunner
)
->
apply
(
contextRunner
,
exportAutoConfigurations
);
return
(
contextRunner
)
->
apply
(
contextRunner
,
exportAutoConfigurations
);
}
}
@SuppressWarnings
(
"unchecked"
)
private
static
<
T
extends
AbstractApplicationContextRunner
<?,
?,
?>>
T
apply
(
private
static
<
T
extends
AbstractApplicationContextRunner
<?,
?,
?>>
T
apply
(
T
contextRunner
,
Class
<?>[]
exportAutoConfigurations
)
{
T
contextRunner
,
Class
<?>[]
exportAutoConfigurations
)
{
for
(
Class
<?>
configuration
:
exportAutoConfigurations
)
{
for
(
Class
<?>
configuration
:
exportAutoConfigurations
)
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityDataConfiguration.java
View file @
8ee47758
...
@@ -20,7 +20,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
...
@@ -20,7 +20,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.data.repository.query.spi.EvaluationContextExtensionSupport
;
import
org.springframework.security.data.repository.query.SecurityEvaluationContextExtension
;
import
org.springframework.security.data.repository.query.SecurityEvaluationContextExtension
;
/**
/**
...
@@ -30,8 +29,7 @@ import org.springframework.security.data.repository.query.SecurityEvaluationCont
...
@@ -30,8 +29,7 @@ import org.springframework.security.data.repository.query.SecurityEvaluationCont
* @since 1.3
* @since 1.3
*/
*/
@Configuration
@Configuration
@ConditionalOnClass
({
SecurityEvaluationContextExtension
.
class
,
@ConditionalOnClass
(
SecurityEvaluationContextExtension
.
class
)
EvaluationContextExtensionSupport
.
class
})
public
class
SecurityDataConfiguration
{
public
class
SecurityDataConfiguration
{
@Bean
@Bean
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/ClientsConfiguredCondition.java
View file @
8ee47758
...
@@ -63,7 +63,7 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
...
@@ -63,7 +63,7 @@ public class ClientsConfiguredCondition extends SpringBootCondition {
private
Map
<
String
,
OAuth2ClientProperties
.
BaseClientRegistration
>
getRegistrations
(
private
Map
<
String
,
OAuth2ClientProperties
.
BaseClientRegistration
>
getRegistrations
(
Environment
environment
)
{
Environment
environment
)
{
Map
<
String
,
OAuth2ClientProperties
.
BaseClientRegistration
>
registrations
=
new
HashMap
();
Map
<
String
,
OAuth2ClientProperties
.
BaseClientRegistration
>
registrations
=
new
HashMap
<>
();
Map
<
String
,
OAuth2ClientProperties
.
LoginClientRegistration
>
loginClientRegistrations
=
Binder
Map
<
String
,
OAuth2ClientProperties
.
LoginClientRegistration
>
loginClientRegistrations
=
Binder
.
get
(
environment
).
bind
(
"spring.security.oauth2.client.registration.login"
,
.
get
(
environment
).
bind
(
"spring.security.oauth2.client.registration.login"
,
STRING_LOGIN_REGISTRATION_MAP
)
STRING_LOGIN_REGISTRATION_MAP
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java
View file @
8ee47758
...
@@ -159,8 +159,8 @@ public class RedisAutoConfigurationTests {
...
@@ -159,8 +159,8 @@ public class RedisAutoConfigurationTests {
LettuceConnectionFactory
cf
=
context
LettuceConnectionFactory
cf
=
context
.
getBean
(
LettuceConnectionFactory
.
class
);
.
getBean
(
LettuceConnectionFactory
.
class
);
assertThat
(
cf
.
getHostName
()).
isEqualTo
(
"foo"
);
assertThat
(
cf
.
getHostName
()).
isEqualTo
(
"foo"
);
GenericObjectPoolConfig
poolConfig
=
getPoolingClientConfiguration
(
cf
)
GenericObjectPoolConfig
<?>
poolConfig
=
getPoolingClientConfiguration
(
.
getPoolConfig
();
cf
)
.
getPoolConfig
();
assertThat
(
poolConfig
.
getMinIdle
()).
isEqualTo
(
1
);
assertThat
(
poolConfig
.
getMinIdle
()).
isEqualTo
(
1
);
assertThat
(
poolConfig
.
getMaxIdle
()).
isEqualTo
(
4
);
assertThat
(
poolConfig
.
getMaxIdle
()).
isEqualTo
(
4
);
assertThat
(
poolConfig
.
getMaxTotal
()).
isEqualTo
(
16
);
assertThat
(
poolConfig
.
getMaxTotal
()).
isEqualTo
(
16
);
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java
View file @
8ee47758
...
@@ -166,6 +166,7 @@ public class TomcatWebServerFactoryCustomizerTests {
...
@@ -166,6 +166,7 @@ public class TomcatWebServerFactoryCustomizerTests {
assertThat
(
remoteIpValve
.
getInternalProxies
()).
isEqualTo
(
"192.168.0.1"
);
assertThat
(
remoteIpValve
.
getInternalProxies
()).
isEqualTo
(
"192.168.0.1"
);
}
}
@SuppressWarnings
(
"unchecked"
)
@Test
@Test
public
void
customStaticResourceAllowCaching
()
{
public
void
customStaticResourceAllowCaching
()
{
bind
(
"server.tomcat.resource.allow-caching=false"
);
bind
(
"server.tomcat.resource.allow-caching=false"
);
...
...
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/kafka/KafkaStreamsBeanExample.java
View file @
8ee47758
...
@@ -42,7 +42,7 @@ public class KafkaStreamsBeanExample {
...
@@ -42,7 +42,7 @@ public class KafkaStreamsBeanExample {
@Bean
@Bean
public
KStream
<
Integer
,
String
>
kStream
(
StreamsBuilder
streamsBuilder
)
{
public
KStream
<
Integer
,
String
>
kStream
(
StreamsBuilder
streamsBuilder
)
{
KStream
<
Integer
,
String
>
stream
=
streamsBuilder
.
stream
(
"ks1In"
);
KStream
<
Integer
,
String
>
stream
=
streamsBuilder
.
stream
(
"ks1In"
);
stream
.
map
((
k
,
v
)
->
new
KeyValue
(
k
,
v
.
toUpperCase
())).
to
(
"ks1Out"
,
stream
.
map
((
k
,
v
)
->
new
KeyValue
<>
(
k
,
v
.
toUpperCase
())).
to
(
"ks1Out"
,
Produced
.
with
(
Serdes
.
Integer
(),
new
JsonSerde
<>()));
Produced
.
with
(
Serdes
.
Integer
(),
new
JsonSerde
<>()));
return
stream
;
return
stream
;
}
}
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTypeExcludeFilter.java
View file @
8ee47758
...
@@ -126,6 +126,7 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
...
@@ -126,6 +126,7 @@ class WebMvcTypeExcludeFilter extends AnnotationCustomizableTypeExcludeFilter {
}
}
@Override
@Override
@SuppressWarnings
(
"deprecation"
)
protected
Set
<
Class
<?>>
getDefaultIncludes
()
{
protected
Set
<
Class
<?>>
getDefaultIncludes
()
{
if
(
this
.
annotation
.
secure
())
{
if
(
this
.
annotation
.
secure
())
{
if
(
ObjectUtils
.
isEmpty
(
this
.
annotation
.
controllers
()))
{
if
(
ObjectUtils
.
isEmpty
(
this
.
annotation
.
controllers
()))
{
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizerTests.java
View file @
8ee47758
...
@@ -56,7 +56,7 @@ public class SpringBootMockMvcBuilderCustomizerTests {
...
@@ -56,7 +56,7 @@ public class SpringBootMockMvcBuilderCustomizerTests {
DefaultMockMvcBuilder
builder
=
MockMvcBuilders
.
webAppContextSetup
(
context
);
DefaultMockMvcBuilder
builder
=
MockMvcBuilders
.
webAppContextSetup
(
context
);
this
.
customizer
=
new
SpringBootMockMvcBuilderCustomizer
(
context
);
this
.
customizer
=
new
SpringBootMockMvcBuilderCustomizer
(
context
);
this
.
customizer
.
customize
(
builder
);
this
.
customizer
.
customize
(
builder
);
FilterRegistrationBean
registrationBean
=
(
FilterRegistrationBean
)
context
FilterRegistrationBean
<?>
registrationBean
=
(
FilterRegistrationBean
<?>
)
context
.
getBean
(
"filterRegistrationBean"
);
.
getBean
(
"filterRegistrationBean"
);
Filter
testFilter
=
(
Filter
)
context
.
getBean
(
"testFilter"
);
Filter
testFilter
=
(
Filter
)
context
.
getBean
(
"testFilter"
);
Filter
otherTestFilter
=
registrationBean
.
getFilter
();
Filter
otherTestFilter
=
registrationBean
.
getFilter
();
...
...
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokAccessLevelOverwriteDefaultProperties.java
View file @
8ee47758
...
@@ -33,6 +33,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
...
@@ -33,6 +33,7 @@ import org.springframework.boot.configurationsample.ConfigurationProperties;
@ConfigurationProperties
(
prefix
=
"accesslevel.overwrite.default"
)
@ConfigurationProperties
(
prefix
=
"accesslevel.overwrite.default"
)
public
class
LombokAccessLevelOverwriteDefaultProperties
{
public
class
LombokAccessLevelOverwriteDefaultProperties
{
@SuppressWarnings
(
"unused"
)
private
String
name0
;
private
String
name0
;
@Getter
(
AccessLevel
.
PUBLIC
)
@Getter
(
AccessLevel
.
PUBLIC
)
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java
View file @
8ee47758
...
@@ -21,9 +21,6 @@ import java.util.LinkedHashMap;
...
@@ -21,9 +21,6 @@ import java.util.LinkedHashMap;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.Objects
;
import
org.apache.commons.logging.Log
;
import
org.apache.commons.logging.LogFactory
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.json.JsonParser
;
import
org.springframework.boot.json.JsonParser
;
import
org.springframework.boot.json.JsonParserFactory
;
import
org.springframework.boot.json.JsonParserFactory
;
...
@@ -74,9 +71,6 @@ public class SpringApplicationJsonEnvironmentPostProcessor
...
@@ -74,9 +71,6 @@ public class SpringApplicationJsonEnvironmentPostProcessor
*/
*/
public
static
final
int
DEFAULT_ORDER
=
Ordered
.
HIGHEST_PRECEDENCE
+
5
;
public
static
final
int
DEFAULT_ORDER
=
Ordered
.
HIGHEST_PRECEDENCE
+
5
;
private
static
final
Log
logger
=
LogFactory
.
getLog
(
SpringApplicationJsonEnvironmentPostProcessor
.
class
);
private
int
order
=
DEFAULT_ORDER
;
private
int
order
=
DEFAULT_ORDER
;
@Override
@Override
...
...
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