Skip to content

Commit 1889b5f

Browse files
committed
Renamed objects to their documented name and POST requests now return the id of the content created
1 parent daece6b commit 1889b5f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+359
-354
lines changed

REQUESTS.md

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ MarkUnreadAlertsAsReadRequest(boolean read) (Void)
77

88
## Conversations
99
ListUnreadConversationsRequest(SortOptions sortOptions) (Conversation[])
10-
StartConversationRequest(int recipientId, String title, String message) (Void)
10+
StartConversationRequest(int[] recipientIds, String title, String message) (Integer)
1111

1212
## Conversation Replies
13-
ListUnreadConversationRepliesRequest(int conversationId, SortOptions sortOptions) (Conversation[])
14-
ReplyToUnreadConversationRequest(int conversationId, String message) (Void)
13+
ListUnreadConversationRepliesRequest(int conversationId, SortOptions sortOptions) (Reply[])
14+
ReplyToUnreadConversationRequest(int conversationId, String message) (Integer)
1515

1616
## Members
1717
ListBansRequest (Ban[])
@@ -27,48 +27,47 @@ ListProfilePostsRequest(SortOptions sortOptions) (ProfilePost[])
2727
RetrieveSpecificProfilePostRequest(int profilePostId) (ProfilePost)
2828

2929
## Resources
30-
ListOwnedResourcesRequest(SortOptions sortOptions) (Resource[])
31-
ListPublicResourcesRequest(SortOptions sortOptions) (Resource[])
32-
ListCollaboratedResourcesRequest(SortOptions sortOptions) (Resource[])
30+
ListOwnedResourcesRequest(SortOptions sortOptions) (BasicResource[])
31+
ListPublicResourcesRequest(SortOptions sortOptions) (BasicResource[])
32+
ListCollaboratedResourcesRequest(SortOptions sortOptions) (BasicResource[])
3333
ModifyResourceRequest(int resourceId, String title, String tag_line, String description) (Void)
34-
RetrieveResourceRequest(int resourceId) (DetailedResource)
34+
RetrieveResourceRequest(int resourceId) (Resource)
3535

3636
## Resource Downloads
37-
ListResourceDownloadsByMemberRequest(int resourceId, int memberId, SortOptions sortOptions) (ResourceDownload[])
38-
ListResourceDownloadsByVersionRequest(int resourceId, int versionId, SortOptions sortOptions) (ResourceDownload[])
39-
ListResourceDownloadsRequest(int resourceId, SortOptions sortOptions) (ResourceDownload[])
37+
ListResourceDownloadsByMemberRequest(int resourceId, int memberId, SortOptions sortOptions) (Download[])
38+
ListResourceDownloadsByVersionRequest(int resourceId, int versionId, SortOptions sortOptions) (Download[])
39+
ListResourceDownloadsRequest(int resourceId, SortOptions sortOptions) (Download[])
4040

4141
## Resource Licenses
42-
IssueResourceLicenseRequest(int resourceId, int purchaserId, long startDate, long endDate, boolean active, String siteUrl) (Void)
43-
ListResourceLicensesRequest(int resourceId, SortOptions sortOptions) (ResourceLicense[])
42+
IssueResourceLicenseRequest(int resourceId, int purchaserId, long startDate, long endDate, boolean active, String siteUrl) (Integer)
43+
ListResourceLicensesRequest(int resourceId, SortOptions sortOptions) (License[])
4444
ModifyResourceLicenseRequest(int resourceId, int licenseId, long startDate, long endDate, boolean active) (Void)
45-
RetrieveResourceLicenseRequest(int resourceId, int licenseId) (ResourceLicense)
46-
ValidateResourceLicenseRequest(int resourceId, int purchaserId, int nonce, long timestamp) (ResourceLicense)
47-
RetrieveResourceLicenseByMemberRequest(int resourceId, int memberId, int nonce, long timestamp) (ResourceLicense)
45+
RetrieveResourceLicenseRequest(int resourceId, int licenseId) (License)
46+
RetrieveResourceLicenseByMemberRequest(int resourceId, int memberId, int nonce, long timestamp) (License)
4847

4948
## Resource Purchases
50-
ListResourcePurchasesRequest(int resourceId, SortOptions sortOptions) (ResourcePurchase[])
51-
RetrieveResourcePurchaseRequest(int resourceId, int purchaseId) (ResourcePurchase)
49+
ListResourcePurchasesRequest(int resourceId, SortOptions sortOptions) (Purchase[])
50+
RetrieveResourcePurchaseRequest(int resourceId, int purchaseId) (Purchase)
5251

5352
## Resource Reviews
54-
ListResourceReviewsRequest(int resourceId, SortOptions sortOptions) (ResourceReview[])
53+
ListResourceReviewsRequest(int resourceId, SortOptions sortOptions) (Review[])
5554
RespondToResourceReviewRequest(int resourceId, int reviewId, String message) (Void)
56-
RetrieveMemberResourceReviewRequest(int resourceId, int memberId) (ResourceReview)
55+
RetrieveMemberResourceReviewRequest(int resourceId, int memberId) (Review)
5756

5857
## Resource Updates
59-
ListResourceUpdatesRequest(int resourceId, SortOptions sortOptions) (ResourceUpdate[])
60-
RetrieveLatestResourceUpdateRequest(int resourceId) (ResourceUpdate)
61-
RetrieveResourceUpdateRequest(int resourceId, int updateId) (ResourceUpdate)
58+
ListResourceUpdatesRequest(int resourceId, SortOptions sortOptions) (Update[])
59+
RetrieveLatestResourceUpdateRequest(int resourceId) (Update)
60+
RetrieveResourceUpdateRequest(int resourceId, int updateId) (Update)
6261

