Purge StreamContext some more

spring-batch-core/src/main/java/org/springframework/batch/core/domain/Step.java

@@ -43,7 +43,7 @@ public interface Step {
 	 * Flag to indicate if restart data needs to be saved for this step.
 	 * @return true if restart data should be saved
 	 */
-	boolean isSaveStreamContext();
+	boolean isSaveExecutionAttributes();
 
 	/**
 	 * @return the number of times a job can be started with the same

spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepContribution.java

@@ -30,7 +30,7 @@ public class StepContribution {
 
 	private StepExecution execution;
 
-	private ExecutionAttributes streamContext;
+	private ExecutionAttributes executionAttributes;
 
 	private int commitCount;
 
@@ -67,18 +67,18 @@ public class StepContribution {
 	/**
 	 * Set the statistics properties.
 	 * 
-	 * @param streamContext
+	 * @param executionAttributes
 	 */
-	public void setStreamContext(ExecutionAttributes streamContext) {
-		this.streamContext = streamContext;
+	public void setExecutionAttributes(ExecutionAttributes executionAttributes) {
+		this.executionAttributes = executionAttributes;
 	}
 
 	/**
 	 * Public getter for the {@link ExecutionAttributes}.
 	 * @return the stream context
 	 */
-	public ExecutionAttributes getStreamContext() {
-		return streamContext;
+	public ExecutionAttributes getExecutionAttributes() {
+		return executionAttributes;
 	}
 
 	/**

spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java

@@ -51,7 +51,7 @@ public class StepExecution extends Entity {
 
 	private Date endTime = null;
 
-	private ExecutionAttributes streamContext = new ExecutionAttributes();
+	private ExecutionAttributes executionAttributes = new ExecutionAttributes();
 
 	private ExitStatus exitStatus = ExitStatus.UNKNOWN;
 
@@ -88,12 +88,12 @@ public class StepExecution extends Entity {
 		taskCount++;
 	}
 
-	public ExecutionAttributes getStreamContext() {
-		return streamContext;
+	public ExecutionAttributes getExecutionAttributes() {
+		return executionAttributes;
 	}
 
-	public void setStreamContext(ExecutionAttributes statistics) {
-		this.streamContext = statistics;
+	public void setExecutionAttributes(ExecutionAttributes executionAttributes) {
+		this.executionAttributes = executionAttributes;
 	}
 
 	public Integer getCommitCount() {
@@ -249,7 +249,7 @@ public class StepExecution extends Entity {
 	 */
 	public synchronized void apply(StepContribution contribution) {
 		taskCount += contribution.getTaskCount();
-		streamContext = contribution.getStreamContext();
+		executionAttributes = contribution.getExecutionAttributes();
 		commitCount += contribution.getCommitCount();
 	}
 

spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepInstance.java

@@ -49,7 +49,7 @@ public class StepInstance extends Entity {
 
 	private BatchStatus status;
 
-	private ExecutionAttributes streamContext = new ExecutionAttributes();
+	private ExecutionAttributes executionAttributes = new ExecutionAttributes();
 
 	private int stepExecutionCount = 0;
 
@@ -84,12 +84,12 @@ public class StepInstance extends Entity {
 		this.stepExecutionCount = stepExecutionCount;
 	}
 
-	public ExecutionAttributes getStreamContext() {
-		return streamContext;
+	public ExecutionAttributes getExecutionAttributes() {
+		return executionAttributes;
 	}
 
-	public void setStreamContext(ExecutionAttributes streamContext) {
-		this.streamContext = streamContext;
+	public void setExecutionAttributes(ExecutionAttributes executionAttributes) {
+		this.executionAttributes = executionAttributes;
 	}
 
 	public BatchStatus getStatus() {

spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepSupport.java

@@ -34,7 +34,7 @@ public class StepSupport implements Step, BeanNameAware {
 
 	private boolean allowStartIfComplete;
 
-	private boolean saveStreamContext = false;
+	private boolean saveExecutionAttributes = false;
 
 	/**
 	 * Default constructor for {@link StepSupport}.
@@ -121,12 +121,12 @@ public class StepSupport implements Step, BeanNameAware {
 		this.allowStartIfComplete = allowStartIfComplete;
 	}
 
-	public void setSaveExecutionAttributes(boolean saveStreamContext) {
-		this.saveStreamContext = saveStreamContext;
+	public void setSaveExecutionAttributes(boolean saveExecutionAttributes) {
+		this.saveExecutionAttributes = saveExecutionAttributes;
 	}
 
-	public boolean isSaveStreamContext() {
-		return saveStreamContext;
+	public boolean isSaveExecutionAttributes() {
+		return saveExecutionAttributes;
 	}
 
 	/**