Skip to content

Commit 0b854bf

Browse files
izeyephilwebb
izeye
authored and
philwebb
committedNov 16, 2024
Replace "structure logging" with "structured logging"
See gh-43203
·
v3.5.0-M3v3.4.0
1 parent 68022ef commit 0b854bf

File tree

32 files changed

+66
-65
lines changed

32 files changed

+66
-65
lines changed
 

‎spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/logging.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ logging:
609609
corpname: mycorp
610610
----
611611

612-
TIP: For more advanced customizations, you can write your own class that implements the javadoc:org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer[] interface and declare it using the configprop:logging.structured.json.customizer[] property.
612+
TIP: For more advanced customizations, you can write your own class that implements the javadoc:org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer[] interface and declare it using the configprop:logging.structured.json.customizer[] property.
613613
You can also declare implementations by listing them in a `META-INF/spring.factories` file.
614614

615615

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ElasticCommonSchemaStructuredLogFormatter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.springframework.boot.logging.structured.CommonStructuredLogFormat;
2929
import org.springframework.boot.logging.structured.ElasticCommonSchemaProperties;
3030
import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter;
31-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
3231
import org.springframework.boot.logging.structured.StructuredLogFormatter;
32+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
3333
import org.springframework.core.env.Environment;
3434
import org.springframework.util.ObjectUtils;
3535

