Skip to content

Commit 6fff586

Browse files
tomb50tomb50
committed
Forum, GroupMem, Topics - Reformat, code style, Imports
1 parent a921eb0 commit 6fff586

File tree

5 files changed

+523
-597
lines changed

5 files changed

+523
-597
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ Here is the status of the various API components:
4343
* [Requests](http://developer.zendesk.com/documentation/rest_api/requests.html) ✓
4444
* [User Identities](http://developer.zendesk.com/documentation/rest_api/user_identities.html) ✓
4545
* [Groups](http://developer.zendesk.com/documentation/rest_api/groups.html) ✓
46-
* [Group Membership](http://developer.zendesk.com/documentation/rest_api/group_memberships.html)
46+
* [Group Membership](http://developer.zendesk.com/documentation/rest_api/group_memberships.html) ✓
4747
* [Custom Agent Roles](http://developer.zendesk.com/documentation/rest_api/custom_roles.html)
4848
* [Organizations](http://developer.zendesk.com/documentation/rest_api/organizations.html) ✓ *except for related info*
4949
* [Search](http://developer.zendesk.com/documentation/rest_api/search.html) ✓ *except for topics and sort ordering*
5050
* [Tags](http://developer.zendesk.com/documentation/rest_api/tags.html)
51-
* [Forums](http://developer.zendesk.com/documentation/rest_api/forums.html)
51+
* [Forums](http://developer.zendesk.com/documentation/rest_api/forums.html) ✓
5252
* [Forum Subscriptions](http://developer.zendesk.com/documentation/rest_api/forum_subscriptions.html)
5353
* [Categories](http://developer.zendesk.com/documentation/rest_api/categories.html)
54-
* [Topics](http://developer.zendesk.com/documentation/rest_api/topics.html)
54+
* [Topics](http://developer.zendesk.com/documentation/rest_api/topics.html) ✓
5555
* [Topic Comments](http://developer.zendesk.com/documentation/rest_api/topic_comments.html)
5656
* [Topic Subscriptions](http://developer.zendesk.com/documentation/rest_api/topic_subscriptions.html)
5757
* [Topic Votes](http://developer.zendesk.com/documentation/rest_api/topic_votes.html)

‎src/main/java/org/zendesk/client/v2/Zendesk.java

Lines changed: 81 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,20 @@
1616

1717
import org.slf4j.Logger;
1818
import org.slf4j.LoggerFactory;
19-
import org.zendesk.client.v2.model.*;
19+
import org.zendesk.client.v2.model.Attachment;
20+
import org.zendesk.client.v2.model.Audit;
21+
import org.zendesk.client.v2.model.Comment;
22+
import org.zendesk.client.v2.model.Field;
23+
import org.zendesk.client.v2.model.Forum;
24+
import org.zendesk.client.v2.model.Group;
25+
import org.zendesk.client.v2.model.GroupMembership;
26+
import org.zendesk.client.v2.model.Identity;
27+
import org.zendesk.client.v2.model.Organization;
28+
import org.zendesk.client.v2.model.SearchResultEntity;
29+
import org.zendesk.client.v2.model.Status;
30+
import org.zendesk.client.v2.model.Ticket;
31+
import org.zendesk.client.v2.model.Topic;
32+
import org.zendesk.client.v2.model.User;
2033

2134
import java.io.Closeable;
2235
import java.io.IOException;
@@ -676,157 +689,156 @@ public void deleteGroup(long id) {
676689
}
677690

678691
public Iterable<GroupMembership> getGroupMemberships() {
679-
return new PagedIterable<GroupMembership>(cnst("/group_memberships.json"),
680-
handleList(GroupMembership.class, "group_memberships"));
692+
return new PagedIterable<GroupMembership>(cnst("/group_memberships.json"),
693+
handleList(GroupMembership.class, "group_memberships"));
681694
}
682695

683696
public List<GroupMembership> getGroupMembershipByUser(long user_id) {
684-
return complete( submit( req( "GET" , tmpl("/users/{user_id}/group_memberships.json").set( "user_id", user_id ) ),
685-
handleList( GroupMembership.class, "group_memberships" )));
697+
return complete(submit(req("GET", tmpl("/users/{user_id}/group_memberships.json").set("user_id", user_id)),
698+
handleList(GroupMembership.class, "group_memberships")));
686699
}
687700

688701
public List<GroupMembership> getGroupMemberships(long group_id) {
689-
return complete( submit( req( "GET" , tmpl("/groups/{group_id}/memberships.json").set( "group_id", group_id ) ),
690-
handleList( GroupMembership.class, "group_memberships" )));
702+
return complete(submit(req("GET", tmpl("/groups/{group_id}/memberships.json").set("group_id", group_id)),
703+
handleList(GroupMembership.class, "group_memberships")));
691704
}
692705

693706
public Iterable<GroupMembership> getAssignableGroupMemberships() {
694-
return new PagedIterable<GroupMembership>(cnst("/group_memberships/assignable.json"),
695-
handleList(GroupMembership.class, "group_memberships"));
707+
return new PagedIterable<GroupMembership>(cnst("/group_memberships/assignable.json"),
708+
handleList(GroupMembership.class, "group_memberships"));
696709
}
697710

698711
public List<GroupMembership> getAssignableGroupMemberships(long group_id) {
699-
return complete( submit( req( "GET" ,
700-
tmpl("/groups/{group_id}/memberships/assignable.json").set( "group_id", group_id ) ),
701-
handleList( GroupMembership.class, "group_memberships" )));
712+
return complete(submit(req("GET",
713+
tmpl("/groups/{group_id}/memberships/assignable.json").set("group_id", group_id)),
714+
handleList(GroupMembership.class, "group_memberships")));
702715
}
703716

704717
public GroupMembership getGroupMembership(long id) {
705-
return complete(submit(req("GET", tmpl("/group_memberships/{id}.json").set("id", id)),
706-
handle(GroupMembership.class, "group_membership")));
718+
return complete(submit(req("GET", tmpl("/group_memberships/{id}.json").set("id", id)),
719+
handle(GroupMembership.class, "group_membership")));
707720
}
708721

709722
public GroupMembership getGroupMembership(long user_id, long group_membership_id) {
710-
return complete(submit(req("GET", tmpl("/users/{uid}/group_memberships/{gmid}.json").set("uid", user_id)
711-
.set( "gmid",group_membership_id )),
712-
handle(GroupMembership.class, "group_membership")));
723+
return complete(submit(req("GET", tmpl("/users/{uid}/group_memberships/{gmid}.json").set("uid", user_id)
724+
.set("gmid", group_membership_id)),
725+
handle(GroupMembership.class, "group_membership")));
713726
}
714727

715728
public GroupMembership createGroupMembership(GroupMembership groupMembership) {
716-
return complete(submit(req("POST", cnst("/group_memberships.json"), JSON, json(
717-
Collections.singletonMap("group_membership", groupMembership))),
718-
handle(GroupMembership.class, "group_membership")));
729+
return complete(submit(req("POST", cnst("/group_memberships.json"), JSON, json(
730+
Collections.singletonMap("group_membership", groupMembership))),
731+
handle(GroupMembership.class, "group_membership")));
719732
}
720733

721734
public GroupMembership createGroupMembership(long user_id, GroupMembership groupMembership) {
722-
return complete(submit(req("POST", tmpl("/users/{id}/group_memberships.json").set( "id", user_id ), JSON,
723-
json(Collections.singletonMap("group_membership", groupMembership))),
724-
handle(GroupMembership.class, "group_membership")));
735+
return complete(submit(req("POST", tmpl("/users/{id}/group_memberships.json").set("id", user_id), JSON,
736+
json(Collections.singletonMap("group_membership", groupMembership))),
737+
handle(GroupMembership.class, "group_membership")));
725738
}
726739

727740
public void deleteGroupMembership(GroupMembership groupMembership) {
728-
checkHasId(groupMembership);
729-
deleteGroupMembership( groupMembership.getId() );
741+
checkHasId(groupMembership);
742+
deleteGroupMembership(groupMembership.getId());
730743
}
731744

732745
public void deleteGroupMembership(long id) {
733-
complete(submit(req("DELETE", tmpl("/groups_memberships/{id}.json").set("id", id)), handleStatus()));
746+
complete(submit(req("DELETE", tmpl("/groups_memberships/{id}.json").set("id", id)), handleStatus()));
734747
}
735748

736749
public void deleteGroupMembership(long user_id, GroupMembership groupMembership) {
737-
checkHasId(groupMembership);
738-
deleteGroupMembership( user_id, groupMembership.getId() );
750+
checkHasId(groupMembership);
751+
deleteGroupMembership(user_id, groupMembership.getId());
739752
}
740753

741-
public void deleteGroupMembership( long user_id, long group_membership_id ) {
742-
complete(submit(req("DELETE", tmpl("/users/{uid}/groups_memberships/{gmid}.json").set("uid", user_id)
743-
.set( "gmid", group_membership_id )), handleStatus()));
754+
public void deleteGroupMembership(long user_id, long group_membership_id) {
755+
complete(submit(req("DELETE", tmpl("/users/{uid}/groups_memberships/{gmid}.json").set("uid", user_id)
756+
.set("gmid", group_membership_id)), handleStatus()));
744757
}
745758

746-
public List<GroupMembership> setGroupMembershipAsDefault( long user_id, GroupMembership groupMembership)
747-
{
748-
checkHasId( groupMembership );
749-
return complete( submit( req( "POST", tmpl( "/users/{uid}/group_memberships/{gmid}/make_default.json" )
750-
.set( "uid", user_id ).set( "gmid", groupMembership.getId() ), JSON, json(
751-
Collections.singletonMap( "group_memberships", groupMembership ) ) ),
752-
handleList( GroupMembership.class, "results" ) ) );
759+
public List<GroupMembership> setGroupMembershipAsDefault(long user_id, GroupMembership groupMembership) {
760+
checkHasId(groupMembership);
761+
return complete(submit(req("POST", tmpl("/users/{uid}/group_memberships/{gmid}/make_default.json")
762+
.set("uid", user_id).set("gmid", groupMembership.getId()), JSON, json(
763+
Collections.singletonMap("group_memberships", groupMembership))),
764+
handleList(GroupMembership.class, "results")));
753765
}
754766

755767
public Iterable<Forum> getForums() {
756-
return new PagedIterable<Forum>(cnst("/forums.json"), handleList(Forum.class, "forums"));
768+
return new PagedIterable<Forum>(cnst("/forums.json"), handleList(Forum.class, "forums"));
757769
}
758770

759771
public List<Forum> getForums(long category_id) {
760-
return complete(submit(req("GET", tmpl("/categories/{id}/forums.json").set("id", category_id)),
761-
handleList( Forum.class, "forums" )));
772+
return complete(submit(req("GET", tmpl("/categories/{id}/forums.json").set("id", category_id)),
773+
handleList(Forum.class, "forums")));
762774
}
763775

764776
public Forum getForum(long id) {
765-
return complete( submit( req( "GET", tmpl( "/forums/{id}.json").set( "id",id ) ),
766-
handle( Forum.class, "forum" ) ) );
777+
return complete(submit(req("GET", tmpl("/forums/{id}.json").set("id", id)),
778+
handle(Forum.class, "forum")));
767779
}
768780

769781
public Forum createForum(Forum forum) {
770782
return complete(submit(req("POST", cnst("/forums.json"), JSON, json(
771-
Collections.singletonMap("forum", forum))), handle(Forum.class, "forum")));
783+
Collections.singletonMap("forum", forum))), handle(Forum.class, "forum")));
772784
}
773785

774786
public Forum updateForum(Forum forum) {
775-
checkHasId( forum );
776-
return complete(submit(req("PUT", tmpl("/forums/{id}.json").set("id", forum.getId()), JSON, json(
777-
Collections.singletonMap("forum", forum))), handle(Forum.class, "forum")));
787+
checkHasId(forum);
788+
return complete(submit(req("PUT", tmpl("/forums/{id}.json").set("id", forum.getId()), JSON, json(
789+
Collections.singletonMap("forum", forum))), handle(Forum.class, "forum")));
778790
}
779791

780792
public void deleteForum(Forum forum) {
781-
checkHasId( forum );
782-
complete(submit(req("DELETE", tmpl("/forums/{id}.json").set("id", forum.getId())), handleStatus()));
793+
checkHasId(forum);
794+
complete(submit(req("DELETE", tmpl("/forums/{id}.json").set("id", forum.getId())), handleStatus()));
783795
}
784796

785797
public Iterable<Topic> getTopics() {
786-
return new PagedIterable<Topic>(cnst("/topics.json"), handleList(Topic.class, "topics"));
798+
return new PagedIterable<Topic>(cnst("/topics.json"), handleList(Topic.class, "topics"));
787799
}
788800

789801
public List<Topic> getTopics(long forum_id) {
790-
return complete(submit(req("GET", tmpl("/forums/{id}/topics.json").set("id", forum_id)),
791-
handleList( Topic.class, "topics" )));
802+
return complete(submit(req("GET", tmpl("/forums/{id}/topics.json").set("id", forum_id)),
803+
handleList(Topic.class, "topics")));
792804
}
793805

794806
public List<Topic> getTopicsByUser(long user_id) {
795-
return complete(submit(req("GET", tmpl("/users/{id}/topics.json").set("id", user_id)),
796-
handleList( Topic.class, "topics" )));
807+
return complete(submit(req("GET", tmpl("/users/{id}/topics.json").set("id", user_id)),
808+
handleList(Topic.class, "topics")));
797809
}
798810

799811
public Topic getTopic(long id) {
800-
return complete( submit(req("GET", tmpl("/topics/{id}.json").set("id", id)),
801-
handle( Topic.class, "topic" )));
812+
return complete(submit(req("GET", tmpl("/topics/{id}.json").set("id", id)),
813+
handle(Topic.class, "topic")));
802814
}
803815

804816
public Topic createTopic(Topic topic) {
805-
checkHasId(topic);
806-
return complete(submit(req("POST", cnst("/topics.json"), JSON, json(
807-
Collections.singletonMap("topic", topic))), handle(Topic.class, "topic")));
817+
checkHasId(topic);
818+
return complete(submit(req("POST", cnst("/topics.json"), JSON, json(
819+
Collections.singletonMap("topic", topic))), handle(Topic.class, "topic")));
808820
}
809821

810822
public Topic importTopic(Topic topic) {
811-
checkHasId(topic);
812-
return complete(submit(req("POST", cnst("/import/topics.json"), JSON, json(
813-
Collections.singletonMap("topic", topic))), handle(Topic.class, "topic")));
823+
checkHasId(topic);
824+
return complete(submit(req("POST", cnst("/import/topics.json"), JSON, json(
825+
Collections.singletonMap("topic", topic))), handle(Topic.class, "topic")));
814826
}
815827

816828
public List<Topic> getTopics(long id, long... ids) {
817-
return complete(submit(req("POST", tmpl("/topics/show_many.json{?ids}").set("ids", idArray(id, ids))),
818-
handleList(Topic.class, "topics")));
829+
return complete(submit(req("POST", tmpl("/topics/show_many.json{?ids}").set("ids", idArray(id, ids))),
830+
handleList(Topic.class, "topics")));
819831
}
820832

821833
public Topic updateTopic(Topic topic) {
822-
checkHasId( topic );
823-
return complete(submit(req("PUT", tmpl("/topics/{id}.json").set("id", topic.getId()), JSON, json(
824-
Collections.singletonMap("topic", topic))), handle(Topic.class, "topic")));
834+
checkHasId(topic);
835+
return complete(submit(req("PUT", tmpl("/topics/{id}.json").set("id", topic.getId()), JSON, json(
836+
Collections.singletonMap("topic", topic))), handle(Topic.class, "topic")));
825837
}
826838

827839
public void deleteTopic(Topic topic) {
828-
checkHasId( topic );
829-
complete(submit(req("DELETE", tmpl("/topics/{id}.json").set("id", topic.getId())), handleStatus()));
840+
checkHasId(topic);
841+
complete(submit(req("DELETE", tmpl("/topics/{id}.json").set("id", topic.getId())), handleStatus()));
830842
}
831843

832844
public Iterable<SearchResultEntity> getSearchResults(String query) {

0 commit comments

Comments
 (0)