Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #130

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions facebook4j-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
<source>1.5</source>
<target>1.5</target>
<source>11</source>
<target>11</target>
</configuration>
<version>3.5.1</version>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/AlbumUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* @author Ryuji Yamashita - roundrop at gmail.com
*/
public final class AlbumUpdate implements java.io.Serializable {
public final class AlbumUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = 4089671461658360414L;

private final String name;
Expand Down Expand Up @@ -81,7 +81,7 @@ public String getName() {
return name;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
params.add(new HttpParameter("name", name));
if (message != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public BackdatingPostUpdate backdatedTimeGranularity(BackdatedTimeGranularity ba
}

@Override
HttpParameter[] asHttpParameterArray() {
public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>(Arrays.asList(super.asHttpParameterArray()));
if (backdatedTime != null) {
params.add(new HttpParameter("backdated_time", backdatedTime));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/BatchRequests.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
/**
* @since Facebook4J 2.1.0
*/
public class BatchRequests<T extends BatchRequest> extends ArrayList<T> {
public class BatchRequests<T extends BatchRequest> extends ArrayList<T> implements HttpParameterArray {
private static final long serialVersionUID = -9123525320485721265L;

private Boolean includeHeaders;
Expand All @@ -38,7 +38,7 @@ public void setIncludeHeaders(Boolean includeHeaders) {
this.includeHeaders = includeHeaders;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();

if (includeHeaders != null) {
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/CheckinUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import facebook4j.internal.http.HttpParameter;

public final class CheckinUpdate implements java.io.Serializable {
public final class CheckinUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = -6053752054448309622L;

private final String place;
Expand Down Expand Up @@ -107,7 +107,7 @@ public GeoLocation getCoordinates() {
return coordinates;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
params.add(new HttpParameter("place", place));
params.add(new HttpParameter("coordinates", coordinates.asJSONString()));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/CommentUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;

public final class CommentUpdate implements java.io.Serializable {
public final class CommentUpdate implements java.io.Serializable,HttpParameterArray{
private static final long serialVersionUID = -2155334084962409798L;

private String message;
Expand Down Expand Up @@ -81,7 +81,7 @@ public CommentUpdate source(Media source) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
if (message != null) {
params.add(new HttpParameter("message", message));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/EventUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* @author Ryuji Yamashita - roundrop at gmail.com
*/
public class EventUpdate implements java.io.Serializable {
public class EventUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = -6106165246149864606L;

private String name;
Expand Down Expand Up @@ -173,7 +173,7 @@ public EventUpdate noFeedStory(Boolean noFeedStory) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
if (name != null) {
params.add(new HttpParameter("name", name));
Expand Down
14 changes: 14 additions & 0 deletions facebook4j-core/src/main/java/facebook4j/HttpParameterArray.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package facebook4j;

import facebook4j.FacebookException;
import facebook4j.internal.http.HttpParameter;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public interface HttpParameterArray
{
public HttpParameter[] asHttpParameterArray();

}
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/MilestoneUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public final class MilestoneUpdate implements java.io.Serializable {
public final class MilestoneUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = 7488064115483210172L;

private final String title;
Expand All @@ -52,7 +52,7 @@ public Calendar getStartTime() {
return startTime;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
params.add(new HttpParameter("title", title));
params.add(new HttpParameter("description", description));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/OfferUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public class OfferUpdate implements java.io.Serializable {
public class OfferUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = -6990777853567019761L;

private String title;
Expand Down Expand Up @@ -250,7 +250,7 @@ public OfferUpdate reminderTime(Calendar reminderTime) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
params.add(new HttpParameter("title", title));
params.add(new HttpParameter("expiration_time", z_F4JInternalStringUtil.formatISO8601Datetime(expirationTime)));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/PageCoverUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public class PageCoverUpdate implements java.io.Serializable {
public class PageCoverUpdate implements java.io.Serializable,HttpParameterArray{
private static final long serialVersionUID = -2169356652157356642L;

private final String photoId;
Expand Down Expand Up @@ -66,7 +66,7 @@ public PageCoverUpdate noFeedStory(Boolean noFeedStory) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
params.add(new HttpParameter("cover", photoId));
if (offsetY != null) {
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/PagePhotoUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public class PagePhotoUpdate implements java.io.Serializable {
public class PagePhotoUpdate implements java.io.Serializable, HttpParameterArray{
private static final long serialVersionUID = -2690799855513822140L;

private Media source;
Expand Down Expand Up @@ -157,7 +157,7 @@ public PagePhotoUpdate scheduledPublishTime(Date scheduledPublishTime) {
return scheduledPublishTime(Long.valueOf(time).intValue());
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
if (source != null) {
params.add(new HttpParameter("source", source.getMediaFile()));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/PagePostUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package facebook4j;

import facebook4j.internal.http.HttpParameter;
import facebook4j.internal.org.json.JSONArray;

import java.net.URL;
import java.util.*;
Expand Down Expand Up @@ -66,7 +65,8 @@ public PagePostUpdate feedTargeting(FeedTargetingParameter feedTargeting) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/
public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>(Arrays.asList(super.asHttpParameterArray()));
if (feedTargeting != null) {
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public class PageSettingUpdate implements java.io.Serializable {
public class PageSettingUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = -4906471942303848646L;

private String setting;
Expand Down Expand Up @@ -66,7 +66,7 @@ public PageSettingUpdate value(boolean value) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
params.add(new HttpParameter("setting", setting));
params.add(new HttpParameter("value", value));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/PageUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public class PageUpdate implements java.io.Serializable {
public class PageUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = 6472977369112573757L;

private String about; // Short Description
Expand Down Expand Up @@ -112,7 +112,7 @@ public PageUpdate phone(String phone) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
if (about != null) {
params.add(new HttpParameter("about", about));
Expand Down
16 changes: 14 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/PageVideoUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
Expand Down Expand Up @@ -63,7 +62,8 @@ public PageVideoUpdate feedTargeting(FeedTargetingParameter feedTargeting) {
return this;
}

/* package */HttpParameter[] asHttpParameterArray() {
/* package */
public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>(Arrays.asList(super.asHttpParameterArray()));
if (targeting != null) {
try {
Expand Down Expand Up @@ -112,3 +112,15 @@ public String toString() {
"} " + super.toString();
}
}




/*
*
* public void initJSONImpl(JSONObject json) throws JSONException, FacebookException {

*
*
*
* */
5 changes: 3 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/PostUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/**
* @author Ryuji Yamashita - roundrop at gmail.com
*/
public class PostUpdate implements java.io.Serializable {
public class PostUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = 7540889634334208530L;

private String message;
Expand Down Expand Up @@ -248,7 +248,8 @@ public PostUpdate scheduledPublishTime(Date scheduledPublishTime) {
return scheduledPublishTime(Long.valueOf(time).intValue());
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/
public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
if (message != null) {
params.add(new HttpParameter("message", message));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/QuestionUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public class QuestionUpdate implements java.io.Serializable {
public class QuestionUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = 6854301390218101794L;

private String question;
Expand Down Expand Up @@ -118,7 +118,7 @@ public QuestionUpdate scheduledPublishTime(Date scheduledPublishTime) {
return scheduledPublishTime(Long.valueOf(time).intValue());
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
params.add(new HttpParameter("question", question));
if (options != null && options.size() != 0) {
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/TabUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public class TabUpdate implements java.io.Serializable {
public class TabUpdate implements java.io.Serializable ,HttpParameterArray{
private static final long serialVersionUID = 7358979543362576699L;

private Integer position;
Expand Down Expand Up @@ -95,7 +95,7 @@ public TabUpdate customImage(Media customImage) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
if (position != null) {
params.add(new HttpParameter("position", position));
Expand Down
4 changes: 2 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/TagUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/**
* @author Ryuji Yamashita - roundrop at gmail.com
*/
public class TagUpdate implements java.io.Serializable {
public class TagUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = -8148787857258621802L;

private String to;
Expand Down Expand Up @@ -94,7 +94,7 @@ public TagUpdate y(Double y) {
return this;
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/ public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
if (to != null) {
params.add(new HttpParameter("to", to));
Expand Down
5 changes: 3 additions & 2 deletions facebook4j-core/src/main/java/facebook4j/VideoUpdate.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* @author Ryuji Yamashita - roundrop at gmail.com
* @since Facebook4J 2.0.0
*/
public class VideoUpdate implements java.io.Serializable {
public class VideoUpdate implements java.io.Serializable,HttpParameterArray {
private static final long serialVersionUID = -757292229143435735L;

private Media source;
Expand Down Expand Up @@ -105,7 +105,8 @@ public VideoUpdate scheduledPublishTime(Date scheduledPublishTime) {
return scheduledPublishTime(Long.valueOf(time).intValue());
}

/*package*/ HttpParameter[] asHttpParameterArray() {
/*package*/
public HttpParameter[] asHttpParameterArray() {
List<HttpParameter> params = new ArrayList<HttpParameter>();
params.add(source.asHttpParameter("source"));
if (title != null) {
Expand Down
Loading