Fix typos in the AbstractKafkaHeaderMapper (#1077)

* Fix typos in the `AbstractKafkaHeaderMapper`

* * Fix `DefaultKafkaHeaderMapperTests` for changed methods

Author: artembilan

spring-kafka/src/main/java/org/springframework/kafka/support/AbstractKafkaHeaderMapper.java

@@ -21,6 +21,7 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,6 +42,8 @@
  * Base for Kafka header mappers.
  *
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 2.1.3
  *
  */
@@ -50,7 +53,7 @@ public abstract class AbstractKafkaHeaderMapper implements KafkaHeaderMapper {
 
 	private final List<HeaderMatcher> matchers = new ArrayList<>();
 
-	private final Map<String, Boolean> rawMappedtHeaders = new HashMap<>();
+	private final Map<String, Boolean> rawMappedHeaders = new HashMap<>();
 
 	private boolean mapAllStringsOut;
 
@@ -88,17 +91,15 @@ public AbstractKafkaHeaderMapper(String... patterns) {
 	protected final void addMatchers(HeaderMatcher... matchersToAdd) {
 		Assert.notNull(matchersToAdd, "'matchersToAdd' cannot be null");
 		Assert.noNullElements(matchersToAdd, "'matchersToAdd' cannot have null elements");
-		for (HeaderMatcher matcher : matchersToAdd) {
-			this.matchers.add(matcher);
-		}
+		Collections.addAll(this.matchers, matchersToAdd);
 	}
 
 	/**
 	 * Set to true to map all {@code String} valued outbound headers to {@code byte[]}.
 	 * To map to a {@code String} for inbound, there must be an entry in the rawMappedHeaders map.
 	 * @param mapAllStringsOut true to map all strings.
 	 * @since 2.2.5
-	 * @see #setRawMappedHaeaders(Map)
+	 * @see #setRawMappedHeaders(Map)
 	 */
 	public void setMapAllStringsOut(boolean mapAllStringsOut) {
 		this.mapAllStringsOut = mapAllStringsOut;
@@ -112,7 +113,7 @@ protected Charset getCharset() {
 	 * Set the charset to use when mapping String-valued headers to/from byte[]. Default UTF-8.
 	 * @param charset the charset.
 	 * @since 2.2.5
-	 * @see #setRawMappedHaeaders(Map)
+	 * @see #setRawMappedHeaders(Map)
 	 */
 	public void setCharset(Charset charset) {
 		Assert.notNull(charset, "'charset' cannot be null");
@@ -129,10 +130,10 @@ public void setCharset(Charset charset) {
 	 * @see #setCharset(Charset)
 	 * @see #setMapAllStringsOut(boolean)
 	 */
-	public void setRawMappedHaeaders(Map<String, Boolean> rawMappedHeaders) {
+	public void setRawMappedHeaders(Map<String, Boolean> rawMappedHeaders) {
 		if (!ObjectUtils.isEmpty(rawMappedHeaders)) {
-			this.rawMappedtHeaders.clear();
-			this.rawMappedtHeaders.putAll(rawMappedHeaders);
+			this.rawMappedHeaders.clear();
+			this.rawMappedHeaders.putAll(rawMappedHeaders);
 		}
 	}
 
@@ -167,7 +168,7 @@ protected boolean matches(String header) {
 	/**
 	 * Check if the value is a String and convert to byte[], if so configured.
 	 * @param key the header name.
-	 * @param value the headet value.
+	 * @param value the header value.
 	 * @return the value to add.
 	 * @since 2.2.5
 	 */
@@ -181,7 +182,7 @@ protected Object headerValueToAddOut(String key, Object value) {
 
 	@Nullable
 	private byte[] mapRawOut(String header, Object value) {
-		if (this.mapAllStringsOut || this.rawMappedtHeaders.containsKey(header)) {
+		if (this.mapAllStringsOut || this.rawMappedHeaders.containsKey(header)) {
 			if (value instanceof byte[]) {
 				return (byte[]) value;
 			}
@@ -197,7 +198,7 @@ else if (value instanceof String) {
 	 * @param header the header.
 	 * @return the value to add.
 	 */
-	protected Object headertValueToAddIn(Header header) {
+	protected Object headerValueToAddIn(Header header) {
 		Object mapped = mapRawIn(header.key(), header.value());
 		if (mapped == null) {
 			mapped = header.value();
@@ -207,7 +208,7 @@ protected Object headertValueToAddIn(Header header) {
 
 	@Nullable
 	private String mapRawIn(String header, byte[] value) {
-		Boolean asString = this.rawMappedtHeaders.get(header);
+		Boolean asString = this.rawMappedHeaders.get(header);
 		if (Boolean.TRUE.equals(asString)) {
 			return new String(value, this.charset);
 		}
@@ -275,7 +276,7 @@ protected static class SimplePatternBasedHeaderMatcher implements HeaderMatcher
 
 		private final boolean negate;
 
-		public SimplePatternBasedHeaderMatcher(String pattern) {
+		protected SimplePatternBasedHeaderMatcher(String pattern) {
 			this(pattern.startsWith("!") ? pattern.substring(1) : pattern, pattern.startsWith("!"));
 		}
 

spring-kafka/src/main/java/org/springframework/kafka/support/DefaultKafkaHeaderMapper.java

@@ -36,10 +36,8 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.MimeType;
 
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.deser.std.StdNodeBasedDeserializer;
@@ -230,9 +228,9 @@ public void fromHeaders(MessageHeaders headers, Headers target) {
 						target.add(new RecordHeader(key, headerObjectMapper.writeValueAsBytes(value)));
 						jsonHeaders.put(key, className);
 					}
-					catch (@SuppressWarnings("unused") Exception e) {
+					catch (Exception e) {
 						if (logger.isDebugEnabled()) {
-							logger.debug("Could not map " + key + " with type " + valueToAdd.getClass().getName());
+							logger.debug("Could not map " + key + " with type " + valueToAdd.getClass().getName(), e);
 						}
 					}
 				}
@@ -272,9 +270,8 @@ public void toHeaders(Headers source, final Map<String, Object> headers) {
 							headers.put(header.key(), value);
 						}
 						catch (IOException e) {
-							logger.error("Could not decode json type: " + new String(header.value()) + " for key: " + header
-											.key(),
-									e);
+							logger.error("Could not decode json type: " + new String(header.value()) + " for key: " +
+									header.key(), e);
 							headers.put(header.key(), header.value());
 						}
 					}
@@ -283,16 +280,14 @@ public void toHeaders(Headers source, final Map<String, Object> headers) {
 					}
 				}
 				else {
-					headers.put(header.key(), headertValueToAddIn(header));
+					headers.put(header.key(), headerValueToAddIn(header));
 				}
 			}
 		});
 	}
 
-	private Object decodeValue(Header h, Class<?> type)
-			throws IOException, JsonParseException, JsonMappingException, LinkageError {
-
-		final ObjectMapper headerObjectMapper = getObjectMapper();
+	private Object decodeValue(Header h, Class<?> type) throws IOException, LinkageError {
+		ObjectMapper headerObjectMapper = getObjectMapper();
 		Object value = headerObjectMapper.readValue(h.value(), type);
 		if (type.equals(NonTrustedHeaderType.class)) {
 			// Upstream NTHT propagated; may be trusted here...

spring-kafka/src/main/java/org/springframework/kafka/support/SimpleKafkaHeaderMapper.java

@@ -27,7 +27,7 @@
  * A simple header mapper that maps headers directly; for outbound,
  * only byte[] headers are mapped; for inbound, headers are mapped
  * unchanged, as byte[]. Strings can also be mapped to/from byte.
- * See {@link #setRawMappedHaeaders(Map)}.
+ * See {@link #setRawMappedHeaders(Map)}.
  * Most headers in {@link KafkaHeaders} are not mapped on outbound messages.
  * The exceptions are correlation and reply headers for request/reply
  *
@@ -75,7 +75,7 @@ public void fromHeaders(MessageHeaders headers, Headers target) {
 
 	@Override
 	public void toHeaders(Headers source, Map<String, Object> target) {
-		source.forEach(header -> target.put(header.key(), headertValueToAddIn(header)));
+		source.forEach(header -> target.put(header.key(), headerValueToAddIn(header)));
 	}
 
 }

spring-kafka/src/test/java/org/springframework/kafka/support/DefaultKafkaHeaderMapperTests.java

@@ -155,7 +155,7 @@ public void testSpecificStringConvert() {
 		Map<String, Boolean> rawMappedHeaders = new HashMap<>();
 		rawMappedHeaders.put("thisOnesAString", true);
 		rawMappedHeaders.put("thisOnesBytes", false);
-		mapper.setRawMappedHaeaders(rawMappedHeaders);
+		mapper.setRawMappedHeaders(rawMappedHeaders);
 		Map<String, Object> headersMap = new HashMap<>();
 		headersMap.put("thisOnesAString", "foo");
 		headersMap.put("thisOnesBytes", "bar");
@@ -180,7 +180,7 @@ public void testJsonStringConvert() {
 		DefaultKafkaHeaderMapper mapper = new DefaultKafkaHeaderMapper();
 		Map<String, Boolean> rawMappedHeaders = new HashMap<>();
 		rawMappedHeaders.put("thisOnesBytes", false);
-		mapper.setRawMappedHaeaders(rawMappedHeaders);
+		mapper.setRawMappedHeaders(rawMappedHeaders);
 		Map<String, Object> headersMap = new HashMap<>();
 		headersMap.put("thisOnesAString", "foo");
 		headersMap.put("thisOnesBytes", "bar");
@@ -208,7 +208,7 @@ public void testAlwaysStringConvert() {
 		mapper.setMapAllStringsOut(true);
 		Map<String, Boolean> rawMappedHeaders = new HashMap<>();
 		rawMappedHeaders.put("thisOnesBytes", false);
-		mapper.setRawMappedHaeaders(rawMappedHeaders);
+		mapper.setRawMappedHeaders(rawMappedHeaders);
 		Map<String, Object> headersMap = new HashMap<>();
 		headersMap.put("thisOnesAString", "foo");
 		headersMap.put("thisOnesBytes", "bar");

spring-kafka/src/test/java/org/springframework/kafka/support/SimpleKafkaHeaderMapperTests.java

@@ -42,7 +42,7 @@ public void testSpecificStringConvert() {
 		Map<String, Boolean> rawMappedHeaders = new HashMap<>();
 		rawMappedHeaders.put("thisOnesAString", true);
 		rawMappedHeaders.put("thisOnesBytes", false);
-		mapper.setRawMappedHaeaders(rawMappedHeaders);
+		mapper.setRawMappedHeaders(rawMappedHeaders);
 		Map<String, Object> headersMap = new HashMap<>();
 		headersMap.put("thisOnesAString", "foo");
 		headersMap.put("thisOnesBytes", "bar");
@@ -67,7 +67,7 @@ public void testNotStringConvert() {
 		SimpleKafkaHeaderMapper mapper = new SimpleKafkaHeaderMapper("*");
 		Map<String, Boolean> rawMappedHeaders = new HashMap<>();
 		rawMappedHeaders.put("thisOnesBytes", false);
-		mapper.setRawMappedHaeaders(rawMappedHeaders);
+		mapper.setRawMappedHeaders(rawMappedHeaders);
 		Map<String, Object> headersMap = new HashMap<>();
 		headersMap.put("thisOnesAString", "foo");
 		headersMap.put("thisOnesBytes", "bar");
@@ -91,7 +91,7 @@ public void testAlwaysStringConvert() {
 		mapper.setMapAllStringsOut(true);
 		Map<String, Boolean> rawMappedHeaders = new HashMap<>();
 		rawMappedHeaders.put("thisOnesBytes", false);
-		mapper.setRawMappedHaeaders(rawMappedHeaders);
+		mapper.setRawMappedHeaders(rawMappedHeaders);
 		Map<String, Object> headersMap = new HashMap<>();
 		headersMap.put("thisOnesAString", "foo");
 		headersMap.put("thisOnesBytes", "bar");