Skip to content

Commit e632562

Browse files
committed
add better codestyle javadoc validation than we have now
1 parent 97026f6 commit e632562

27 files changed

+203
-47
lines changed

build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ ext {
66
}
77

88
allprojects {
9+
apply plugin: 'java'
10+
apply plugin: 'checkstyle'
11+
12+
checkstyle {
13+
configFile = file("$rootProject.projectDir/src/checkstyle/checkstyle.xml")
14+
ignoreFailures = false
15+
}
16+
17+
checkstyleMain {
18+
source = 'src/main/java'
19+
}
20+
21+
checkstyleTest {
22+
source = 'src/test/java'
23+
}
24+
925
repositories {
1026
mavenCentral()
1127
}

client/src/main/java/ru/funpay4j/client/client/FunPayClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public interface FunPayClient {
5454
*
5555
* @param goldenKey golden key which will be used to authorize the user
5656
* @param csrfToken csrf token which is required to interact with the user in this operation
57-
* @param PHPSESSID user session without which the csrf token will be useless
57+
* @param phpSessionId user session without which the csrf token will be useless
5858
* @param request request storing all necessary data for saving offer
5959
* @throws FunPayApiException if the other api-related exception
6060
* @throws InvalidGoldenKeyException if the golden key is invalid
6161
* @throws InvalidCsrfTokenOrPHPSESSIDException if the csrf token or PHPSESSID is invalid
6262
*/
63-
void saveOffer(String goldenKey, String csrfToken, String PHPSESSID, SaveOfferRequest request) throws FunPayApiException,
63+
void saveOffer(String goldenKey, String csrfToken, String phpSessionId , SaveOfferRequest request) throws FunPayApiException,
6464
InvalidGoldenKeyException, InvalidCsrfTokenOrPHPSESSIDException;
6565

6666
/**

client/src/main/java/ru/funpay4j/client/client/OkHttpFunPayClient.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
import com.google.gson.JsonObject;
1818
import com.google.gson.JsonParser;
1919
import lombok.NonNull;
20-
import okhttp3.*;
20+
import okhttp3.OkHttpClient;
21+
import okhttp3.Response;
22+
import okhttp3.Request;
23+
import okhttp3.RequestBody;
24+
import okhttp3.MultipartBody;
2125
import ru.funpay4j.client.request.SaveOfferRequest;
2226
import ru.funpay4j.client.exceptions.FunPayApiException;
2327
import ru.funpay4j.client.exceptions.InvalidCsrfTokenOrPHPSESSIDException;
@@ -108,7 +112,7 @@ public void raiseAllOffers(@NonNull String goldenKey, long gameId, long lotId) t
108112
*/
109113
@Override
110114
public void saveOffer(@NonNull String goldenKey, @NonNull String csrfToken,
111-
@NonNull String PHPSESSID, @NonNull SaveOfferRequest request) throws FunPayApiException, InvalidGoldenKeyException{
115+
@NonNull String phpSessionId, @NonNull SaveOfferRequest request) throws FunPayApiException, InvalidGoldenKeyException{
112116
MultipartBody.Builder multipartBody = new MultipartBody.Builder()
113117
.setType(MultipartBody.FORM)
114118
.addFormDataPart("csrf_token", csrfToken)
@@ -138,7 +142,7 @@ public void saveOffer(@NonNull String goldenKey, @NonNull String csrfToken,
138142
}
139143

140144
try (Response response = httpClient.newCall(new Request.Builder().post(multipartBody.build()).url(baseURL + "/lots/offerSave")
141-
.addHeader("Cookie", "golden_key=" + goldenKey + "; PHPSESSID=" + PHPSESSID)
145+
.addHeader("Cookie", "golden_key=" + goldenKey + "; PHPSESSID=" + phpSessionId)
142146
.addHeader("x-requested-with", "XMLHttpRequest")
143147
.build()).execute()) {
144148
String responseBodyString = response.body().string();

client/src/main/java/ru/funpay4j/client/objects/user/ParsedAdvancedSellerReview.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
package ru.funpay4j.client.objects.user;
1616

17-
import lombok.*;
17+
import lombok.Getter;
18+
import lombok.Setter;
19+
import lombok.EqualsAndHashCode;
20+
import lombok.AllArgsConstructor;
21+
import lombok.ToString;
1822
import lombok.experimental.SuperBuilder;
1923

2024
import java.util.Date;

client/src/main/java/ru/funpay4j/client/objects/user/ParsedPreviewSeller.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
package ru.funpay4j.client.objects.user;
1616

17-
import lombok.*;
17+
import lombok.Getter;
18+
import lombok.Setter;
19+
import lombok.EqualsAndHashCode;
20+
import lombok.AllArgsConstructor;
21+
import lombok.ToString;
1822
import lombok.experimental.SuperBuilder;
1923

2024
/**

client/src/main/java/ru/funpay4j/client/objects/user/ParsedSeller.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
package ru.funpay4j.client.objects.user;
1616

17-
import lombok.*;
17+
import lombok.Getter;
18+
import lombok.Setter;
19+
import lombok.EqualsAndHashCode;
20+
import lombok.AllArgsConstructor;
21+
import lombok.ToString;
1822
import lombok.experimental.SuperBuilder;
1923
import ru.funpay4j.client.objects.offer.ParsedPreviewOffer;
2024

client/src/main/java/ru/funpay4j/client/parser/JsoupFunPayParser.java

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616

1717
import com.google.gson.JsonParser;
1818
import lombok.NonNull;
19-
import okhttp3.*;
19+
import okhttp3.OkHttpClient;
20+
import okhttp3.Response;
21+
import okhttp3.Request;
22+
import okhttp3.RequestBody;
23+
import okhttp3.MultipartBody;
2024
import org.jsoup.Jsoup;
2125
import org.jsoup.nodes.Document;
2226
import org.jsoup.nodes.Element;
@@ -26,7 +30,11 @@
2630
import ru.funpay4j.client.objects.lot.ParsedLotCounter;
2731
import ru.funpay4j.client.objects.offer.ParsedOffer;
2832
import ru.funpay4j.client.objects.offer.ParsedPreviewOffer;
29-
import ru.funpay4j.client.objects.user.*;
33+
import ru.funpay4j.client.objects.user.ParsedPreviewSeller;
34+
import ru.funpay4j.client.objects.user.ParsedSeller;
35+
import ru.funpay4j.client.objects.user.ParsedSellerReview;
36+
import ru.funpay4j.client.objects.user.ParsedUser;
37+
import ru.funpay4j.client.objects.user.ParsedAdvancedSellerReview;
3038
import ru.funpay4j.utils.FunPayUserUtil;
3139
import ru.funpay4j.client.exceptions.FunPayApiException;
3240
import ru.funpay4j.client.exceptions.offer.OfferNotFoundException;
@@ -36,7 +44,12 @@
3644

3745
import java.io.IOException;
3846
import java.text.ParseException;
39-
import java.util.*;
47+
import java.util.List;
48+
import java.util.ArrayList;
49+
import java.util.Date;
50+
import java.util.Map;
51+
import java.util.HashMap;
52+
import java.util.Optional;
4053

4154
/**
4255
* This implementation of FunPayParser uses Jsoup to parse
@@ -402,12 +415,12 @@ public CsrfTokenAndPHPSESSID parseCsrfTokenAndPHPSESSID(@NonNull String goldenKe
402415
String dataAppData = funPayDocument.getElementsByTag("body").attr("data-app-data");
403416

404417
String csrfToken = JsonParser.parseString(dataAppData).getAsJsonObject().get("csrf-token").getAsString();
405-
//Use this regex to get the value of the PHPSESSID key from the Set-Cookie header
406-
String PHPSESSID = funPayHtmlResponse.header("Set-Cookie").replaceAll(".*PHPSESSID=([^;]*).*", "$1");
418+
//Use this regex to get the value of the PHP_SESSION_ID key from the Set-Cookie header
419+
String phpSessionId = funPayHtmlResponse.header("Set-Cookie").replaceAll(".*PHPSESSID=([^;]*).*", "$1");
407420

408421
return CsrfTokenAndPHPSESSID.builder()
409422
.csrfToken(csrfToken)
410-
.PHPSESSID(PHPSESSID)
423+
.PHPSESSID(phpSessionId)
411424
.build();
412425
} catch (IOException e) {
413426
throw new FunPayApiException(e.getLocalizedMessage());

core/src/main/java/ru/funpay4j/core/AuthorizedFunPayExecutor.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
import ru.funpay4j.client.objects.user.ParsedSellerReview;
2222
import ru.funpay4j.client.objects.user.ParsedUser;
2323
import ru.funpay4j.client.request.SaveOfferRequest;
24-
import ru.funpay4j.core.commands.offer.*;
24+
import ru.funpay4j.core.commands.offer.EditOffer;
25+
import ru.funpay4j.core.commands.offer.CreateOffer;
26+
import ru.funpay4j.core.commands.offer.DeleteOffer;
27+
import ru.funpay4j.core.commands.offer.CreateOfferImage;
28+
import ru.funpay4j.core.commands.offer.RaiseAllOffers;
2529
import ru.funpay4j.core.commands.user.GetSellerReviews;
2630
import ru.funpay4j.core.commands.user.GetUser;
2731
import ru.funpay4j.core.commands.user.UpdateAvatar;

core/src/main/java/ru/funpay4j/core/FunPayExecutor.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
import ru.funpay4j.client.objects.game.ParsedPromoGame;
2323
import ru.funpay4j.client.objects.lot.ParsedLot;
2424
import ru.funpay4j.client.objects.offer.ParsedOffer;
25-
import ru.funpay4j.client.objects.user.*;
25+
import ru.funpay4j.client.objects.user.ParsedAdvancedSellerReview;
26+
import ru.funpay4j.client.objects.user.ParsedSellerReview;
27+
import ru.funpay4j.client.objects.user.ParsedUser;
28+
import ru.funpay4j.client.objects.user.ParsedPreviewSeller;
29+
import ru.funpay4j.client.objects.user.ParsedSeller;
2630
import ru.funpay4j.client.client.OkHttpFunPayClient;
2731
import ru.funpay4j.core.commands.offer.GetOffer;
2832
import ru.funpay4j.core.commands.game.GetPromoGames;
@@ -39,8 +43,11 @@
3943
import ru.funpay4j.core.objects.lot.LotCounter;
4044
import ru.funpay4j.core.objects.offer.Offer;
4145
import ru.funpay4j.core.objects.offer.PreviewOffer;
42-
import ru.funpay4j.core.objects.user.*;
43-
46+
import ru.funpay4j.core.objects.user.AdvancedSellerReview;
47+
import ru.funpay4j.core.objects.user.SellerReview;
48+
import ru.funpay4j.core.objects.user.User;
49+
import ru.funpay4j.core.objects.user.Seller;
50+
import ru.funpay4j.core.objects.user.PreviewSeller;
4451
import java.net.Proxy;
4552
import java.util.List;
4653
import java.util.stream.Collectors;

core/src/main/java/ru/funpay4j/core/commands/game/GetPromoGames.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
package ru.funpay4j.core.commands.game;
1616

17-
import lombok.*;
17+
import lombok.AllArgsConstructor;
18+
import lombok.Builder;
19+
import lombok.Getter;
20+
import lombok.Setter;
21+
import lombok.NonNull;
1822

1923
/**
2024
* Use this command to get promo games

0 commit comments

Comments
 (0)