Skip to content

Commit ce2f9fe

Browse files
swanisswanis
committed
modified some requests and removed unused imports
1 parent 1889b5f commit ce2f9fe

File tree

49 files changed

+76
-162
lines changed

Some content is hidden

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

49 files changed

+76
-162
lines changed

‎REQUESTS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ ListResourceDownloadsByVersionRequest(int resourceId, int versionId, SortOptions
3939
ListResourceDownloadsRequest(int resourceId, SortOptions sortOptions) (Download[])
4040

4141
## Resource Licenses
42-
IssueResourceLicenseRequest(int resourceId, int purchaserId, long startDate, long endDate, boolean active, String siteUrl) (Integer)
42+
IssueResourceLicenseRequest(int resourceId, boolean permanent, boolean active, int purchaserId, long startDate, long endDate) (Integer)
4343
ListResourceLicensesRequest(int resourceId, SortOptions sortOptions) (License[])
44-
ModifyResourceLicenseRequest(int resourceId, int licenseId, long startDate, long endDate, boolean active) (Void)
45-
RetrieveResourceLicenseRequest(int resourceId, int licenseId) (License)
44+
ModifyResourceLicenseRequest(int resourceId, int licenseId, boolean permanent, boolean active, long startDate, long endDate) (Void)
45+
RetrieveResourceLicenseRequest(int resourceId, int licenseId) (License)
4646
RetrieveResourceLicenseByMemberRequest(int resourceId, int memberId, int nonce, long timestamp) (License)
4747

4848
## Resource Purchases

‎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.1-SNAPSHOT</version>
9+
<version>1.2.2-SNAPSHOT</version>
1010

1111
<properties>
1212
<maven.compiler.source>17</maven.compiler.source>

‎src/main/java/is/swan/mcmarketapi/request/Request.java

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

3+
import com.google.gson.Gson;
4+
35
public interface Request<V> {
46

7+
Gson gson = new Gson();
8+
59
String getURL();
610
Method getMethod();
711

‎src/main/java/is/swan/mcmarketapi/request/Throttler.java

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

3-
import java.util.concurrent.atomic.AtomicLong;
4-
53
import is.swan.mcmarketapi.request.Request.Method;
64

5+
import java.util.concurrent.atomic.AtomicLong;
6+
77
public class Throttler {
88

9-
private final AtomicLong readLastRetry = new AtomicLong(0);
10-
private final AtomicLong readLastRequest = new AtomicLong(System.currentTimeMillis());
11-
12-
private final AtomicLong writeLastRetry = new AtomicLong(0);
13-
private final AtomicLong writeLastRequest = new AtomicLong(System.currentTimeMillis());
14-
15-
public long stallFor(Method method) {
16-
long time = System.currentTimeMillis();
17-
18-
if (method == Method.GET) {
19-
return Throttler.stallForHelper(this.readLastRetry, this.readLastRequest, time);
20-
} else {
21-
return Throttler.stallForHelper(this.writeLastRetry, this.writeLastRequest, time);
22-
}
23-
}
24-
25-
private static long stallForHelper(AtomicLong aLastRetry, AtomicLong aLastRequest, long time){
26-
long lastRetry = aLastRetry.getAcquire();
27-
long lastRequest = aLastRequest.getAcquire();
28-
29-
if (lastRetry > 0 && (time - lastRequest) < lastRetry) {
30-
return lastRetry - (time - lastRequest);
31-
} else {
32-
return 0;
33-
}
34-
}
35-
36-
public void setRead(long value) {
37-
readLastRetry.setRelease(value);
38-
readLastRequest.setRelease(System.currentTimeMillis());
39-
}
40-
41-
public void setWrite(long value) {
42-
writeLastRetry.setRelease(value);
43-
writeLastRequest.setRelease(System.currentTimeMillis());
44-
}
45-
46-
public void resetRead() {
47-
readLastRetry.setRelease(0);
48-
readLastRequest.setRelease(System.currentTimeMillis());
49-
}
50-
51-
public void resetWrite() {
52-
writeLastRetry.setRelease(0);
53-
writeLastRequest.setRelease(System.currentTimeMillis());
54-
}
9+
private final AtomicLong readLastRetry = new AtomicLong(0);
10+
private final AtomicLong readLastRequest = new AtomicLong(System.currentTimeMillis());
11+
12+
private final AtomicLong writeLastRetry = new AtomicLong(0);
13+
private final AtomicLong writeLastRequest = new AtomicLong(System.currentTimeMillis());
14+
15+
public long stallFor(Method method) {
16+
long time = System.currentTimeMillis();
17+
18+
if (method == Method.GET) {
19+
return Throttler.stallForHelper(this.readLastRetry, this.readLastRequest, time);
20+
} else {
21+
return Throttler.stallForHelper(this.writeLastRetry, this.writeLastRequest, time);
22+
}
23+
}
24+
25+
private static long stallForHelper(AtomicLong aLastRetry, AtomicLong aLastRequest, long time) {
26+
long lastRetry = aLastRetry.getAcquire();
27+
long lastRequest = aLastRequest.getAcquire();
28+
29+
if (lastRetry > 0 && (time - lastRequest) < lastRetry) {
30+
return lastRetry - (time - lastRequest);
31+
} else {
32+
return 0;
33+
}
34+
}
35+
36+
public void setRead(long value) {
37+
readLastRetry.setRelease(value);
38+
readLastRequest.setRelease(System.currentTimeMillis());
39+
}
40+
41+
public void setWrite(long value) {
42+
writeLastRetry.setRelease(value);
43+
writeLastRequest.setRelease(System.currentTimeMillis());
44+
}
45+
46+
public void resetRead() {
47+
readLastRetry.setRelease(0);
48+
readLastRequest.setRelease(System.currentTimeMillis());
49+
}
50+
51+
public void resetWrite() {
52+
writeLastRetry.setRelease(0);
53+
writeLastRequest.setRelease(System.currentTimeMillis());
54+
}
5555
}

‎src/main/java/is/swan/mcmarketapi/request/requests/HealthRequest.java

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

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import com.google.gson.JsonObject;
65
import is.swan.mcmarketapi.request.Request;
@@ -19,7 +18,6 @@ public Method getMethod() {
1918

2019
@Override
2120
public String handleJson(String json) {
22-
Gson gson = new Gson();
2321
JsonElement element = gson.fromJson(json, JsonElement.class);
2422
JsonObject jsonObject = element.getAsJsonObject();
2523

‎src/main/java/is/swan/mcmarketapi/request/requests/alert/ListUnreadAlertsRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.alert;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.Alert;
65
import is.swan.mcmarketapi.request.Request;
@@ -27,7 +26,6 @@ public Method getMethod() {
2726

2827
@Override
2928
public Alert[] handleJson(String json) {
30-
Gson gson = new Gson();
3129
JsonElement element = gson.fromJson(json, JsonElement.class);
3230
String alertsJson = element.getAsJsonObject().get("data").getAsJsonArray().toString();
3331
Alert[] alerts = gson.fromJson(alertsJson, Alert[].class);

‎src/main/java/is/swan/mcmarketapi/request/requests/alert/MarkUnreadAlertsAsReadRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.alert;
22

3-
import com.google.gson.Gson;
43
import is.swan.mcmarketapi.request.Request;
54

65
import java.util.HashMap;
@@ -25,7 +24,6 @@ public Method getMethod() {
2524

2625
@Override
2726
public String getBody() {
28-
Gson gson = new Gson();
2927
HashMap<String, Boolean> parameters = new HashMap<>();
3028

3129
parameters.put("read", read);

‎src/main/java/is/swan/mcmarketapi/request/requests/conversation/ListUnreadConversationsRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.conversation;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.Conversation;
65
import is.swan.mcmarketapi.request.Request;
@@ -27,7 +26,6 @@ public Method getMethod() {
2726

2827
@Override
2928
public Conversation[] handleJson(String json) {
30-
Gson gson = new Gson();
3129
JsonElement element = gson.fromJson(json, JsonElement.class);
3230
String conversationsJson = element.getAsJsonObject().get("data").getAsJsonArray().toString();
3331
Conversation[] conversations = gson.fromJson(conversationsJson, Conversation[].class);

‎src/main/java/is/swan/mcmarketapi/request/requests/conversation/StartConversationRequest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.google.gson.Gson;
44
import com.google.gson.JsonElement;
5-
import is.swan.mcmarketapi.classes.Conversation;
65
import is.swan.mcmarketapi.request.Request;
76

87
import java.util.HashMap;
@@ -30,7 +29,6 @@ public Method getMethod() {
3029

3130
@Override
3231
public String getBody() {
33-
Gson gson = new Gson();
3432
HashMap<String, Object> parameters = new HashMap<>();
3533

3634
parameters.put("recipient_ids", recipientIds);
@@ -42,7 +40,6 @@ public String getBody() {
4240

4341
@Override
4442
public Integer handleJson(String json) {
45-
Gson gson = new Gson();
4643
JsonElement element = gson.fromJson(json, JsonElement.class);
4744
int id = element.getAsJsonObject().get("data").getAsInt();
4845

‎src/main/java/is/swan/mcmarketapi/request/requests/conversation/reply/ListUnreadConversationRepliesRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.conversation.reply;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.Reply;
65
import is.swan.mcmarketapi.request.Request;
@@ -29,7 +28,6 @@ public Method getMethod() {
2928

3029
@Override
3130
public Reply[] handleJson(String json) {
32-
Gson gson = new Gson();
3331
JsonElement element = gson.fromJson(json, JsonElement.class);
3432
String conversationRepliesJson = element.getAsJsonObject().get("data").getAsJsonArray().toString();
3533
Reply[] conversationReplies = gson.fromJson(conversationRepliesJson, Reply[].class);

‎src/main/java/is/swan/mcmarketapi/request/requests/conversation/reply/ReplyToUnreadConversationRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public Method getMethod() {
2828

2929
@Override
3030
public String getBody() {
31-
Gson gson = new Gson();
3231
HashMap<String, Object> parameters = new HashMap<>();
3332

3433
parameters.put("message", message);
@@ -38,7 +37,6 @@ public String getBody() {
3837

3938
@Override
4039
public Integer handleJson(String json) {
41-
Gson gson = new Gson();
4240
JsonElement element = gson.fromJson(json, JsonElement.class);
4341
int id = element.getAsJsonObject().get("data").getAsInt();
4442

‎src/main/java/is/swan/mcmarketapi/request/requests/member/ListBansRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.member;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.Ban;
65
import is.swan.mcmarketapi.request.Request;
@@ -19,7 +18,6 @@ public Method getMethod() {
1918

2019
@Override
2120
public Ban[] handleJson(String json) {
22-
Gson gson = new Gson();
2321
JsonElement element = gson.fromJson(json, JsonElement.class);
2422
String bansJson = element.getAsJsonObject().get("data").getAsJsonArray().toString();
2523
Ban[] bans = gson.fromJson(bansJson, Ban[].class);

‎src/main/java/is/swan/mcmarketapi/request/requests/member/ModifyYourselfRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.member;
22

3-
import com.google.gson.Gson;
43
import is.swan.mcmarketapi.request.Request;
54

65
import java.util.HashMap;
@@ -27,7 +26,6 @@ public Method getMethod() {
2726

2827
@Override
2928
public String getBody() {
30-
Gson gson = new Gson();
3129
HashMap<String, String> parameters = new HashMap<>();
3230

3331
if (customTitle != null) {

‎src/main/java/is/swan/mcmarketapi/request/requests/member/RetrieveMemberByIDRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.member;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.Member;
65
import is.swan.mcmarketapi.request.Request;
@@ -25,7 +24,6 @@ public Method getMethod() {
2524

2625
@Override
2726
public Member handleJson(String json) {
28-
Gson gson = new Gson();
2927
JsonElement element = gson.fromJson(json, JsonElement.class);
3028
String memberJson = element.getAsJsonObject().get("data").getAsJsonObject().toString();
3129
Member member = gson.fromJson(memberJson, Member.class);

‎src/main/java/is/swan/mcmarketapi/request/requests/member/RetrieveMemberByUsernameRequest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.member;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.Member;
65
import is.swan.mcmarketapi.request.Request;
@@ -15,7 +14,7 @@ public RetrieveMemberByUsernameRequest(String username) {
1514

1615
@Override
1716
public String getURL() {
18-
return "https://api.mc-market.org/v1/members/username/" + username;
17+
return "https://api.mc-market.org/v1/members/usernames/" + username;
1918
}
2019

2120
@Override
@@ -25,7 +24,6 @@ public Method getMethod() {
2524

2625
@Override
2726
public Member handleJson(String json) {
28-
Gson gson = new Gson();
2927
JsonElement element = gson.fromJson(json, JsonElement.class);
3028
String memberJson = element.getAsJsonObject().get("data").getAsJsonObject().toString();
3129
Member member = gson.fromJson(memberJson, Member.class);

‎src/main/java/is/swan/mcmarketapi/request/requests/member/RetrieveYourselfRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.member;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.Member;
65
import is.swan.mcmarketapi.request.Request;
@@ -19,7 +18,6 @@ public Method getMethod() {
1918

2019
@Override
2120
public Member handleJson(String json) {
22-
Gson gson = new Gson();
2321
JsonElement element = gson.fromJson(json, JsonElement.class);
2422
String memberJson = element.getAsJsonObject().get("data").getAsJsonObject().toString();
2523
Member member = gson.fromJson(memberJson, Member.class);

‎src/main/java/is/swan/mcmarketapi/request/requests/member/profilepost/EditProfilePostRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.member.profilepost;
22

3-
import com.google.gson.Gson;
43
import is.swan.mcmarketapi.request.Request;
54

65
import java.util.HashMap;
@@ -27,7 +26,6 @@ public Method getMethod() {
2726

2827
@Override
2928
public String getBody() {
30-
Gson gson = new Gson();
3129
HashMap<String, String> parameters = new HashMap<>();
3230

3331
parameters.put("message", message);

‎src/main/java/is/swan/mcmarketapi/request/requests/member/profilepost/ListProfilePostsRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.member.profilepost;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.ProfilePost;
65
import is.swan.mcmarketapi.request.Request;
@@ -27,7 +26,6 @@ public Method getMethod() {
2726

2827
@Override
2928
public ProfilePost[] handleJson(String json) {
30-
Gson gson = new Gson();
3129
JsonElement element = gson.fromJson(json, JsonElement.class);
3230
String profilePostsJson = element.getAsJsonObject().get("data").getAsJsonArray().toString();
3331
ProfilePost[] profilePosts = gson.fromJson(profilePostsJson, ProfilePost[].class);

‎src/main/java/is/swan/mcmarketapi/request/requests/member/profilepost/RetrieveSpecificProfilePostRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.member.profilepost;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.ProfilePost;
65
import is.swan.mcmarketapi.request.Request;
@@ -25,7 +24,6 @@ public Method getMethod() {
2524

2625
@Override
2726
public ProfilePost handleJson(String json) {
28-
Gson gson = new Gson();
2927
JsonElement element = gson.fromJson(json, JsonElement.class);
3028
String profilePostJson = element.getAsJsonObject().get("data").getAsJsonObject().toString();
3129
ProfilePost profilePost = gson.fromJson(profilePostJson, ProfilePost.class);

‎src/main/java/is/swan/mcmarketapi/request/requests/resource/ListCollaboratedResourcesRequest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package is.swan.mcmarketapi.request.requests.resource;
22

3-
import com.google.gson.Gson;
43
import com.google.gson.JsonElement;
54
import is.swan.mcmarketapi.classes.BasicResource;
65
import is.swan.mcmarketapi.request.Request;
@@ -27,7 +26,6 @@ public Method getMethod() {
2726

2827
@Override
2928
public BasicResource[] handleJson(String json) {
30-
Gson gson = new Gson();
3129
JsonElement element = gson.fromJson(json, JsonElement.class);
3230
String resourcesJson = element.getAsJsonObject().get("data").getAsJsonArray().toString();
3331
BasicResource[] resources = gson.fromJson(resourcesJson, BasicResource[].class);

0 commit comments

Comments
 (0)