6362
## Resource Versions
64-
ListResourceVersionsRequest(int resourceId, SortOptions sortOptions) (ResourceVersion[])
65-
RetrieveLatestResourceVersionRequest(int resourceId) (ResourceVersion)
66-
RetrieveResourceVersionRequest(int resourceId, int versionId) (ResourceVersion)
63+
ListResourceVersionsRequest(int resourceId, SortOptions sortOptions) (Version[])
64+
RetrieveLatestResourceVersionRequest(int resourceId) (Version)
65+
RetrieveResourceVersionRequest(int resourceId, int versionId) (Version)
6766

6867
## Threads
69-
FetchThreadRequest(int threadId) (DetailedThread)
70-
ListThreadsRequest(SortOptions sortOptions) (Thread[])
68+
FetchThreadRequest(int threadId) (Thread)
69+
ListThreadsRequest(SortOptions sortOptions) (BasicThread[])
7170

7271
## Thread Replies
73-
ListThreadRepliesRequest(int threadId, SortOptions sortOptions) (ThreadReply[])
74-
ReplyToThreadRequest(int threadId, String message) (Void)
72+
ListThreadRepliesRequest(int threadId, SortOptions sortOptions) (Reply[])
73+
ReplyToThreadRequest(int threadId, String message) (Integer)

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>is.swan</groupId>
88
<artifactId>mcmarket-api-java-wrapper</artifactId>
9-
<version>1.2-SNAPSHOT</version>
9+
<version>1.2.1-SNAPSHOT</version>
1010

1111
<properties>
1212
<maven.compiler.source>17</maven.compiler.source>
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package is.swan.mcmarketapi.classes;
2+
3+
public class BasicResource {
4+
5+
private final int resource_id, author_id;
6+
private final String title, tag_line;
7+
private final double price;
8+
private final String currency;
9+
10+
public BasicResource(int resource_id, int author_id, String title, String tag_line, double price, String currency) {
11+
this.resource_id = resource_id;
12+
this.author_id = author_id;
13+
this.title = title;
14+
this.tag_line = tag_line;
15+
this.price = price;
16+
this.currency = currency;
17+
}
18+
19+
public int getResourceId() {
20+
return resource_id;
21+
}
22+
23+
public int getAuthorId() {
24+
return author_id;
25+
}
26+
27+
public String getTitle() {
28+
return title;
29+
}
30+
31+
public String getTagLine() {
32+
return tag_line;
33+
}
34+
35+
public double getPrice() {
36+
return price;
37+
}
38+
39+
public String getCurrency() {
40+
return currency;
41+
}
42+
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package is.swan.mcmarketapi.classes;
2+
3+
public class BasicThread {
4+
5+
private final int thread_id;
6+
private final String title;
7+
private final int reply_count, view_count;
8+
private final long creation_date, last_message_date;
9+
10+
public BasicThread(int thread_id, String title, int reply_count, int view_count, long creation_date, long last_message_date) {
11+
this.thread_id = thread_id;
12+
this.title = title;
13+
this.reply_count = reply_count;
14+
this.view_count = view_count;
15+
this.creation_date = creation_date;
16+
this.last_message_date = last_message_date;
17+
}
18+
19+
public int getThreadId() {
20+
return thread_id;
21+
}
22+
23+
public String getTitle() {
24+
return title;
25+
}
26+
27+
public int getReplyCount() {
28+
return reply_count;
29+
}
30+
31+
public int getViewCount() {
32+
return view_count;
33+
}
34+
35+
public long getCreationDate() {
36+
return creation_date;
37+
}
38+
39+
public long getLastMessageDate() {
40+
return last_message_date;
41+
}
42+
}

src/main/java/is/swan/mcmarketapi/classes/ConversationReply.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/main/java/is/swan/mcmarketapi/classes/DetailedResource.java

Lines changed: 0 additions & 98 deletions
This file was deleted.

src/main/java/is/swan/mcmarketapi/classes/DetailedThread.java

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/main/java/is/swan/mcmarketapi/classes/ResourceDownload.java renamed to src/main/java/is/swan/mcmarketapi/classes/Download.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package is.swan.mcmarketapi.classes;
22

3-
public class ResourceDownload {
3+
public class Download {
44

55
private final int resource_id, version_id, downloader_id;
66
private final long download_date;
77

8-
public ResourceDownload(int resource_id, int version_id, int downloader_id, long download_date) {
8+
public Download(int resource_id, int version_id, int downloader_id, long download_date) {
99
this.resource_id = resource_id;
1010
this.version_id = version_id;
1111
this.downloader_id = downloader_id;

src/main/java/is/swan/mcmarketapi/classes/ResourceLicense.java renamed to src/main/java/is/swan/mcmarketapi/classes/License.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package is.swan.mcmarketapi.classes;
22

3-
public class ResourceLicense {
3+
public class License {
44

55
private final int license_id, purchaser_id;
66
private final boolean validated, active;
77
private final long start_date, end_date, previous_end_date;
88

9-
public ResourceLicense(int license_id, int purchaser_id, boolean validated, boolean active, long start_date, long end_date, long previous_end_date) {
9+
public License(int license_id, int purchaser_id, boolean validated, boolean active, long start_date, long end_date, long previous_end_date) {
1010
this.license_id = license_id;
1111
this.purchaser_id = purchaser_id;
1212
this.validated = validated;

0 commit comments

Comments
 (0)