From 552538256320586eceeb1121b17f08a87ecfda42 Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@pivotal.io>
Date: Thu, 13 Dec 2018 15:02:42 -0600
Subject: [PATCH] Polish

---
 .../TaskLifecycleConfiguration.java           | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskLifecycleConfiguration.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskLifecycleConfiguration.java
index dbeb7a5d..df49c67c 100644
--- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskLifecycleConfiguration.java
+++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/TaskLifecycleConfiguration.java
@@ -21,6 +21,7 @@ import javax.annotation.PostConstruct;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.cloud.task.listener.TaskLifecycleListener;
@@ -36,6 +37,7 @@ import org.springframework.context.annotation.Configuration;
  * Configuration for a {@link TaskLifecycleListener}.
  *
  * @author Glenn Renfro
+ * @author Michael Minella
  * @since 2.1
  */
 @Configuration
@@ -43,28 +45,38 @@ public class TaskLifecycleConfiguration {
 
 	protected static final Log logger = LogFactory.getLog(TaskLifecycleConfiguration.class);
 
-	@Autowired
 	private TaskProperties taskProperties;
 
-	@Autowired
 	private ConfigurableApplicationContext context;
 
-	@Autowired(required = false)
 	private ApplicationArguments applicationArguments;
 
-	@Autowired
 	private TaskRepository taskRepository;
 
-	@Autowired
 	private TaskExplorer taskExplorer;
 
-	@Autowired
 	private TaskNameResolver taskNameResolver;
 
 	private TaskLifecycleListener taskLifecycleListener;
 
 	private boolean initialized = false;
 
+	@Autowired
+	public TaskLifecycleConfiguration(TaskProperties taskProperties,
+			ConfigurableApplicationContext context,
+			TaskRepository taskRepository,
+			TaskExplorer taskExplorer,
+			TaskNameResolver taskNameResolver,
+			ObjectProvider<ApplicationArguments> applicationArguments) {
+
+		this.taskProperties = taskProperties;
+		this.context = context;
+		this.taskRepository = taskRepository;
+		this.taskExplorer = taskExplorer;
+		this.taskNameResolver = taskNameResolver;
+		this.applicationArguments = applicationArguments.getIfAvailable();
+	}
+
 	@Bean
 	public TaskLifecycleListener taskLifecycleListener() {
 		return this.taskLifecycleListener;
@@ -75,14 +87,16 @@ public class TaskLifecycleConfiguration {
 	 */
 	@PostConstruct
 	protected void initialize() {
-		if (this.initialized) {
-			return;
+		if (!this.initialized) {
+			this.taskLifecycleListener =
+					new TaskLifecycleListener(this.taskRepository,
+							this.taskNameResolver,
+							this.applicationArguments,
+							this.taskExplorer,
+							this.taskProperties,
+							new TaskListenerExecutorObjectFactory(context));
+
+			this.initialized = true;
 		}
-
-		this.taskLifecycleListener = new TaskLifecycleListener(this.taskRepository, this.taskNameResolver,
-				this.applicationArguments, this.taskExplorer, this.taskProperties, new TaskListenerExecutorObjectFactory(context));
-
-		this.initialized = true;
 	}
-
 }