Allow specifying request context when requesting Media.

johanmynhardt · johanmynhardt · commit ce99a0315199 · 2017-09-13T15:14:01.000+02:00
This resolves #45 To ensure backward compatibility, a new `getMedia` with an additional nullable String parameter is added, that the existing getMedia now call. (`getMedia(:id, null)`)
diff --git a/src/main/java/com/afrozaar/wordpress/wpapi/v2/Client.java b/src/main/java/com/afrozaar/wordpress/wpapi/v2/Client.java
@@ -283,7 +283,13 @@ public List<Media> getMedia() {
 
     @Override
     public Media getMedia(Long id) {
-        return CustomRenderableParser.parse(doExchange1(Request.MEDIA, HttpMethod.GET, String.class, forExpand(id), ImmutableMap.of(CONTEXT_, Contexts.EDIT), null), Media.class);
+        return getMedia(id, null);
+    }
+
+    @Override
+    public Media getMedia(Long id, @Nullable String context) {
+        final ImmutableMap<String, Object> queryParams = ImmutableMap.of(CONTEXT_, ofNullable(context).orElse(Contexts.EDIT));
+        return CustomRenderableParser.parse(doExchange1(Request.MEDIA, HttpMethod.GET, String.class, forExpand(id), queryParams, null), Media.class);
     }
 
     @Override
diff --git a/src/main/java/com/afrozaar/wordpress/wpapi/v2/api/Medias.java b/src/main/java/com/afrozaar/wordpress/wpapi/v2/api/Medias.java
@@ -6,6 +6,8 @@
 
 import org.springframework.core.io.Resource;
 
+import javax.annotation.Nullable;
+
 import java.util.List;
 
 public interface Medias {
@@ -16,6 +18,13 @@ public interface Medias {
 
     Media getMedia(Long id);
 
+    /**
+     * @param id The media's ID.
+     * @param context One of {@code view}, {@code edit} or {@code embed}.
+     *                If {@code context} is not provided, it will default to {@code edit}
+     */
+    Media getMedia(Long id, @Nullable String context);
+
     Media updateMedia(Media media);
 
     boolean deleteMedia(Media media);
diff --git a/src/test/java/com/afrozaar/wordpress/wpapi/v2/WordpressClientTest.java b/src/test/java/com/afrozaar/wordpress/wpapi/v2/WordpressClientTest.java
@@ -4,6 +4,7 @@
 
 import static org.junit.Assert.fail;
 
+import com.afrozaar.wordpress.wpapi.v2.api.Contexts;
 import com.afrozaar.wordpress.wpapi.v2.config.ClientConfig;
 import com.afrozaar.wordpress.wpapi.v2.config.ClientFactory;
 import com.afrozaar.wordpress.wpapi.v2.exception.WpApiParsedException;
@@ -60,9 +61,6 @@ public void CreateMedia_MustFallOverWhenResourceDoesNotReturnFilename() throws W
 
     @Test
     public void CreateMedia_MustNotFallOverWhenResourceReturnsFileName() throws WpApiParsedException {
-
-
-
         try {
             wordpress.createMedia(MediaBuilder.aMedia().build(), new FilenameWrapperByteArrayResource(new byte[0], "myfile.png"));
         } catch (RuntimeException e) {
@@ -72,4 +70,9 @@ public void CreateMedia_MustNotFallOverWhenResourceReturnsFileName() throws WpAp
         }
     }
 
+    @Test
+    public void GetMediaWithViewContext_MustReturnMediaWithAvailableFieldsPopulated() {
+        System.out.println("media = " + wordpress.getMedia(1033L, Contexts.VIEW));
+    }
+
 }
