From ecf9b9f9ba25a63834f418b3a7a71e98daab7e90 Mon Sep 17 00:00:00 2001
From: mibo <mibo@apache.org>
Date: Wed, 16 Nov 2016 20:19:46 +0100
Subject: [PATCH] [OLINGO-713] Minor fix in  batch tutorial

---
 samples/tutorials/p11_batch/pom.xml           | 30 ++++++++++++++-----
 .../service/DemoBatchProcessor.java           |  8 ++---
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/samples/tutorials/p11_batch/pom.xml b/samples/tutorials/p11_batch/pom.xml
index 4b6cc2638..2016b0b40 100644
--- a/samples/tutorials/p11_batch/pom.xml
+++ b/samples/tutorials/p11_batch/pom.xml
@@ -29,15 +29,29 @@
 
 	<name>${project.artifactId}-Webapp</name>
 
-	<build>
-		<finalName>DemoService</finalName>
-	</build>
+  <properties>
+    <javax.version>2.5</javax.version>
+    <odata.version>4.4.0-SNAPSHOT</odata.version>
+    <slf4j.version>1.7.7</slf4j.version>
+    <project.source>1.6</project.source>
+    <compiler.plugin.version>3.2</compiler.plugin.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-	<properties>
-		<javax.version>2.5</javax.version>
-		<odata.version>4.4.0-SNAPSHOT</odata.version>
-		<slf4j.version>1.7.7</slf4j.version>
-	</properties>
+  <build>
+		<finalName>DemoService</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${compiler.plugin.version}</version>
+				<configuration>
+					<source>${project.source}</source>
+					<target>${project.source}</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 	<dependencies>
 		<dependency>
diff --git a/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/service/DemoBatchProcessor.java b/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/service/DemoBatchProcessor.java
index 49da784f9..4813ea05b 100644
--- a/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/service/DemoBatchProcessor.java
+++ b/samples/tutorials/p11_batch/src/main/java/myservice/mynamespace/service/DemoBatchProcessor.java
@@ -122,12 +122,12 @@ public class DemoBatchProcessor implements BatchProcessor {
       responseParts.add(facade.handleBatchRequest(part));
     }
 
-    // 5. Serialize the response content
-    final InputStream responseContent = odata.createFixedFormatSerializer().batchResponse(responseParts, boundary);
-    
-    // 6. Create a new boundary for the response
+    // 5. Create a new boundary for the response
     final String responseBoundary = "batch_" + UUID.randomUUID().toString();
 
+    // 6. Serialize the response content
+    final InputStream responseContent = odata.createFixedFormatSerializer().batchResponse(responseParts, responseBoundary);
+
     // 7. Setup response
     response.setHeader(HttpHeader.CONTENT_TYPE, ContentType.MULTIPART_MIXED + ";boundary=" + responseBoundary);
     response.setContent(responseContent);