@@ -43,7 +43,7 @@
4343
class ElasticCommonSchemaStructuredLogFormatter extends JsonWriterStructuredLogFormatter<LogEvent> {
4444

4545
ElasticCommonSchemaStructuredLogFormatter(Environment environment,
46-
StructureLoggingJsonMembersCustomizer<?> customizer) {
46+
StructuredLoggingJsonMembersCustomizer<?> customizer) {
4747
super((members) -> jsonMembers(environment, members), customizer);
4848
}
4949

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/GraylogExtendedLogFormatStructuredLogFormatter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import org.springframework.boot.logging.structured.CommonStructuredLogFormat;
3838
import org.springframework.boot.logging.structured.GraylogExtendedLogFormatProperties;
3939
import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter;
40-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
4140
import org.springframework.boot.logging.structured.StructuredLogFormatter;
41+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
4242
import org.springframework.core.env.Environment;
4343
import org.springframework.core.log.LogMessage;
4444
import org.springframework.util.Assert;
@@ -70,7 +70,7 @@ class GraylogExtendedLogFormatStructuredLogFormatter extends JsonWriterStructure
7070
private static final Set<String> ADDITIONAL_FIELD_ILLEGAL_KEYS = Set.of("id", "_id");
7171

7272
GraylogExtendedLogFormatStructuredLogFormatter(Environment environment,
73-
StructureLoggingJsonMembersCustomizer<?> customizer) {
73+
StructuredLoggingJsonMembersCustomizer<?> customizer) {
7474
super((members) -> jsonMembers(environment, members), customizer);
7575
}
7676

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/LogstashStructuredLogFormatter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.springframework.boot.json.JsonWriter;
3333
import org.springframework.boot.logging.structured.CommonStructuredLogFormat;
3434
import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter;
35-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
3635
import org.springframework.boot.logging.structured.StructuredLogFormatter;
36+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
3737
import org.springframework.util.CollectionUtils;
3838

3939
/**
@@ -44,7 +44,7 @@
4444
*/
4545
class LogstashStructuredLogFormatter extends JsonWriterStructuredLogFormatter<LogEvent> {
4646

47-
LogstashStructuredLogFormatter(StructureLoggingJsonMembersCustomizer<?> customizer) {
47+
LogstashStructuredLogFormatter(StructuredLoggingJsonMembersCustomizer<?> customizer) {
4848
super(LogstashStructuredLogFormatter::jsonMembers, customizer);
4949
}
5050

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/StructuredLogLayout.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
import org.apache.logging.log4j.core.layout.AbstractStringLayout;
3131

3232
import org.springframework.boot.logging.structured.CommonStructuredLogFormat;
33-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
3433
import org.springframework.boot.logging.structured.StructuredLogFormatter;
3534
import org.springframework.boot.logging.structured.StructuredLogFormatterFactory;
3635
import org.springframework.boot.logging.structured.StructuredLogFormatterFactory.CommonFormatters;
36+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
3737
import org.springframework.boot.util.Instantiator;
3838
import org.springframework.core.env.Environment;
3939
import org.springframework.util.Assert;
@@ -111,21 +111,21 @@ private void addCommonFormatters(CommonFormatters<LogEvent> commonFormatters) {
111111

112112
private ElasticCommonSchemaStructuredLogFormatter createEcsFormatter(Instantiator<?> instantiator) {
113113
Environment environment = instantiator.getArg(Environment.class);
114-
StructureLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
115-
.getArg(StructureLoggingJsonMembersCustomizer.class);
114+
StructuredLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
115+
.getArg(StructuredLoggingJsonMembersCustomizer.class);
116116
return new ElasticCommonSchemaStructuredLogFormatter(environment, jsonMembersCustomizer);
117117
}
118118

119119
private GraylogExtendedLogFormatStructuredLogFormatter createGraylogFormatter(Instantiator<?> instantiator) {
120120
Environment environment = instantiator.getArg(Environment.class);
121-
StructureLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
122-
.getArg(StructureLoggingJsonMembersCustomizer.class);
121+
StructuredLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
122+
.getArg(StructuredLoggingJsonMembersCustomizer.class);
123123
return new GraylogExtendedLogFormatStructuredLogFormatter(environment, jsonMembersCustomizer);
124124
}
125125

126126
private LogstashStructuredLogFormatter createLogstashFormatter(Instantiator<?> instantiator) {
127-
StructureLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
128-
.getArg(StructureLoggingJsonMembersCustomizer.class);
127+
StructuredLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
128+
.getArg(StructuredLoggingJsonMembersCustomizer.class);
129129
return new LogstashStructuredLogFormatter(jsonMembersCustomizer);
130130
}
131131

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/ElasticCommonSchemaStructuredLogFormatter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.springframework.boot.logging.structured.CommonStructuredLogFormat;
2929
import org.springframework.boot.logging.structured.ElasticCommonSchemaProperties;
3030
import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter;
31-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
3231
import org.springframework.boot.logging.structured.StructuredLogFormatter;
32+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
3333
import org.springframework.core.env.Environment;
3434

3535
/**
@@ -45,7 +45,7 @@ class ElasticCommonSchemaStructuredLogFormatter extends JsonWriterStructuredLogF
4545
(pair) -> pair.value);
4646

4747
ElasticCommonSchemaStructuredLogFormatter(Environment environment, ThrowableProxyConverter throwableProxyConverter,
48-
StructureLoggingJsonMembersCustomizer<?> customizer) {
48+
StructuredLoggingJsonMembersCustomizer<?> customizer) {
4949
super((members) -> jsonMembers(environment, throwableProxyConverter, members), customizer);
5050
}
5151

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/GraylogExtendedLogFormatStructuredLogFormatter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
import org.springframework.boot.logging.structured.CommonStructuredLogFormat;
3838
import org.springframework.boot.logging.structured.GraylogExtendedLogFormatProperties;
3939
import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter;
40-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
4140
import org.springframework.boot.logging.structured.StructuredLogFormatter;
41+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
4242
import org.springframework.core.env.Environment;
4343
import org.springframework.core.log.LogMessage;
4444
import org.springframework.util.Assert;
@@ -70,7 +70,7 @@ class GraylogExtendedLogFormatStructuredLogFormatter extends JsonWriterStructure
7070
private static final Set<String> ADDITIONAL_FIELD_ILLEGAL_KEYS = Set.of("id", "_id");
7171

7272
GraylogExtendedLogFormatStructuredLogFormatter(Environment environment,
73-
ThrowableProxyConverter throwableProxyConverter, StructureLoggingJsonMembersCustomizer<?> customizer) {
73+
ThrowableProxyConverter throwableProxyConverter, StructuredLoggingJsonMembersCustomizer<?> customizer) {
7474
super((members) -> jsonMembers(environment, throwableProxyConverter, members), customizer);
7575
}
7676

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogstashStructuredLogFormatter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import org.springframework.boot.json.JsonWriter.PairExtractor;
3636
import org.springframework.boot.logging.structured.CommonStructuredLogFormat;
3737
import org.springframework.boot.logging.structured.JsonWriterStructuredLogFormatter;
38-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
3938
import org.springframework.boot.logging.structured.StructuredLogFormatter;
39+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
4040

4141
/**
4242
* Logback {@link StructuredLogFormatter} for {@link CommonStructuredLogFormat#LOGSTASH}.
@@ -50,7 +50,7 @@ class LogstashStructuredLogFormatter extends JsonWriterStructuredLogFormatter<IL
5050
(pair) -> pair.value);
5151

5252
LogstashStructuredLogFormatter(ThrowableProxyConverter throwableProxyConverter,
53-
StructureLoggingJsonMembersCustomizer<?> customizer) {
53+
StructuredLoggingJsonMembersCustomizer<?> customizer) {
5454
super((members) -> jsonMembers(throwableProxyConverter, members), customizer);
5555
}
5656

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/StructuredLogEncoder.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import ch.qos.logback.core.encoder.EncoderBase;
2626

2727
import org.springframework.boot.logging.structured.CommonStructuredLogFormat;
28-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
2928
import org.springframework.boot.logging.structured.StructuredLogFormatter;
3029
import org.springframework.boot.logging.structured.StructuredLogFormatterFactory;
3130
import org.springframework.boot.logging.structured.StructuredLogFormatterFactory.CommonFormatters;
31+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
3232
import org.springframework.boot.util.Instantiator;
3333
import org.springframework.boot.util.Instantiator.AvailableParameters;
3434
import org.springframework.core.env.Environment;
@@ -89,25 +89,25 @@ private void addCommonFormatters(CommonFormatters<ILoggingEvent> commonFormatter
8989
private StructuredLogFormatter<ILoggingEvent> createEcsFormatter(Instantiator<?> instantiator) {
9090
Environment environment = instantiator.getArg(Environment.class);
9191
ThrowableProxyConverter throwableProxyConverter = instantiator.getArg(ThrowableProxyConverter.class);
92-
StructureLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
93-
.getArg(StructureLoggingJsonMembersCustomizer.class);
92+
StructuredLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
93+
.getArg(StructuredLoggingJsonMembersCustomizer.class);
9494
return new ElasticCommonSchemaStructuredLogFormatter(environment, throwableProxyConverter,
9595
jsonMembersCustomizer);
9696
}
9797

9898
private StructuredLogFormatter<ILoggingEvent> createGraylogFormatter(Instantiator<?> instantiator) {
9999
Environment environment = instantiator.getArg(Environment.class);
100100
ThrowableProxyConverter throwableProxyConverter = instantiator.getArg(ThrowableProxyConverter.class);
101-
StructureLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
102-
.getArg(StructureLoggingJsonMembersCustomizer.class);
101+
StructuredLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
102+
.getArg(StructuredLoggingJsonMembersCustomizer.class);
103103
return new GraylogExtendedLogFormatStructuredLogFormatter(environment, throwableProxyConverter,
104104
jsonMembersCustomizer);
105105
}
106106

107107
private StructuredLogFormatter<ILoggingEvent> createLogstashFormatter(Instantiator<?> instantiator) {
108108
ThrowableProxyConverter throwableProxyConverter = instantiator.getArg(ThrowableProxyConverter.class);
109-
StructureLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
110-
.getArg(StructureLoggingJsonMembersCustomizer.class);
109+
StructuredLoggingJsonMembersCustomizer<?> jsonMembersCustomizer = instantiator
110+
.getArg(StructuredLoggingJsonMembersCustomizer.class);
111111
return new LogstashStructuredLogFormatter(throwableProxyConverter, jsonMembersCustomizer);
112112
}
113113

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/JsonWriterStructuredLogFormatter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ public abstract class JsonWriterStructuredLogFormatter<E> implements StructuredL
4242
* @param customizer an optional customizer to apply
4343
*/
4444
protected JsonWriterStructuredLogFormatter(Consumer<Members<E>> members,
45-
StructureLoggingJsonMembersCustomizer<?> customizer) {
45+
StructuredLoggingJsonMembersCustomizer<?> customizer) {
4646
this(JsonWriter.of(customized(members, customizer)).withNewLineAtEnd());
4747
}
4848

4949
private static <E> Consumer<Members<E>> customized(Consumer<Members<E>> members,
50-
StructureLoggingJsonMembersCustomizer<?> customizer) {
50+
StructuredLoggingJsonMembersCustomizer<?> customizer) {
5151
return (customizer != null) ? members.andThen(customizeWith(customizer)) : members;
5252
}
5353

5454
@SuppressWarnings("unchecked")
55-
private static <E> Consumer<Members<E>> customizeWith(StructureLoggingJsonMembersCustomizer<?> customizer) {
56-
return (members) -> LambdaSafe.callback(StructureLoggingJsonMembersCustomizer.class, customizer, members)
55+
private static <E> Consumer<Members<E>> customizeWith(StructuredLoggingJsonMembersCustomizer<?> customizer) {
56+
return (members) -> LambdaSafe.callback(StructuredLoggingJsonMembersCustomizer.class, customizer, members)
5757
.invoke((instance) -> instance.customize(members));
5858
}
5959

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Implementing classes can declare the following parameter types in the constructor:
2929
* <ul>
3030
* <li>{@link Environment}</li>
31-
* <li>{@link StructureLoggingJsonMembersCustomizer}</li>
31+
* <li>{@link StructuredLoggingJsonMembersCustomizer}</li>
3232
* </ul>
3333
* When using Logback, implementing classes can also use the following parameter types in
3434
* the constructor:

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactory.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public StructuredLogFormatterFactory(Class<E> logEventType, Environment environm
8282
this.logEventType = logEventType;
8383
this.instantiator = new Instantiator<>(Object.class, (allAvailableParameters) -> {
8484
allAvailableParameters.add(Environment.class, environment);
85-
allAvailableParameters.add(StructureLoggingJsonMembersCustomizer.class,
86-
(type) -> getStructureLoggingJsonMembersCustomizer(environment));
85+
allAvailableParameters.add(StructuredLoggingJsonMembersCustomizer.class,
86+
(type) -> getStructuredLoggingJsonMembersCustomizer(environment));
8787
if (availableParameters != null) {
8888
availableParameters.accept(allAvailableParameters);
8989
}
@@ -92,26 +92,26 @@ public StructuredLogFormatterFactory(Class<E> logEventType, Environment environm
9292
commonFormatters.accept(this.commonFormatters);
9393
}
9494

95-
StructureLoggingJsonMembersCustomizer<?> getStructureLoggingJsonMembersCustomizer(Environment environment) {
96-
List<StructureLoggingJsonMembersCustomizer<?>> customizers = new ArrayList<>();
95+
StructuredLoggingJsonMembersCustomizer<?> getStructuredLoggingJsonMembersCustomizer(Environment environment) {
96+
List<StructuredLoggingJsonMembersCustomizer<?>> customizers = new ArrayList<>();
9797
StructuredLoggingJsonProperties properties = StructuredLoggingJsonProperties.get(environment);
9898
if (properties != null) {
9999
customizers.add(new StructuredLoggingJsonPropertiesJsonMembersCustomizer(this.instantiator, properties));
100100
}
101-
customizers.addAll(loadStructureLoggingJsonMembersCustomizers());
101+
customizers.addAll(loadStructuredLoggingJsonMembersCustomizers());
102102
return (members) -> invokeCustomizers(customizers, members);
103103
}
104104

105105
@SuppressWarnings({ "unchecked", "rawtypes" })
106-
private List<StructureLoggingJsonMembersCustomizer<?>> loadStructureLoggingJsonMembersCustomizers() {
107-
return (List) this.factoriesLoader.load(StructureLoggingJsonMembersCustomizer.class,
106+
private List<StructuredLoggingJsonMembersCustomizer<?>> loadStructuredLoggingJsonMembersCustomizers() {
107+
return (List) this.factoriesLoader.load(StructuredLoggingJsonMembersCustomizer.class,
108108
ArgumentResolver.from(this.instantiator::getArg));
109109
}
110110

111111
@SuppressWarnings("unchecked")
112-
private void invokeCustomizers(List<StructureLoggingJsonMembersCustomizer<?>> customizers,
112+
private void invokeCustomizers(List<StructuredLoggingJsonMembersCustomizer<?>> customizers,
113113
Members<Object> members) {
114-
LambdaSafe.callbacks(StructureLoggingJsonMembersCustomizer.class, customizers, members)
114+
LambdaSafe.callbacks(StructuredLoggingJsonMembersCustomizer.class, customizers, members)
115115
.invoke((customizer) -> customizer.customize(members));
116116
}
117117

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructureLoggingJsonMembersCustomizer.java ‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonMembersCustomizer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @see JsonWriterStructuredLogFormatter
3333
*/
3434
@FunctionalInterface
35-
public interface StructureLoggingJsonMembersCustomizer<T> {
35+
public interface StructuredLoggingJsonMembersCustomizer<T> {
3636

3737
/**
3838
* Customize the given {@link Members} instance.

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonProperties.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
* @param include the paths that should be included. An empty set includes all names
2929
* @param exclude the paths that should be excluded. An empty set excludes nothing
3030
* @param rename a map of path to replacement names
31-
* @param add a map of additional elements {@link StructureLoggingJsonMembersCustomizer}
31+
* @param add a map of additional elements {@link StructuredLoggingJsonMembersCustomizer}
3232
* @param customizer the fully qualified name of a
33-
* {@link StructureLoggingJsonMembersCustomizer}
33+
* {@link StructuredLoggingJsonMembersCustomizer}
3434
* @author Phillip Webb
3535
*/
3636
record StructuredLoggingJsonProperties(Set<String> include, Set<String> exclude, Map<String, String> rename,
37-
Map<String, String> add, Class<? extends StructureLoggingJsonMembersCustomizer<?>> customizer) {
37+
Map<String, String> add, Class<? extends StructuredLoggingJsonMembersCustomizer<?>> customizer) {
3838

3939
static StructuredLoggingJsonProperties get(Environment environment) {
4040
return Binder.get(environment)

‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizer.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import org.springframework.util.CollectionUtils;
2525

2626
/**
27-
* {@link StructureLoggingJsonMembersCustomizer} to apply
27+
* {@link StructuredLoggingJsonMembersCustomizer} to apply
2828
* {@link StructuredLoggingJsonProperties}.
2929
*
3030
* @author Phillip Webb
3131
*/
32-
class StructuredLoggingJsonPropertiesJsonMembersCustomizer implements StructureLoggingJsonMembersCustomizer<Object> {
32+
class StructuredLoggingJsonPropertiesJsonMembersCustomizer implements StructuredLoggingJsonMembersCustomizer<Object> {
3333

3434
private final Instantiator<?> instantiator;
3535

@@ -49,7 +49,7 @@ public void customize(Members<Object> members) {
4949
if (!CollectionUtils.isEmpty(add)) {
5050
add.forEach(members::add);
5151
}
52-
Class<? extends StructureLoggingJsonMembersCustomizer<?>> customizer = this.properties.customizer();
52+
Class<? extends StructuredLoggingJsonMembersCustomizer<?>> customizer = this.properties.customizer();
5353
if (customizer != null) {
5454
createAndApplyCustomizer(members, customizer);
5555
}
@@ -71,8 +71,9 @@ boolean filterPath(MemberPath path) {
7171

7272
@SuppressWarnings({ "unchecked", "rawtypes" })
7373
private void createAndApplyCustomizer(Members<Object> members,
74-
Class<? extends StructureLoggingJsonMembersCustomizer<?>> customizerClass) {
75-
((StructureLoggingJsonMembersCustomizer) this.instantiator.instantiateType(customizerClass)).customize(members);
74+
Class<? extends StructuredLoggingJsonMembersCustomizer<?>> customizerClass) {
75+
((StructuredLoggingJsonMembersCustomizer) this.instantiator.instantiateType(customizerClass))
76+
.customize(members);
7677
}
7778

7879
}

‎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
@@ -269,7 +269,7 @@
269269
{
270270
"name": "logging.structured.json.customizer",
271271
"type": "java.lang.String",
272-
"description": "The fully qualified class name of a StructureLoggingJsonMembersCustomizer"
272+
"description": "The fully qualified class name of a StructuredLoggingJsonMembersCustomizer"
273273
},
274274
{
275275
"name": "logging.structured.json.exclude",

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/AbstractStructuredLoggingTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.mockito.Mock;
3232
import org.mockito.junit.jupiter.MockitoExtension;
3333

34-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
34+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
3535

3636
import static org.assertj.core.api.Assertions.assertThat;
3737

@@ -48,7 +48,7 @@ abstract class AbstractStructuredLoggingTests {
4848
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
4949

5050
@Mock
51-
StructureLoggingJsonMembersCustomizer<?> customizer;
51+
StructuredLoggingJsonMembersCustomizer<?> customizer;
5252

5353
protected Map<String, Object> map(Object... values) {
5454
assertThat(values.length).isEven();

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/AbstractStructuredLoggingTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.slf4j.event.KeyValuePair;
3939
import org.slf4j.helpers.BasicMarkerFactory;
4040

41-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
41+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
4242

4343
import static org.assertj.core.api.Assertions.assertThat;
4444

@@ -59,7 +59,7 @@ abstract class AbstractStructuredLoggingTests {
5959
private BasicMarkerFactory markerFactory;
6060

6161
@Mock
62-
StructureLoggingJsonMembersCustomizer<?> customizer;
62+
StructuredLoggingJsonMembersCustomizer<?> customizer;
6363

6464
@BeforeEach
6565
void setUp() {

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLogFormatterFactoryTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void getUsingClassNameInjectsCustomParameter() {
107107
void getInjectCustomizers() {
108108
this.environment.setProperty("logging.structured.json.rename.spring", "test");
109109
SpringFactoriesLoader factoriesLoader = mock(SpringFactoriesLoader.class);
110-
StructureLoggingJsonMembersCustomizer<?> customizer = (members) -> members
110+
StructuredLoggingJsonMembersCustomizer<?> customizer = (members) -> members
111111
.applyingValueProcessor(ValueProcessor.of(String.class, String::toUpperCase));
112112
given(factoriesLoader.load(any(), any(ArgumentResolver.class))).willReturn(List.of(customizer));
113113
StructuredLogFormatterFactory<LogEvent> factory = new StructuredLogFormatterFactory<>(factoriesLoader,
@@ -169,7 +169,7 @@ public String format(DifferentLogEvent event) {
169169

170170
static class CutomizedFormatter extends JsonWriterStructuredLogFormatter<LogEvent> {
171171

172-
CutomizedFormatter(StructureLoggingJsonMembersCustomizer<?> customizer) {
172+
CutomizedFormatter(StructuredLoggingJsonMembersCustomizer<?> customizer) {
173173
super((members) -> members.add("spring", "boot"), customizer);
174174
}
175175

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizerTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void customizeWhenHasAddAddsMemeber() {
9898
@Test
9999
@SuppressWarnings({ "rawtypes", "unchecked" })
100100
void customizeWhenHasCustomizerCustomizesMember() {
101-
StructureLoggingJsonMembersCustomizer<?> uppercaseCustomizer = (members) -> members
101+
StructuredLoggingJsonMembersCustomizer<?> uppercaseCustomizer = (members) -> members
102102
.applyingNameProcessor(NameProcessor.of(String::toUpperCase));
103103
given(((Instantiator) this.instantiator).instantiateType(TestCustomizer.class)).willReturn(uppercaseCustomizer);
104104
StructuredLoggingJsonProperties properties = new StructuredLoggingJsonProperties(Collections.emptySet(),
@@ -109,7 +109,7 @@ void customizeWhenHasCustomizerCustomizesMember() {
109109
}
110110

111111
@SuppressWarnings({ "rawtypes", "unchecked" })
112-
private String writeSampleJson(StructureLoggingJsonMembersCustomizer customizer) {
112+
private String writeSampleJson(StructuredLoggingJsonMembersCustomizer customizer) {
113113
return JsonWriter.of((members) -> {
114114
members.add("a", "a");
115115
members.add("b", "b");
@@ -118,7 +118,7 @@ private String writeSampleJson(StructureLoggingJsonMembersCustomizer customizer)
118118
}).writeToString(new Object());
119119
}
120120

121-
static class TestCustomizer implements StructureLoggingJsonMembersCustomizer<String> {
121+
static class TestCustomizer implements StructuredLoggingJsonMembersCustomizer<String> {
122122

123123
@Override
124124
public void customize(Members<String> members) {

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void getWhenNoBoundPropertiesReturnsNull() {
5252
StructuredLoggingJsonProperties.get(environment);
5353
}
5454

55-
static class TestCustomizer implements StructureLoggingJsonMembersCustomizer<String> {
55+
static class TestCustomizer implements StructuredLoggingJsonMembersCustomizer<String> {
5656

5757
@Override
5858
public void customize(Members<String> members) {

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging-log4j2/build.gradle ‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging-log4j2/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id "java"
33
}
44

5-
description = "Spring Boot structure logging Log4j2 smoke test"
5+
description = "Spring Boot structured logging Log4j2 smoke test"
66

77
configurations.all {
88
exclude module: "spring-boot-starter-logging"

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/build.gradle ‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id "java"
33
}
44

5-
description = "Spring Boot structure logging smoke test"
5+
description = "Spring Boot structured logging smoke test"
66

77
dependencies {
88
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))

‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structure-logging/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java ‎spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-structured-logging/src/main/java/smoketest/structuredlogging/SampleJsonMembersCustomizer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import org.springframework.boot.json.JsonWriter.Members;
2020
import org.springframework.boot.json.JsonWriter.ValueProcessor;
21-
import org.springframework.boot.logging.structured.StructureLoggingJsonMembersCustomizer;
21+
import org.springframework.boot.logging.structured.StructuredLoggingJsonMembersCustomizer;
2222

23-
public class SampleJsonMembersCustomizer implements StructureLoggingJsonMembersCustomizer<Object> {
23+
public class SampleJsonMembersCustomizer implements StructuredLoggingJsonMembersCustomizer<Object> {
2424

2525
@Override
2626
public void customize(Members<Object> members) {

0 commit comments

Comments
 (0)
Please sign in to comment.