Merged develop into master and stabilized - dealing with custom post types and custome category taxonomies

Author: clintonbosch

pom.xml

@@ -3,11 +3,10 @@
 
     <groupId>com.afrozaar.wordpress</groupId>
     <artifactId>wp-api-v2-client-java</artifactId>
-    <version>4.8.5</version>
+    <version>4.9.0</version>
 
     <packaging>jar</packaging>
 
-    
     <name>${project.groupId}:${project.artifactId}</name>
     <description>A Java client implementation to the WordPress WP-API v2 plugin.</description>
     <url>https://github.com/afrozaar/wp-api-v2-client-java</url>
@@ -34,7 +33,6 @@
         </developer>
         <developer>
             <name>Freddie O'Donnell</name>
-            <email></email>
             <organization>Afrozaar</organization>
             <organizationUrl>https://afrozaar.com</organizationUrl>
         </developer>
@@ -110,7 +108,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
+                <version>1.6</version>
                 <configuration>
                     <useAgent>true</useAgent>
                 </configuration>
@@ -245,12 +243,6 @@
             <artifactId>commons-beanutils-core</artifactId>
             <version>1.8.3</version>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.10</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

src/main/java/com/afrozaar/wordpress/wpapi/v2/Client.java

@@ -277,6 +277,17 @@ Request.MEDIAS, HttpMethod.GET, String.class, forExpand(),
         return Arrays.asList(medias);
     }
 
+    @Override
+    public List<Media> getPostMedias(Long postId, @Nullable String context) {
+        Media[] medias = CustomRenderableParser.parse(
+                doExchange1(
+                        Request.MEDIAS, HttpMethod.GET, String.class, forExpand(),
+                        ImmutableMap.of("parent", postId, CONTEXT_, context), null
+                ).getBody(),
+                Media[].class);
+        return Arrays.asList(medias);
+    }
+
     @Override
     public List<Media> getMedia() {
         List<Media> collected = new ArrayList<>();
@@ -441,6 +452,23 @@ public boolean deletePostMeta(Long postId, Long metaId, Boolean force) {
         }
     }
 
+    @Override
+    public boolean deleteCustomPostMeta(Long postId, Long metaId, Boolean force, String customPostTypeName) {
+        if (supportsMetaDeleteViaPostMethod.apply(postId, metaId)) {
+            // deleting meta via meta POST is available, so use that to delete.
+            final ResponseEntity<Map> result = doExchange1(Request.CUSTOM_META_POST_DELETE, HttpMethod.POST, Map.class, forExpand(customPostTypeName, postId, metaId),
+                    isNull(force) ? null : ImmutableMap.of(FORCE, force), null);
+            return result.getStatusCode().is2xxSuccessful() && "Deleted meta".equals(result.getBody().get("message"));
+        } else {
+            // attempt normal delete
+            final ResponseEntity<Map> exchange = doExchange1(Request.CUSTOM_POST_META, HttpMethod.DELETE, Map.class, forExpand(customPostTypeName, postId, metaId),
+                    isNull(force) ? null : ImmutableMap.of(FORCE, force), null);
+            Preconditions.checkArgument(exchange.getStatusCode().is2xxSuccessful(), format("Expected success on post meta delete request: /posts/%s/meta/%s", postId, metaId));
+
+            return exchange.getStatusCode().is2xxSuccessful();
+        }
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public List<Taxonomy> getTaxonomies() {
@@ -646,7 +674,8 @@ public List<Term> getCategories() {
         return getAllTermsForEndpoint(Request.CATEGORIES);
     }
 
-    private List<Term> getAllTermsForEndpoint(final String endpoint, String... expandParams) {
+    @Override
+    public List<Term> getAllTermsForEndpoint(final String endpoint, String... expandParams) {
         List<Term> collected = new ArrayList<>();
         PagedResponse<Term> pagedResponse = this.getPagedResponse(endpoint, Term.class, expandParams);
         collected.addAll(pagedResponse.getList());
@@ -962,10 +991,12 @@ protected Map<String, Object> fieldsFrom(Post post) {
     }
 
     private <T, B> ResponseEntity<T> doExchange0(HttpMethod method, URI uri, Class<T> typeRef, B body, @Nullable MediaType mediaType) {
-        final Tuple2<String, String> authTuple = AuthUtil.authTuple(username, password);
         final RequestEntity.BodyBuilder builder = RequestEntity.method(method, uri)
-                .header(authTuple.v1, authTuple.v2)
                 .header(userAgentTuple.v1, userAgentTuple.v2);
+        if (username != null && password != null) {
+            final Tuple2<String, String> authTuple = AuthUtil.authTuple(username, password);
+            builder.header(authTuple.v1, authTuple.v2);
+        }
 
         ofNullable(mediaType).ifPresent(builder::contentType);
 

src/main/java/com/afrozaar/wordpress/wpapi/v2/api/Categories.java

@@ -9,6 +9,8 @@ public interface Categories {
 
     List<Term> getCategories();
 
+    List<Term> getAllTermsForEndpoint(final String endpoint, String... expandParams);
+
     Term getCategory(Long id);
 
     Term createCategory(Term categoryTerm);

src/main/java/com/afrozaar/wordpress/wpapi/v2/api/Medias.java

@@ -34,4 +34,7 @@ public interface Medias {
     Post setPostFeaturedMedia(Long postId, Media media);
 
     List<Media> getPostMedias(Long postId);
+
+    List<Media> getPostMedias(Long postId, @Nullable String context);
+
 }

src/main/java/com/afrozaar/wordpress/wpapi/v2/api/PostMetas.java

@@ -30,4 +30,6 @@ public interface PostMetas {
     boolean deletePostMeta(Long postId, Long metaId);
 
     boolean deletePostMeta(Long postId, Long metaId, Boolean force);
+
+    boolean deleteCustomPostMeta(Long postId, Long metaId, Boolean force, String customPostTypeName);
 }

src/main/java/com/afrozaar/wordpress/wpapi/v2/request/Request.java

@@ -26,6 +26,7 @@ public abstract class Request {
     public static final String CUSTOM_POST_METAS = "/{postType}/{postId}/meta";
     public static final String CUSTOM_POST_META = "/{postType}/{postId}/meta/{metaId}";
     public static final String META_POST_DELETE = "/posts/{postId}/meta/{metaId}/delete";
+    public static final String CUSTOM_META_POST_DELETE = "/{postType}/{postId}/meta/{metaId}/delete";
     public static final String TAXONOMIES = "/taxonomies";
     public static final String TAXONOMY = "/taxonomies/{slug}";
     public static final String TERMS = "/terms/{taxonomySlug}";