You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/07/16 20:55:12 UTC

olingo-odata2 git commit: [OLINGO-733] Start with fix for batch

Repository: olingo-odata2
Updated Branches:
  refs/heads/OLINGO-733_BatchFix [created] ba37bcae2


[OLINGO-733] Start with fix for batch


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/ba37bcae
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/ba37bcae
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/ba37bcae

Branch: refs/heads/OLINGO-733_BatchFix
Commit: ba37bcae20a957b3107dcf443e4c222ef726fff5
Parents: 5cbc750
Author: mibo <mi...@mirb.de>
Authored: Thu Jul 16 20:54:39 2015 +0200
Committer: mibo <mi...@mirb.de>
Committed: Thu Jul 16 20:54:39 2015 +0200

----------------------------------------------------------------------
 .../api/client/batch/BatchChangeSetPart.java    |   2 +
 .../core/batch/BatchChangeSetPartImpl.java      |  25 ++++
 .../odata2/core/batch/BatchRequestWriter.java   | 127 +++++++++++++++++--
 .../odata2/core/batch/BatchRequestTest.java     |  37 ++++++
 .../core/batch/BatchRequestWriterTest.java      |  43 +++++++
 5 files changed, 223 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ba37bcae/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
index d9a81d8..ecabf9b 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/client/batch/BatchChangeSetPart.java
@@ -32,6 +32,8 @@ public abstract class BatchChangeSetPart {
 
   public abstract String getBody();
 
+  public abstract byte[] getBodyAsBytes();
+
   public abstract String getUri();
 
   public abstract String getMethod();

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ba37bcae/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
index 6adcf63..8c66bfb 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
@@ -18,13 +18,17 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.core.batch;
 
+import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.olingo.odata2.api.client.batch.BatchChangeSetPart;
+import org.apache.olingo.odata2.api.commons.HttpHeaders;
+import org.apache.olingo.odata2.core.commons.ContentType;
 
 public class BatchChangeSetPartImpl extends BatchChangeSetPart {
+  private static final Charset DEFAULT_CHARSET = Charset.forName("utf-8");
   private String method;
   private Map<String, String> headers = new HashMap<String, String>();
   private String body;
@@ -43,6 +47,27 @@ public class BatchChangeSetPartImpl extends BatchChangeSetPart {
   }
 
   @Override
+  public byte[] getBodyAsBytes() {
+    if(body == null) {
+      return new byte[0];
+    }
+    Charset charset = getCharset();
+    return body.getBytes(charset);
+  }
+
+  private Charset getCharset() {
+    String contentType = headers.get(HttpHeaders.CONTENT_TYPE);
+    ContentType ct = ContentType.parse(contentType);
+    if(ct != null) {
+      String charsetString = ct.getParameters().get(ContentType.PARAMETER_CHARSET);
+      if (charsetString != null && Charset.isSupported(charsetString)) {
+        return Charset.forName(charsetString);
+      }
+    }
+    return DEFAULT_CHARSET;
+  }
+
+  @Override
   public String getMethod() {
     return method;
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ba37bcae/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java
index 85242c6..2b2da31 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestWriter.java
@@ -19,7 +19,13 @@
 package org.apache.olingo.odata2.core.batch;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.WritableByteChannel;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Map;
 
@@ -29,6 +35,7 @@ import org.apache.olingo.odata2.api.client.batch.BatchPart;
 import org.apache.olingo.odata2.api.client.batch.BatchQueryPart;
 import org.apache.olingo.odata2.api.commons.HttpContentType;
 import org.apache.olingo.odata2.api.commons.HttpHeaders;
+import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 public class BatchRequestWriter {
   private static final String REG_EX_BOUNDARY =
@@ -41,7 +48,8 @@ public class BatchRequestWriter {
   public static final String BOUNDARY_PREAMBLE = "changeset";
   public static final String HTTP_1_1 = "HTTP/1.1";
   private String batchBoundary;
-  private StringBuilder writer = new StringBuilder();
+//  private StringBuilder writer = new StringBuilder();
+  private BodyBuilder writer = new BodyBuilder();
 
   public InputStream writeBatchRequest(final List<BatchPart> batchParts, final String boundary) {
     if (boundary.matches(REG_EX_BOUNDARY)) {
@@ -55,8 +63,7 @@ public class BatchRequestWriter {
         appendChangeSet((BatchChangeSet) batchPart);
       } else if (batchPart instanceof BatchQueryPart) {
         BatchQueryPart request = (BatchQueryPart) batchPart;
-        appendRequestBodyPart(request.getMethod(), request.getUri(), null, request.getHeaders(),
-            request.getContentId());
+        appendRequestBodyPart(request);
       }
       
     }
@@ -66,6 +73,7 @@ public class BatchRequestWriter {
     return batchRequestBody;
   }
 
+
   private void appendChangeSet(final BatchChangeSet batchChangeSet) {
     String boundary = BatchHelper.generateBoundary(BOUNDARY_PREAMBLE);
     while (boundary.equals(batchBoundary) || !boundary.matches(REG_EX_BOUNDARY)) {
@@ -75,14 +83,24 @@ public class BatchRequestWriter {
         HttpContentType.MULTIPART_MIXED + "; boundary=" + boundary).append(CRLF);
     for (BatchChangeSetPart request : batchChangeSet.getChangeSetParts()) {
       writer.append(CRLF).append("--").append(boundary).append(CRLF);
-      appendRequestBodyPart(request.getMethod(), request.getUri(), request.getBody(), request.getHeaders(), request
-          .getContentId());
+      appendRequestBodyPart(request);
     }
     writer.append(CRLF).append("--").append(boundary).append("--").append(CRLF);
   }
 
-  private void appendRequestBodyPart(final String method, final String uri, final String body,
-      final Map<String, String> headers, final String contentId) {
+  private void appendRequestBodyPart(BatchQueryPart request) {
+    appendRequestBodyPart(request.getMethod(), request.getUri(), request.getHeaders(),
+        new Body(null), request.getContentId());
+  }
+
+  private void appendRequestBodyPart(BatchChangeSetPart request) {
+    appendRequestBodyPart(request.getMethod(), request.getUri(), request.getHeaders(),
+        new Body(request), request.getContentId());
+  }
+
+  private void appendRequestBodyPart(String method, String uri,
+                                     Map<String, String> headers, Body body, String contentId) {
+
     boolean isContentLengthPresent = false;
     writer.append(HttpHeaders.CONTENT_TYPE).append(COLON).append(SP).append(HttpContentType.APPLICATION_HTTP)
         .append(CRLF);
@@ -99,14 +117,13 @@ public class BatchRequestWriter {
     writer.append(method).append(SP).append(uri).append(SP).append(HTTP_1_1);
     writer.append(CRLF);
 
-    if (!isContentLengthPresent && body != null && !body.isEmpty()) {
-      writer.append(HttpHeaders.CONTENT_LENGTH).append(COLON).append(SP).append(BatchHelper.getBytes(body).length)
-          .append(CRLF);
+    if (!isContentLengthPresent && !body.isEmpty()) {
+      writer.append(HttpHeaders.CONTENT_LENGTH).append(COLON).append(SP).append(body.getLength()).append(CRLF);
     }
     appendHeader(headers);
     writer.append(CRLF);
 
-    if (body != null && !body.isEmpty()) {
+    if (!body.isEmpty()) {
       writer.append(body);
     } else {
       writer.append(CRLF);
@@ -128,4 +145,92 @@ public class BatchRequestWriter {
     }
     return null;
   }
+
+  /**
+   * Builder class to create the body and the header.
+   */
+  private class BodyBuilder {
+    private final Charset CHARSET_ISO_8859_1 = Charset.forName("iso-8859-1");
+    private ByteBuffer buffer = ByteBuffer.allocate(8192);
+    private boolean isClosed = false;
+
+    public byte[] getContent() {
+      isClosed = true;
+      byte[] tmp = new byte[buffer.position()];
+      buffer.flip();
+      buffer.get(tmp, 0, buffer.limit());
+      return tmp;
+    }
+
+    public BodyBuilder append(String string) {
+      byte [] b = string.getBytes(CHARSET_ISO_8859_1);
+      put(b);
+      return this;
+    }
+
+    private void put(byte[] b) {
+      if(isClosed) {
+        throw new RuntimeException("BodyBuilder is closed.");
+      }
+      if(buffer.remaining() < b.length) {
+        buffer.flip();
+        ByteBuffer tmp = ByteBuffer.allocate(buffer.limit() *2);
+        tmp.put(buffer);
+        buffer = tmp;
+      }
+      buffer.put(b);
+    }
+
+    public BodyBuilder append(int statusCode) {
+      return append(String.valueOf(statusCode));
+    }
+
+    public BodyBuilder append(Body body) {
+      put(body.getContent());
+      return this;
+    }
+
+    public String toString() {
+      return new String(buffer.array(), 0, buffer.position());
+    }
+  }
+
+  /**
+   * Body part which is read and stored as bytes (no charset conversion).
+   */
+  private class Body {
+    private final byte[] content;
+
+    public Body(BatchChangeSetPart response) {
+      this.content = getBody(response);
+    }
+
+    public int getLength() {
+      return content.length;
+    }
+
+    public byte[] getContent() {
+      return content;
+    }
+
+    public boolean isEmpty() {
+      return content.length == 0;
+    }
+
+    private byte[] getBody(final BatchChangeSetPart response) {
+      if (response == null || response.getBodyAsBytes() == null) {
+        return new byte[0];
+      }
+
+      try {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        ByteBuffer inBuffer = ByteBuffer.wrap(response.getBodyAsBytes());
+        WritableByteChannel oc = Channels.newChannel(output);
+        oc.write(inBuffer);
+        return output.toByteArray();
+      } catch (IOException e) {
+        throw new ODataRuntimeException("Error on reading request content");
+      }
+    }
+  }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ba37bcae/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestTest.java
index 7898a2c..c84e5b6 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestTest.java
@@ -131,6 +131,43 @@ public class BatchRequestTest {
   }
 
   @Test
+  public void testBatchChangeSetIso() throws IOException, BatchException {
+    List<BatchPart> batch = new ArrayList<BatchPart>();
+    Map<String, String> headers = new HashMap<String, String>();
+    headers.put("content-type", "application/json; charset=ido-8859-1");
+    BatchChangeSetPart request = BatchChangeSetPart.method(PUT)
+        .uri("Employees('2')")
+        .body("{\"Name\":Wälter}")
+        .headers(headers)
+        .contentId("111")
+        .build();
+    BatchChangeSet changeSet = BatchChangeSet.newBuilder().build();
+    changeSet.add(request);
+    batch.add(changeSet);
+
+    BatchRequestWriter writer = new BatchRequestWriter();
+    InputStream batchRequest = writer.writeBatchRequest(batch, BOUNDARY);
+    assertNotNull(batchRequest);
+
+    StringHelper.Stream batchRequestStream = StringHelper.toStream(batchRequest);
+    String requestBody = batchRequestStream.asString();
+    checkMimeHeaders(requestBody);
+    checkHeaders(headers, requestBody);
+
+    assertTrue(requestBody.contains("--batch_"));
+    assertTrue(requestBody.contains("--changeset_"));
+    assertTrue(requestBody.contains("PUT Employees('2') HTTP/1.1"));
+    assertTrue(requestBody.contains("{\"Name\":Wälter}"));
+    assertEquals(15, batchRequestStream.linesCount());
+
+    String contentType = "multipart/mixed; boundary=" + BOUNDARY;
+    BatchParser parser = new BatchParser(contentType, parseProperties, true);
+    List<BatchRequestPart> parseResult = parser.parseBatchRequest(batchRequestStream.asStream());
+    assertEquals(1, parseResult.size());
+  }
+
+
+  @Test
   public void testBatchWithGetAndPost() throws BatchException, IOException {
     List<BatchPart> batch = new ArrayList<BatchPart>();
     Map<String, String> headers = new HashMap<String, String>();

http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/ba37bcae/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java
index 395c2b8..3f18e69 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestWriterTest.java
@@ -36,6 +36,7 @@ import org.apache.olingo.odata2.api.client.batch.BatchPart;
 import org.apache.olingo.odata2.api.client.batch.BatchQueryPart;
 import org.apache.olingo.odata2.core.batch.v2.BufferedReaderIncludingLineEndings;
 import org.apache.olingo.odata2.core.batch.v2.BufferedReaderIncludingLineEndings.Line;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class BatchRequestWriterTest {
@@ -116,6 +117,48 @@ public class BatchRequestWriterTest {
   }
 
   @Test
+  @Ignore("not yet finished")
+  public void testBatchChangeSetUtf8() throws IOException, BatchException {
+    List<BatchPart> batch = new ArrayList<BatchPart>();
+    Map<String, String> headers = new HashMap<String, String>();
+    headers.put("content-type", "application/json; charset=utf-8");
+    BatchChangeSetPart request = BatchChangeSetPart.method(PUT)
+        .uri("Employees('2')")
+        .body("{\"Age\":40, \"Name\": \"Wälter Winter\"}")
+        .headers(headers)
+        .contentId("111")
+        .build();
+    BatchChangeSet changeSet = BatchChangeSet.newBuilder().build();
+    changeSet.add(request);
+    batch.add(changeSet);
+
+    BatchRequestWriter writer = new BatchRequestWriter();
+    InputStream batchRequest = writer.writeBatchRequest(batch, BOUNDARY);
+
+    BufferedReaderIncludingLineEndings reader =
+        new BufferedReaderIncludingLineEndings(new InputStreamReader(batchRequest));
+    List<Line> lines = reader.toList();
+    reader.close();
+    int index = 0;
+
+    assertTrue(lines.get(index++).toString().startsWith("--batch"));
+    assertTrue(lines.get(index++).toString().startsWith("Content-Type: multipart/mixed; boundary=changeset_"));
+    assertEquals(CRLF, lines.get(index++).toString());
+    assertTrue(lines.get(index++).toString().startsWith("--changeset"));
+    assertEquals("Content-Type: application/http" + CRLF, lines.get(index++).toString());
+    assertEquals("Content-Transfer-Encoding: binary" + CRLF, lines.get(index++).toString());
+    assertEquals("Content-Id: 111" + CRLF, lines.get(index++).toString());
+    assertEquals(CRLF, lines.get(index++).toString());
+    assertEquals("PUT Employees('2') HTTP/1.1" + CRLF, lines.get(index++).toString());
+    assertEquals("Content-Length: 36" + CRLF, lines.get(index++).toString());
+    assertEquals("content-type: application/json; charset=utf-8" + CRLF, lines.get(index++).toString());
+    assertEquals(CRLF, lines.get(index++).toString());
+    assertEquals("{\"Age\":40, \"Name\": \"Wälter Winter\"}" + CRLF, lines.get(index++).toString());
+    assertTrue(lines.get(index++).toString().startsWith("--changeset"));
+    assertTrue(lines.get(index++).toString().startsWith("--batch"));
+  }
+
+  @Test
   public void testBatchWithGetAndPost() throws BatchException, IOException {
     List<BatchPart> batch = new ArrayList<BatchPart>();
     Map<String, String> headers = new HashMap<String, String>();