From f1318be82981e60d82045da7a0258fd786819d94 Mon Sep 17 00:00:00 2001 From: LEE EUI SEOK Date: Mon, 10 Oct 2016 16:55:19 +0900 Subject: [PATCH] Remove all about bio. (Solve the issue "(#12) bio field is deprecated for versions v2.8 and higher") --- .../org/springframework/social/facebook/api/Page.java | 6 ------ .../social/facebook/api/PageUpdate.java | 8 -------- .../org/springframework/social/facebook/api/User.java | 11 ----------- .../social/facebook/api/UserOperations.java | 2 +- .../social/facebook/api/impl/FriendTemplate.java | 2 +- .../social/facebook/api/impl/GroupTemplate.java | 2 +- .../social/facebook/api/impl/json/PageMixin.java | 3 --- .../social/facebook/api/impl/json/UserMixin.java | 3 --- .../social/facebook/api/FriendTemplateTest.java | 4 ++-- .../social/facebook/api/GroupTemplateTest.java | 2 +- .../social/facebook/api/UserTemplateTest.java | 1 - .../social/facebook/api/full-profile.json | 1 - .../social/facebook/api/user-profiles.json | 1 - 13 files changed, 6 insertions(+), 40 deletions(-) diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/Page.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/Page.java index 627b6747c..a211f5120 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/Page.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/Page.java @@ -49,8 +49,6 @@ public class Page extends FacebookObject { private Page bestPage; - private String bio; - private String birthday; private String bookingAgent; @@ -461,10 +459,6 @@ public String getBandInterests() { return bandInterests; } - public String getBio() { - return bio; - } - public String getBuilt() { return built; } diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/PageUpdate.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/PageUpdate.java index e99dbca9e..7f1adaeb0 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/PageUpdate.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/PageUpdate.java @@ -28,8 +28,6 @@ public class PageUpdate { private String about; - private String bio; - private String cover; private String name; @@ -63,11 +61,6 @@ public PageUpdate about(String about) { return this; } - public PageUpdate bio(String bio) { - this.bio = bio; - return this; - } - public PageUpdate cover(String cover, Integer offsetX, Integer offsetY, Float zoomScaleX, Float zoomScaleY, Float focusX, Float focusY) { this.cover = cover; this.offsetX = offsetX; @@ -87,7 +80,6 @@ public PageUpdate name(String name) { public MultiValueMap toRequestParameters() { MultiValueMap parameters = new LinkedMultiValueMap(); if (about != null) { parameters.add("about", about); } - if (bio != null) { parameters.add("bio", bio); } if (cover != null) { parameters.add("cover", cover); } if (name != null) { parameters.add("name", name); } if (offsetX != null) { parameters.add("offset_x", offsetX.toString()); } diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/User.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/User.java index b1abe127c..139641268 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/User.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/User.java @@ -37,8 +37,6 @@ public class User extends FacebookObject implements Serializable { private AgeRange ageRange = AgeRange.UNKNOWN; - private String bio; - private String birthday; private CoverPhoto cover; @@ -287,15 +285,6 @@ public String getAbout() { return about; } - /** - * The user's bio. - * Available only with "user_about_me" permission for the authenticated user. - * @return the user's bio, if available. - */ - public String getBio() { - return bio; - } - /** * The user's birthday. * Available only with "user_birthday" permission for the authentication user permission for the user's friends. diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/UserOperations.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/UserOperations.java index c1aa5b1f4..00d1155f6 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/UserOperations.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/UserOperations.java @@ -127,7 +127,7 @@ public interface UserOperations { PagedList search(String query); static final String[] PROFILE_FIELDS = { - "id", "about", "age_range", "bio", "birthday", "context", "cover", "currency", "devices", "education", "email", + "id", "about", "age_range", "birthday", "context", "cover", "currency", "devices", "education", "email", "favorite_athletes", "favorite_teams", "first_name", "gender", "hometown", "inspirational_people", "installed", "install_type", "is_verified", "languages", "last_name", "link", "locale", "location", "meeting_for", "middle_name", "name", "name_format", "political", "quotes", "payment_pricepoints", "relationship_status", "religion", "security_settings", "significant_other", diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/FriendTemplate.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/FriendTemplate.java index e1469a80b..52855d873 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/FriendTemplate.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/FriendTemplate.java @@ -120,6 +120,6 @@ public PagedList getTaggableFriends() { "id", "name" ,"picture", "first_name", "last_name", "middle_name"); } - private static final String FULL_PROFILE_FIELDS = "id,name,first_name,last_name,gender,locale,education,work,email,third_party_id,link,timezone,updated_time,verified,about,bio,birthday,location,hometown,interested_in,religion,political,quotes,relationship_status,significant_other,website"; + private static final String FULL_PROFILE_FIELDS = "id,name,first_name,last_name,gender,locale,education,work,email,third_party_id,link,timezone,updated_time,verified,about,birthday,location,hometown,interested_in,religion,political,quotes,relationship_status,significant_other,website"; } diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/GroupTemplate.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/GroupTemplate.java index d71edd74b..d8e7ed39b 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/GroupTemplate.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/GroupTemplate.java @@ -74,6 +74,6 @@ public PagedList search(String query, PagingParameters pagedListParameter return graphApi.fetchConnections("search", "", Group.class, queryMap); } - private static final String[] FULL_PROFILE_FIELDS = {"id", "name", "first_name", "last_name", "gender", "locale", "education", "work", "email", "third_party_id", "link", "timezone", "updated_time", "verified", "about", "bio", "birthday", "location", "hometown", "interested_in", "religion", "political", "quotes", "relationship_status", "significant_other", "website"}; + private static final String[] FULL_PROFILE_FIELDS = {"id", "name", "first_name", "last_name", "gender", "locale", "education", "work", "email", "third_party_id", "link", "timezone", "updated_time", "verified", "about", "birthday", "location", "hometown", "interested_in", "religion", "political", "quotes", "relationship_status", "significant_other", "website"}; } diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/json/PageMixin.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/json/PageMixin.java index 6adbc18b7..3873ee810 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/json/PageMixin.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/json/PageMixin.java @@ -191,9 +191,6 @@ abstract class PageMixin extends FacebookObjectMixin { @JsonProperty("band_interests") String bandInterests; - @JsonProperty("bio") - String bio; - @JsonProperty("built") String built; diff --git a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/json/UserMixin.java b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/json/UserMixin.java index ece97720f..665d259d6 100644 --- a/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/json/UserMixin.java +++ b/spring-social-facebook/src/main/java/org/springframework/social/facebook/api/impl/json/UserMixin.java @@ -110,9 +110,6 @@ abstract class UserMixin extends FacebookObjectMixin { @JsonProperty("verified") Boolean verified; - @JsonProperty("bio") - String bio; - @JsonProperty("birthday") String birthday; diff --git a/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/FriendTemplateTest.java b/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/FriendTemplateTest.java index 4a95cf1cb..48733cb7a 100644 --- a/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/FriendTemplateTest.java +++ b/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/FriendTemplateTest.java @@ -95,7 +95,7 @@ public void getFriendIds_forSpecificUser() { @Test public void getFriendProfiles() { - mockServer.expect(requestTo(facebook.getBaseGraphApiUrl() + "me/friends?fields=id%2Cname%2Cfirst_name%2Clast_name%2Cgender%2Clocale%2Ceducation%2Cwork%2Cemail%2Cthird_party_id%2Clink%2Ctimezone%2Cupdated_time%2Cverified%2Cabout%2Cbio%2Cbirthday%2Clocation%2Chometown%2Cinterested_in%2Creligion%2Cpolitical%2Cquotes%2Crelationship_status%2Csignificant_other%2Cwebsite")) + mockServer.expect(requestTo(facebook.getBaseGraphApiUrl() + "me/friends?fields=id%2Cname%2Cfirst_name%2Clast_name%2Cgender%2Clocale%2Ceducation%2Cwork%2Cemail%2Cthird_party_id%2Clink%2Ctimezone%2Cupdated_time%2Cverified%2Cabout%2Cbirthday%2Clocation%2Chometown%2Cinterested_in%2Creligion%2Cpolitical%2Cquotes%2Crelationship_status%2Csignificant_other%2Cwebsite")) .andExpect(method(GET)) .andExpect(header("Authorization", "OAuth someAccessToken")) .andRespond(withSuccess(jsonResource("user-profiles"), MediaType.APPLICATION_JSON)); @@ -106,7 +106,7 @@ public void getFriendProfiles() { @Test public void getFriendProfiles_forSpecificUser() { - mockServer.expect(requestTo(facebook.getBaseGraphApiUrl() + "1234567/friends?fields=id%2Cname%2Cfirst_name%2Clast_name%2Cgender%2Clocale%2Ceducation%2Cwork%2Cemail%2Cthird_party_id%2Clink%2Ctimezone%2Cupdated_time%2Cverified%2Cabout%2Cbio%2Cbirthday%2Clocation%2Chometown%2Cinterested_in%2Creligion%2Cpolitical%2Cquotes%2Crelationship_status%2Csignificant_other%2Cwebsite")) + mockServer.expect(requestTo(facebook.getBaseGraphApiUrl() + "1234567/friends?fields=id%2Cname%2Cfirst_name%2Clast_name%2Cgender%2Clocale%2Ceducation%2Cwork%2Cemail%2Cthird_party_id%2Clink%2Ctimezone%2Cupdated_time%2Cverified%2Cabout%2Cbirthday%2Clocation%2Chometown%2Cinterested_in%2Creligion%2Cpolitical%2Cquotes%2Crelationship_status%2Csignificant_other%2Cwebsite")) .andExpect(method(GET)) .andExpect(header("Authorization", "OAuth someAccessToken")) .andRespond(withSuccess(jsonResource("user-profiles"), MediaType.APPLICATION_JSON)); diff --git a/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/GroupTemplateTest.java b/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/GroupTemplateTest.java index 68cede0c1..29d3c8210 100644 --- a/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/GroupTemplateTest.java +++ b/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/GroupTemplateTest.java @@ -68,7 +68,7 @@ public void getMembers() { @Test public void getMemberProfiles() { - mockServer.expect(requestTo(fbUrl("213106022036379/members?fields=id%2Cname%2Cfirst_name%2Clast_name%2Cgender%2Clocale%2Ceducation%2Cwork%2Cemail%2Cthird_party_id%2Clink%2Ctimezone%2Cupdated_time%2Cverified%2Cabout%2Cbio%2Cbirthday%2Clocation%2Chometown%2Cinterested_in%2Creligion%2Cpolitical%2Cquotes%2Crelationship_status%2Csignificant_other%2Cwebsite"))) + mockServer.expect(requestTo(fbUrl("213106022036379/members?fields=id%2Cname%2Cfirst_name%2Clast_name%2Cgender%2Clocale%2Ceducation%2Cwork%2Cemail%2Cthird_party_id%2Clink%2Ctimezone%2Cupdated_time%2Cverified%2Cabout%2Cbirthday%2Clocation%2Chometown%2Cinterested_in%2Creligion%2Cpolitical%2Cquotes%2Crelationship_status%2Csignificant_other%2Cwebsite"))) .andExpect(method(GET)) .andExpect(header("Authorization", "OAuth someAccessToken")) .andRespond(withSuccess(jsonResource("group-members"), MediaType.APPLICATION_JSON)); diff --git a/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/UserTemplateTest.java b/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/UserTemplateTest.java index 5438f6d71..3dd8e213b 100644 --- a/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/UserTemplateTest.java +++ b/spring-social-facebook/src/test/java/org/springframework/social/facebook/api/UserTemplateTest.java @@ -60,7 +60,6 @@ public void getUserProfile_currentUser() { assertEquals(toDate("2010-08-22T00:01:59+0000"), profile.getUpdatedTime()); assertTrue(profile.isVerified()); assertEquals("Just some dude", profile.getAbout()); - assertEquals("I was born at a very early age.", profile.getBio()); assertEquals("06/09/1971", profile.getBirthday()); assertEquals("111762725508574", profile.getLocation().getId()); assertEquals("Dallas, Texas", profile.getLocation().getName()); diff --git a/spring-social-facebook/src/test/resources/org/springframework/social/facebook/api/full-profile.json b/spring-social-facebook/src/test/resources/org/springframework/social/facebook/api/full-profile.json index 505cb680a..0eb9428b1 100644 --- a/spring-social-facebook/src/test/resources/org/springframework/social/facebook/api/full-profile.json +++ b/spring-social-facebook/src/test/resources/org/springframework/social/facebook/api/full-profile.json @@ -9,7 +9,6 @@ "timezone":-5, "about":"Just some dude", "birthday":"06\/09\/1971", - "bio":"I was born at a very early age.", "hometown": { "id":"107925612568471", diff --git a/spring-social-facebook/src/test/resources/org/springframework/social/facebook/api/user-profiles.json b/spring-social-facebook/src/test/resources/org/springframework/social/facebook/api/user-profiles.json index 4db333ec7..9aadc086b 100644 --- a/spring-social-facebook/src/test/resources/org/springframework/social/facebook/api/user-profiles.json +++ b/spring-social-facebook/src/test/resources/org/springframework/social/facebook/api/user-profiles.json @@ -10,7 +10,6 @@ "timezone":-5, "about":"Just some dude", "birthday":"06\/09\/1971", - "bio":"I was born at a very early age.", "hometown": { "id":"107925612568471",