From ac6a0982e5c4dd1a183d02b055941df263f47257 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Wed, 28 Oct 2020 16:33:51 -0400
Subject: [PATCH] Fix deprecations from Spring's StringUtils

* Use `LogAccessor` in the `XmlValidatingMessageSelector`
---
 .../ReactiveRedisStreamMessageProducer.java   |  4 ++--
 .../XmlValidatingMessageSelector.java         | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java
index 29c5ecb263..f3f53d5819 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducer.java
@@ -169,7 +169,7 @@ public class ReactiveRedisStreamMessageProducer extends MessageProducerSupport {
 	protected void onInit() {
 		super.onInit();
 		this.streamReceiver = StreamReceiver.create(this.reactiveConnectionFactory, this.streamReceiverOptions);
-		if (StringUtils.hasText(this.consumerName) && StringUtils.isEmpty(this.consumerGroup)) {
+		if (StringUtils.hasText(this.consumerName) && !StringUtils.hasText(this.consumerGroup)) {
 			this.consumerGroup = getBeanName();
 		}
 		ReactiveRedisTemplate<String, ?> reactiveRedisTemplate =
@@ -185,7 +185,7 @@ public class ReactiveRedisStreamMessageProducer extends MessageProducerSupport {
 
 		Flux<? extends Record<String, ?>> events;
 
-		if (StringUtils.isEmpty(this.consumerName)) {
+		if (!StringUtils.hasText(this.consumerName)) {
 			events = this.streamReceiver.receive(offset);
 		}
 		else {
diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java
index f6e216e4ad..438523f6f8 100644
--- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java
+++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,10 @@ import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Arrays;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.xml.sax.SAXParseException;
 
 import org.springframework.core.io.Resource;
+import org.springframework.core.log.LogAccessor;
 import org.springframework.integration.MessageRejectedException;
 import org.springframework.integration.core.MessageSelector;
 import org.springframework.integration.xml.AggregatedXmlMessageValidationException;
@@ -65,7 +64,7 @@ public class XmlValidatingMessageSelector implements MessageSelector {
 
 	}
 
-	private static final Log LOGGER = LogFactory.getLog(XmlValidatingMessageSelector.class);
+	private static final LogAccessor LOGGER = new LogAccessor(XmlValidatingMessageSelector.class);
 
 	private final XmlValidator xmlValidator;
 
@@ -98,9 +97,9 @@ public class XmlValidatingMessageSelector implements MessageSelector {
 
 	public XmlValidatingMessageSelector(Resource schema, String schemaType) throws IOException {
 		this(schema,
-				StringUtils.isEmpty(schemaType)
-						? null
-						: SchemaType.valueOf(schemaType.toUpperCase().replaceFirst("-", "_")));
+				StringUtils.hasText(schemaType)
+						? SchemaType.valueOf(schemaType.toUpperCase().replaceFirst("-", "_"))
+						: null);
 	}
 
 
@@ -133,9 +132,9 @@ public class XmlValidatingMessageSelector implements MessageSelector {
 				throw new MessageRejectedException(message, exceptionMessage,
 						new AggregatedXmlMessageValidationException(Arrays.asList(validationExceptions)));
 			}
-			else if (LOGGER.isInfoEnabled()) {
-				LOGGER.info(exceptionMessage,
-						new AggregatedXmlMessageValidationException(Arrays.asList(validationExceptions)));
+			else {
+				LOGGER.info(new AggregatedXmlMessageValidationException(Arrays.asList(validationExceptions)),
+						exceptionMessage);
 			}
 		}
 		return validationSuccess;