Polish JsonWriter API

Author: philwebb

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarPropertiesMapper.java

@@ -54,7 +54,7 @@
 final class PulsarPropertiesMapper {
 
 	private static final JsonWriter<Map<String, String>> jsonWriter = JsonWriter
-		.of((members) -> members.addSelf().as(TreeMap::new).usingPairs(Map::forEach));
+		.of((members) -> members.add().as(TreeMap::new).usingPairs(Map::forEach));
 
 	private final PulsarProperties properties;
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/JsonWriter.java

@@ -142,7 +142,7 @@ default JsonWriter<T> withSuffix(String suffix) {
 	 * @return a {@link JsonWriter} instance
 	 */
 	static <T> JsonWriter<T> standard() {
-		return of(Members::addSelf);
+		return of(Members::add);
 	}
 
 	/**
@@ -306,8 +306,8 @@ public String toString() {
 	 * the various {@code add(...)} methods. Typically, members are declared with a
 	 * {@code "name"} and a {@link Function} that will extract the value from the
 	 * instance. Members can also be declared using a static value or a {@link Supplier}.
-	 * The {@link #addSelf(String)} and {@link #addSelf()} methods may be used to access
-	 * the actual instance being written.
+	 * The {@link #add(String)} and {@link #add()} methods may be used to access the
+	 * actual instance being written.
 	 * <p>
 	 * Members can be added without a {@code name} when a {@code Member.using(...)} method
 	 * is used to complete the definition.
@@ -343,7 +343,7 @@ final class Members<T> {
 		 * @param name the member name
 		 * @return the added {@link Member} which may be configured further
 		 */
-		public Member<T> addSelf(String name) {
+		public Member<T> add(String name) {
 			return add(name, (instance) -> instance);
 		}
 
@@ -389,58 +389,55 @@ public <V> Member<V> add(String name, Function<T, V> extractor) {
 		 * complete the configuration.
 		 * @return the added {@link Member} which may be configured further
 		 */
-		public Member<T> addSelf() {
-			return add((instance) -> instance);
+		public Member<T> add() {
+			return from(Function.identity());
 		}
 
 		/**
-		 * Add a new member with a static value. The member is added without a name, so
-		 * one of the {@code Member.using(...)} methods must be used to complete the
-		 * configuration.
+		 * Add all entries from the given {@link Map} to the JSON.
+		 * @param <M> the map type
+		 * @param <K> the key type
 		 * @param <V> the value type
-		 * @param value the member value
+		 * @param extractor a function to extract the map
 		 * @return the added {@link Member} which may be configured further
 		 */
-		public <V> Member<V> add(V value) {
-			return add((instance) -> value);
+		public <M extends Map<K, V>, K, V> Member<M> addMapEntries(Function<T, M> extractor) {
+			return from(extractor).usingPairs(Map::forEach);
 		}
 
 		/**
-		 * Add a new member with a supplied value.The member is added without a name, so
-		 * one of the {@code Member.using(...)} methods must be used to complete the
-		 * configuration.
+		 * Add members from a static value. One of the {@code Member.using(...)} methods
+		 * must be used to complete the configuration.
 		 * @param <V> the value type
-		 * @param supplier a supplier of the value
+		 * @param value the member value
 		 * @return the added {@link Member} which may be configured further
 		 */
-		public <V> Member<V> add(Supplier<V> supplier) {
-			Assert.notNull(supplier, "'supplier' must not be null");
-			return add((instance) -> supplier.get());
+		public <V> Member<V> from(V value) {
+			return from((instance) -> value);
 		}
 
 		/**
-		 * Add a new member with an extracted value. The member is added without a name,
-		 * so one of the {@code Member.using(...)} methods must be used to complete the
-		 * configuration.
+		 * Add members from a supplied value. One of the {@code Member.using(...)} methods
+		 * must be used to complete the configuration.
 		 * @param <V> the value type
-		 * @param extractor a function to extract the value
+		 * @param supplier a supplier of the value
 		 * @return the added {@link Member} which may be configured further
 		 */
-		public <V> Member<V> add(Function<T, V> extractor) {
-			Assert.notNull(extractor, "'extractor' must not be null");
-			return addMember(null, extractor);
+		public <V> Member<V> from(Supplier<V> supplier) {
+			Assert.notNull(supplier, "'supplier' must not be null");
+			return from((instance) -> supplier.get());
 		}
 
 		/**
-		 * Add all entries from the given {@link Map} to the JSON.
-		 * @param <M> the map type
-		 * @param <K> the key type
+		 * Add members from an extracted value. One of the {@code Member.using(...)}
+		 * methods must be used to complete the configuration.
 		 * @param <V> the value type
-		 * @param extractor a function to extract the map
+		 * @param extractor a function to extract the value
 		 * @return the added {@link Member} which may be configured further
 		 */
-		public <M extends Map<K, V>, K, V> Member<M> addMapEntries(Function<T, M> extractor) {
-			return add(extractor).usingPairs(Map::forEach);
+		public <V> Member<V> from(Function<T, V> extractor) {
+			Assert.notNull(extractor, "'extractor' must not be null");
+			return addMember(null, extractor);
 		}
 
 		private <V> Member<V> addMember(String name, Function<T, V> extractor) {

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

@@ -53,10 +53,10 @@ private static void jsonMembers(ApplicationPid pid, ElasticCommonSchemaService s
 		service.jsonMembers(members);
 		members.add("log.logger", LogEvent::getLoggerName);
 		members.add("message", LogEvent::getMessage).as(Message::getFormattedMessage);
-		members.add(LogEvent::getContextData)
+		members.from(LogEvent::getContextData)
 			.whenNot(ReadOnlyStringMap::isEmpty)
 			.usingPairs((contextData, pairs) -> contextData.forEach(pairs::accept));
-		members.add(LogEvent::getThrownProxy).whenNotNull().usingMembers((thrownProxyMembers) -> {
+		members.from(LogEvent::getThrownProxy).whenNotNull().usingMembers((thrownProxyMembers) -> {
 			thrownProxyMembers.add("error.type", ThrowableProxy::getThrowable)
 				.whenNotNull()
 				.as(ObjectUtils::nullSafeClassName);

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

@@ -56,7 +56,7 @@ private static void jsonMembers(JsonWriter.Members<LogEvent> members) {
 		members.add("thread_name", LogEvent::getThreadName);
 		members.add("level", LogEvent::getLevel).as(Level::name);
 		members.add("level_value", LogEvent::getLevel).as(Level::intLevel);
-		members.add(LogEvent::getContextData)
+		members.from(LogEvent::getContextData)
 			.whenNot(ReadOnlyStringMap::isEmpty)
 			.usingPairs((contextData, pairs) -> contextData.forEach(pairs::accept));
 		members.add("tags", LogEvent::getMarker)

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

@@ -56,10 +56,10 @@ private static void jsonMembers(ApplicationPid pid, ElasticCommonSchemaService s
 		members.add("log.logger", ILoggingEvent::getLoggerName);
 		members.add("message", ILoggingEvent::getFormattedMessage);
 		members.addMapEntries(ILoggingEvent::getMDCPropertyMap);
-		members.add(ILoggingEvent::getKeyValuePairs)
+		members.from(ILoggingEvent::getKeyValuePairs)
 			.whenNotEmpty()
 			.usingExtractedPairs(Iterable::forEach, keyValuePairExtractor);
-		members.addSelf().whenNotNull(ILoggingEvent::getThrowableProxy).usingMembers((throwableMembers) -> {
+		members.add().whenNotNull(ILoggingEvent::getThrowableProxy).usingMembers((throwableMembers) -> {
 			throwableMembers.add("error.type", ILoggingEvent::getThrowableProxy).as(IThrowableProxy::getClassName);
 			throwableMembers.add("error.message", ILoggingEvent::getThrowableProxy).as(IThrowableProxy::getMessage);
 			throwableMembers.add("error.stack_trace", throwableProxyConverter::convert);

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

@@ -62,7 +62,7 @@ private static void jsonMembers(ThrowableProxyConverter throwableProxyConverter,
 		members.add("level", ILoggingEvent::getLevel);
 		members.add("level_value", ILoggingEvent::getLevel).as(Level::toInt);
 		members.addMapEntries(ILoggingEvent::getMDCPropertyMap);
-		members.add(ILoggingEvent::getKeyValuePairs)
+		members.from(ILoggingEvent::getKeyValuePairs)
 			.whenNotEmpty()
 			.usingExtractedPairs(Iterable::forEach, keyValuePairExtractor);
 		members.add("tags", ILoggingEvent::getMarkerList)