Skip to content

Commit 9f920be

Browse files
committed
Merge pull request #44247 from nosan
* pr/44247: Polish contribution Polish Closes gh-44247
2 parents 1710ff4 + 9dea179 commit 9f920be

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ default SanitizableData applyUnlessFiltered(SanitizableData data) {
7979
* @see #filter()
8080
* @see #sanitizeValue()
8181
*/
82-
default SanitizingFunction ifLikelySenstive() {
83-
return ifLikelyCredential().ifLikelyUri().ifLikelySenstiveProperty().ifVcapServices();
82+
default SanitizingFunction ifLikelySensitive() {
83+
return ifLikelyCredential().ifLikelyUri().ifLikelySensitiveProperty().ifVcapServices();
8484
}
8585

8686
/**
@@ -121,7 +121,7 @@ default SanitizingFunction ifLikelyUri() {
121121
* @see #filter()
122122
* @see #sanitizeValue()
123123
*/
124-
default SanitizingFunction ifLikelySenstiveProperty() {
124+
default SanitizingFunction ifLikelySensitiveProperty() {
125125
return ifKeyMatches("sun.java.command", "^spring[._]application[._]json$");
126126
}
127127

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ void overridingDefaultSanitizingFunction() {
9595

9696
@Test
9797
void overridingDefaultSanitizingFunctionWithFiltered() {
98-
Sanitizer sanitizer = new Sanitizer(List.of(SanitizingFunction.sanitizeValue().ifLikelySenstive()));
98+
Sanitizer sanitizer = new Sanitizer(List.of(SanitizingFunction.sanitizeValue().ifLikelySensitive()));
9999
SanitizableData other = new SanitizableData(null, "other", "123456");
100100
SanitizableData password = new SanitizableData(null, "password", "123456");
101101
assertThat(sanitizer.sanitize(other, true)).isEqualTo("123456");

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ void applyUnlessFilteredWhenHasFilterTestingFalseReturnsUnfiltered() {
5757
}
5858

5959
@Test
60-
void ifLikelySenstiveFiltersExpected() {
61-
SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySenstive();
60+
void ifLikelySensitiveFiltersExpected() {
61+
SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySensitive();
6262
assertThat(function).satisfies(this::likelyCredentialChecks, this::likelyUriChecks,
6363
this::likelySenstivePropertyChecks, this::vcapServicesChecks);
6464
}
@@ -101,8 +101,8 @@ private void likelyUriChecks(SanitizingFunction function) {
101101
}
102102

103103
@Test
104-
void ifLikelySenstivePropertyFiltersExpected() {
105-
SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySenstiveProperty();
104+
void ifLikelySensitivePropertyFiltersExpected() {
105+
SanitizingFunction function = SanitizingFunction.sanitizeValue().ifLikelySensitiveProperty();
106106
assertThat(function).satisfies(this::likelySenstivePropertyChecks);
107107
}
108108

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
{
310310
"name": "logging.structured.json.stacktrace.printer",
311311
"type": "java.lang.String",
312-
"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."
312+
"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."
313313
},
314314
{
315315
"name": "logging.structured.json.stacktrace.root",

0 commit comments

Comments
 (0)