fix bug where identifyMetadataOnly() ignored postback headers

Author: chrylis

blitline-image-client-example/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.blitline</groupId>
 		<artifactId>blitline-java-parent</artifactId>
-		<version>0.14.2</version>
+		<version>0.14.3</version>
 	</parent>
 
 	<artifactId>blitline-image-client-example</artifactId>

blitline-image-client-spring/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.blitline</groupId>
 		<artifactId>blitline-java-parent</artifactId>
-		<version>0.14.2</version>
+		<version>0.14.3</version>
 	</parent>
 
 	<artifactId>blitline-image-client-spring</artifactId>

blitline-image-client-spring/src/test/java/com/blitline/image/spring/web/AbstractBlitlinePostbackControllerTest.java

@@ -0,0 +1,28 @@
+package com.blitline.image.spring.web;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+
+public abstract class AbstractBlitlinePostbackControllerTest {
+
+    protected MockMvc mockMvc;
+
+    public static final String POSTBACK_TO = BlitlinePostbackController.BASE_ENDPOINT + BlitlinePostbackController.IMAGE_PATH;
+
+    public static final String SUCCESS_POSTBACK_CONTENT = "{\"results\":"
+        + "{\"original_meta\":{\"width\":3740,\"height\":5573,\"date_created\":\"2011:06:07 22:09:30\"},"
+        + "\"images\":[{\"image_identifier\":\"6odPpPC9Ayy8Z2ETs9i1Bk-ts\",\"s3_url\":\"http://s3.amazonaws.com/some-bucket/6odPpPC9Ayy8Z2ETs9i1Bk-ts.webp\",\"meta\":{\"width\":43,\"height\":64}}],"
+        + "\"job_id\":\"3WkW98qII4EMriH4jV3eAkQ\"}}";
+
+
+    public AbstractBlitlinePostbackControllerTest() {
+        // TODO Auto-generated constructor stub
+    }
+
+    protected MockHttpServletRequestBuilder postPostback(String content) throws Exception {
+        return post(POSTBACK_TO).contentType(MediaType.APPLICATION_JSON).content(content);
+    }
+}

blitline-image-client-spring/src/test/java/com/blitline/image/spring/web/BlitlinePostbackControllerTest.java

@@ -17,16 +17,13 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import com.blitline.image.BlitlinePostback;
 import com.blitline.image.spring.BlitlineObjectMapperHolder;
 import com.blitline.image.spring.postback.BlitlinePostbackHandler;
 
-public class BlitlinePostbackControllerTest {
+public class BlitlinePostbackControllerTest extends AbstractBlitlinePostbackControllerTest {
 
     @Mock
     private BlitlinePostbackHandler postbackHandler;
@@ -40,26 +37,13 @@ public class BlitlinePostbackControllerTest {
     @InjectMocks
     private BlitlinePostbackController controller;
 
-    public static final String POSTBACK_TO = BlitlinePostbackController.BASE_ENDPOINT + BlitlinePostbackController.IMAGE_PATH;
-
-    private MockMvc mockMvc;
-
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
 
         mockMvc = MockMvcBuilders.standaloneSetup(controller).setMessageConverters(new BlitlinePostbackHttpMessageConverter(new BlitlineObjectMapperHolder())).build();
     }
 
-    public static final String SUCCESS_POSTBACK_CONTENT = "{\"results\":"
-        + "{\"original_meta\":{\"width\":3740,\"height\":5573,\"date_created\":\"2011:06:07 22:09:30\"},"
-        + "\"images\":[{\"image_identifier\":\"6odPpPC9Ayy8Z2ETs9i1Bk-ts\",\"s3_url\":\"http://s3.amazonaws.com/some-bucket/6odPpPC9Ayy8Z2ETs9i1Bk-ts.webp\",\"meta\":{\"width\":43,\"height\":64}}],"
-        + "\"job_id\":\"3WkW98qII4EMriH4jV3eAkQ\"}}";
-
-    private MockHttpServletRequestBuilder postPostback(String content) throws Exception {
-        return post(POSTBACK_TO).contentType(MediaType.APPLICATION_JSON).content(content);
-    }
-
     @Test
     public void noContentType() throws Exception {
         mockMvc.perform(post(POSTBACK_TO).content("{}")).andExpect(status().isUnsupportedMediaType());

blitline-image-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.blitline</groupId>
 		<artifactId>blitline-java-parent</artifactId>
-		<version>0.14.2</version>
+		<version>0.14.3</version>
 	</parent>
 
 	<artifactId>blitline-image-client</artifactId>

blitline-image-client/src/main/java/com/blitline/image/BlitlineImageJob.java

@@ -283,10 +283,8 @@ public BlitlineImageJob identifyMetadataOnly() {
          * @return a job specification that will only read and return metadata
          */
         public BlitlineImageJob identifyMetadataOnly(String identifierPart) {
-            BlitlineImageJob job = new BlitlineImageJob(applicationId, src, true, postbackUrl);
-            job.apply(Blitline.noOp().andSkipSave(identifierPart + IDENTIFY_ONLY_SUFFIX));
-            return job;
+            this.withExtendedMetadata();
+            return apply(Blitline.noOp().andSkipSave(identifierPart + IDENTIFY_ONLY_SUFFIX));
         }
-
     }
 }

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.blitline</groupId>
     <artifactId>blitline-java-parent</artifactId>
-    <version>0.14.2</version>
+    <version>0.14.3</version>
     <packaging>pom</packaging>
     <name>Blitline Java client</name>
     <description>Java client libraries for Blitline</description>
@@ -42,7 +42,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.6</java.version>
-        <spring.framework.version>4.1.1.RELEASE</spring.framework.version>
+        <spring.framework.version>4.1.2.RELEASE</spring.framework.version>
         <spring.boot.version>1.1.8.RELEASE</spring.boot.version>
     </properties>