Merge pull request boncey#355 from rsadasiv/master

boncey · web-flow · commit f573cb9dd175 · 2020-01-08T19:35:33.000Z
set stats on Photo objects if requested via extras in SearchParameters
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.flickr4java</groupId>
     <artifactId>flickr4java</artifactId>
-    <version>3.0.3-SNAPSHOT</version>
+    <version>3.0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>flickr4java</name>
     <description>Java API For Flickr. Fork of FlickrJ.</description>
diff --git a/src/main/java/com/flickr4java/flickr/photos/PhotoUtils.java b/src/main/java/com/flickr4java/flickr/photos/PhotoUtils.java
@@ -2,6 +2,7 @@
 
 import com.flickr4java.flickr.people.User;
 import com.flickr4java.flickr.places.Place;
+import com.flickr4java.flickr.stats.Stats;
 import com.flickr4java.flickr.tags.Tag;
 import com.flickr4java.flickr.util.XMLUtilities;
 
@@ -489,6 +490,17 @@ public static final Photo createPhoto(Element photoElement, Element defaultEleme
         } catch (IndexOutOfBoundsException e) {
         } catch (NullPointerException e) {
         }
+        
+        //set stats from extras (count_faves,count_comments,count_views)
+        try {
+            Stats stats = new Stats();;
+            stats.setFavorites(photoElement.getAttribute("count_faves"));
+            stats.setComments(photoElement.getAttribute("count_comments"));
+            stats.setViews(photoElement.getAttribute("count_views"));
+            photo.setStats(stats);
+        } catch (IndexOutOfBoundsException e) {
+        } catch (NullPointerException e) {
+        }
 
         return photo;
     }
diff --git a/src/main/java/com/flickr4java/flickr/photos/SearchParameters.java b/src/main/java/com/flickr4java/flickr/photos/SearchParameters.java
@@ -302,7 +302,7 @@ public String getMachineTagMode() {
 
     /**
      * List of extra information to fetch for each returned record. Currently supported fields are: license, date_upload, date_taken, owner_name, icon_server,
-     * original_format, last_update, geo, tags, machine_tags, o_dims, views, media, path_alias, url_sq, url_t, url_s, url_m, url_l, url_o
+     * original_format, last_update, geo, tags, machine_tags, o_dims, views, media, path_alias, url_sq, url_t, url_s, url_m, url_l, url_o,count_faves,count_comments,count_views
      * 
      * @param extras
      *            A set of extra-attributes

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ public String getMachineTagMode() {`
`302`	`302`
`303`	`303`	`/**`
`304`	`304`	`* List of extra information to fetch for each returned record. Currently supported fields are: license, date_upload, date_taken, owner_name, icon_server,`
`305`		`- * original_format, last_update, geo, tags, machine_tags, o_dims, views, media, path_alias, url_sq, url_t, url_s, url_m, url_l, url_o`
	`305`	`+ * original_format, last_update, geo, tags, machine_tags, o_dims, views, media, path_alias, url_sq, url_t, url_s, url_m, url_l, url_o,count_faves,count_comments,count_views`
`306`	`306`	`*`
`307`	`307`	`* @param extras`
`308`	`308`	`* A set of extra-attributes`