GH-1964: Sonar Fixes

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingByTopicSerialization.java

@@ -41,6 +41,8 @@
  */
 public abstract class DelegatingByTopicSerialization<T extends Closeable> implements Closeable {
 
+	private static final String UNCHECKED = "unchecked";
+
 	private static final LogAccessor LOGGER = new LogAccessor(DelegatingDeserializer.class);
 
 	/**
@@ -74,7 +76,7 @@ public abstract class DelegatingByTopicSerialization<T extends Closeable> implem
 
 	private T defaultDelegate;
 
-	protected boolean forKeys;
+	private boolean forKeys;
 
 	private boolean cased = true;
 
@@ -94,7 +96,7 @@ public void setCaseSensitive(boolean caseSensitive) {
 		this.cased = caseSensitive;
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings(UNCHECKED)
 	protected void configure(Map<String, ?> configs, boolean isKey) {
 		this.forKeys = isKey;
 		Object insensitive = configs.get(CASE_SENSITIVE);
@@ -140,7 +142,7 @@ private void processMap(Map<String, ?> configs, boolean isKey, String configKey,
 		});
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings(UNCHECKED)
 	protected void build(Map<String, ?> configs, boolean isKey, String configKey, Object delegate, Pattern pattern) {
 
 		if (isInstance(delegate)) {
@@ -159,7 +161,7 @@ else if (delegate instanceof String) {
 		}
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings(UNCHECKED)
 	protected void buildDefault(Map<String, ?> configs, String configKey, boolean isKey, Object delegate) {
 
 		if (isInstance(delegate)) {
@@ -239,7 +241,7 @@ protected T instantiateAndConfigure(Map<String, ?> configs, boolean isKey, Map<P
 			@Nullable Pattern pattern, Class<?> clazz) {
 
 		try {
-			@SuppressWarnings("unchecked")
+			@SuppressWarnings(UNCHECKED)
 			T delegate = (T) clazz.getDeclaredConstructor().newInstance();
 			configureDelegate(configs, isKey, delegate);
 			if (pattern != null) {
@@ -266,7 +268,7 @@ public T removeDelegate(Pattern pattern) {
 	 * @param topic the topic.
 	 * @return the delegate.
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings(UNCHECKED)
 	protected T findDelegate(String topic) {
 		T delegate = null;
 		for (Entry<Pattern, T> entry : this.delegates.entrySet()) {

spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingByTypeSerializer.java

@@ -35,14 +35,16 @@
  */
 public class DelegatingByTypeSerializer implements Serializer<Object> {
 
-	@SuppressWarnings("rawtypes")
+	private static final String RAWTYPES = "rawtypes";
+
+	@SuppressWarnings(RAWTYPES)
 	private final Map<Class<?>, Serializer> delegates = new HashMap<>();
 
 	/**
 	 * Construct an instance with the map of delegates.
 	 * @param delegates the delegates.
 	 */
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings(RAWTYPES)
 	public DelegatingByTypeSerializer(Map<Class<?>, Serializer> delegates) {
 		Assert.notNull(delegates, "'delegates' cannot be null");
 		Assert.noNullElements(delegates.values(), "Serializers in delegates map cannot be null");
@@ -55,21 +57,21 @@ public void configure(Map<String, ?> configs, boolean isKey) {
 		this.delegates.values().forEach(del -> del.configure(configs, isKey));
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({ RAWTYPES, "unchecked" })
 	@Override
 	public byte[] serialize(String topic, Object data) {
 		Serializer delegate = findDelegate(data);
 		return delegate.serialize(topic, data);
 	}
 
-	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@SuppressWarnings({ "unchecked", RAWTYPES })
 	@Override
 	public byte[] serialize(String topic, Headers headers, Object data) {
 		Serializer delegate = findDelegate(data);
 		return delegate.serialize(topic, headers, data);
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings(RAWTYPES)
 	private Serializer findDelegate(Object data) {
 		Serializer delegate = this.delegates.get(data.getClass());
 		if (delegate == null) {