Add Content Type header when creating entries

contentful · Nov 22, 2014 · f5d3085 · f5d3085
1 parent 14e4ad3
commit f5d3085
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/main/java/com/contentful/java/cma/ModuleEntries.java b/src/main/java/com/contentful/java/cma/ModuleEntries.java
@@ -58,11 +58,12 @@ public CMAEntry archive(CMAEntry entry) {
    * success.
    *
    * @param spaceId Space ID
+   * @param contentTypeId Content Type ID
    * @param entry Entry
    * @return {@link CMAEntry} result instance
    */
   @SuppressWarnings("unchecked")
-  public CMAEntry create(String spaceId, CMAEntry entry) {
+  public CMAEntry create(String spaceId, String contentTypeId, CMAEntry entry) {
     assertNotNull(spaceId, "spaceId");
     assertNotNull(entry, "entry");
 
@@ -73,9 +74,9 @@ public CMAEntry create(String spaceId, CMAEntry entry) {
     try {
       CMAEntry result;
       if (entryId == null) {
-        result = service.create(spaceId, entry);
+        result = service.create(spaceId, contentTypeId, entry);
       } else {
-        result = service.create(spaceId, entryId, entry);
+        result = service.create(spaceId, contentTypeId, entryId, entry);
       }
       entry.setSys(sys);
       return result;
@@ -210,15 +211,16 @@ public CMACallback<CMAEntry> archive(final CMAEntry entry, CMACallback<CMAEntry>
      * success.
      *
      * @param spaceId Space ID
+     * @param contentTypeId Content Type ID
      * @param entry Entry
      * @param callback Callback
      * @return the given {@code CMACallback} instance
      */
-    public CMACallback<CMAEntry> create(final String spaceId, final CMAEntry entry,
-        CMACallback<CMAEntry> callback) {
+    public CMACallback<CMAEntry> create(final String spaceId, final String contentTypeId,
+        final CMAEntry entry, CMACallback<CMAEntry> callback) {
       return defer(new RxExtensions.DefFunc<CMAEntry>() {
         @Override CMAEntry method() {
-          return ModuleEntries.this.create(spaceId, entry);
+          return ModuleEntries.this.create(spaceId, contentTypeId, entry);
         }
       }, callback);
     }

diff --git a/src/main/java/com/contentful/java/cma/ServiceEntries.java b/src/main/java/com/contentful/java/cma/ServiceEntries.java
@@ -39,11 +39,13 @@ CMAEntry archive(
   @POST("/spaces/{space}/entries")
   CMAEntry create(
       @Path("space") String spaceId,
+      @Header("X-Contentful-Content-Type") String contentType,
       @Body CMAEntry entry);
 
   @PUT("/spaces/{space}/entries/{entry}")
   CMAEntry create(
       @Path("space") String spaceId,
+      @Header("X-Contentful-Content-Type") String contentType,
       @Path("entry") String entryId,
       @Body CMAEntry entry);
 

diff --git a/src/test/kotlin/com/contentful/java/cma/EntryTests.kt b/src/test/kotlin/com/contentful/java/cma/EntryTests.kt
@@ -60,7 +60,7 @@ class EntryTests : BaseTest() {
 
         val result = assertTestCallback(client!!.entries()
                 .async()
-                .create("spaceid", entry, TestCallback()) as TestCallback)
+                .create("spaceid", "ctid", entry, TestCallback()) as TestCallback)
 
         assertEquals(2, result.getFields().size)
 
@@ -76,6 +76,7 @@ class EntryTests : BaseTest() {
         assertEquals("POST", recordedRequest.getMethod())
         assertEquals("/spaces/spaceid/entries", recordedRequest.getPath())
         assertEquals(requestBody, recordedRequest.getBodyAsString())
+        assertEquals("ctid", recordedRequest.getHeader("X-Contentful-Content-Type"))
     }
 
     test fun testCreateWithId() {
@@ -89,13 +90,14 @@ class EntryTests : BaseTest() {
                 .setField("fid2", "value2", "en-US")
 
         assertTestCallback(client!!.entries().async().create(
-                "spaceid", entry, TestCallback()) as TestCallback)
+                "spaceid", "ctid", entry, TestCallback()) as TestCallback)
 
         // Request
         val recordedRequest = server!!.takeRequest()
         assertEquals("PUT", recordedRequest.getMethod())
         assertEquals("/spaces/spaceid/entries/entryid", recordedRequest.getPath())
         assertEquals(requestBody, recordedRequest.getBodyAsString())
+        assertEquals("ctid", recordedRequest.getHeader("X-Contentful-Content-Type"))
     }
 
     test fun testDelete() {
@@ -240,7 +242,7 @@ class EntryTests : BaseTest() {
 
         val entry = CMAEntry().setVersion(31337.0)
         try {
-            badClient.entries().create("spaceid", entry)
+            badClient.entries().create("spaceid", "ctid", entry)
         } catch (e: RetrofitError) {
             assertEquals(31337, entry.getVersion())
             throw e