From e053e2ab4a6714f69ec80c6a2b68eb76c2e06b87 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Mon, 20 Aug 2018 11:47:16 -0400
Subject: [PATCH] INT-4524: Fix MailReceivingMessageSource BF usage

JIRA: https://jira.spring.io/browse/INT-4524
---
 .../file/FileReadingMessageSource.java        |  5 --
 .../mail/MailReceivingMessageSource.java      | 46 -------------------
 2 files changed, 51 deletions(-)

diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
index 2263db7b7a..335d3fdef1 100644
--- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
+++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
@@ -41,9 +41,6 @@ import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.springframework.context.Lifecycle;
 import org.springframework.integration.aggregator.ResequencingMessageGroupProcessor;
 import org.springframework.integration.core.MessageSource;
@@ -89,8 +86,6 @@ public class FileReadingMessageSource extends AbstractMessageSource<File>
 
 	private static final int DEFAULT_INTERNAL_QUEUE_CAPACITY = 5;
 
-	private static final Log logger = LogFactory.getLog(FileReadingMessageSource.class);
-
 	private final AtomicBoolean running = new AtomicBoolean();
 
 	/*
diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java
index 97b2010627..bd3019b999 100644
--- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java
+++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java
@@ -20,15 +20,8 @@ import java.util.Arrays;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.endpoint.AbstractMessageSource;
-import org.springframework.integration.support.DefaultMessageBuilderFactory;
-import org.springframework.integration.support.MessageBuilderFactory;
-import org.springframework.integration.support.utils.IntegrationUtils;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessagingException;
 import org.springframework.util.Assert;
@@ -46,60 +39,21 @@ import org.springframework.util.Assert;
  */
 public class MailReceivingMessageSource extends AbstractMessageSource<Object> {
 
-	private final Log logger = LogFactory.getLog(this.getClass());
-
 	private final MailReceiver mailReceiver;
 
 	private final Queue<Object> mailQueue = new ConcurrentLinkedQueue<>();
 
-	private BeanFactory beanFactory;
-
-	private MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory();
-
-	private boolean messageBuilderFactorySet;
-
-	private String beanName;
-
 
 	public MailReceivingMessageSource(MailReceiver mailReceiver) {
 		Assert.notNull(mailReceiver, "mailReceiver must not be null");
 		this.mailReceiver = mailReceiver;
 	}
 
-	@Override
-	public final void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	protected BeanFactory getBeanFactory() {
-		return this.beanFactory;
-	}
-
-	protected MessageBuilderFactory getMessageBuilderFactory() {
-		if (!this.messageBuilderFactorySet) {
-			if (this.beanFactory != null) {
-				this.messageBuilderFactory = IntegrationUtils.getMessageBuilderFactory(this.beanFactory);
-			}
-			this.messageBuilderFactorySet = true;
-		}
-		return this.messageBuilderFactory;
-	}
-
-	@Override
-	public String getComponentName() {
-		return this.beanName;
-	}
-
 	@Override
 	public String getComponentType() {
 		return "mail:inbound-channel-adapter";
 	}
 
-	@Override
-	public void setBeanName(String name) {
-		this.beanName = name;
-	}
-
 	@Override
 	protected Object doReceive() {
 		try {