Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source 
See gh-44247

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
This commit is contained in:
Dmytro Nosan
2025-02-12 21:58:48 +02:00
committed by Stéphane Nicoll
parent 1710ff4eb5
commit b9772cd6f1
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SanitizingFunction.java
View File

@@ -79,8 +79,8 @@ public interface SanitizingFunction {
* @see #filter()
* @see #sanitizeValue()
*/
default SanitizingFunction ifLikelySenstive() {
return ifLikelyCredential().ifLikelyUri().ifLikelySenstiveProperty().ifVcapServices();
default SanitizingFunction ifLikelySensitive() {
return ifLikelyCredential().ifLikelyUri().ifLikelySensitiveProperty().ifVcapServices();
}
/**
@@ -121,7 +121,7 @@ public interface SanitizingFunction {
* @see #filter()
* @see #sanitizeValue()
*/
default SanitizingFunction ifLikelySenstiveProperty() {
default SanitizingFunction ifLikelySensitiveProperty() {
return ifKeyMatches("sun.java.command", "^spring[._]application[._]json$");
}

4
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SanitizerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ class SanitizerTests {
@Test
void overridingDefaultSanitizingFunctionWithFiltered() {
Sanitizer sanitizer = new Sanitizer(List.of(SanitizingFunction.sanitizeValue().ifLikelySenstive()));
Sanitizer sanitizer = new Sanitizer(List.of(SanitizingFunction.sanitizeValue().ifLikelySensitive()));
SanitizableData other = new SanitizableData(null, "other", "123456");
SanitizableData password = new SanitizableData(null, "password", "123456");
assertThat(sanitizer.sanitize(other, true)).isEqualTo("123456");

8
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SanitizingFunctionTests.java
View File

@@ -57,8 +57,8 @@ class SanitizingFunctionTests {
}
@Test
void ifLikelySenstiveFiltersExpected() {
SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySenstive();
void ifLikelySensitiveFiltersExpected() {
SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySensitive();
assertThat(function).satisfies(this::likelyCredentialChecks, this::likelyUriChecks,
this::likelySenstivePropertyChecks, this::vcapServicesChecks);
}
@@ -101,8 +101,8 @@ class SanitizingFunctionTests {
}
@Test
void ifLikelySenstivePropertyFiltersExpected() {
SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySenstiveProperty();
void ifLikelySensitivePropertyFiltersExpected() {
SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySensitiveProperty();
assertThat(function).satisfies(this::likelySenstivePropertyChecks);
}

2
spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -309,7 +309,7 @@
{
"name": "logging.structured.json.stacktrace.printer",
"type": "java.lang.String",
"description": "Name of the printer to use. Can be 'standard', 'logging-system', or the fully-qualified class name of a StackTracePrinter. When not specified 'logging-system' or 'standard' will be used depening if other properties are set."
"description": "Name of the printer to use. Can be 'standard', 'logging-system', or the fully-qualified class name of a StackTracePrinter. When not specified 'logging-system' or 'standard' will be used depending if other properties are set."
},
{
"name": "logging.structured.json.stacktrace.root",