Skip to content

Commit 69bad0c

Browse files
authored
fix: Drop dependency to commons-httpclient - Meeds-io/meeds#3365 (#70)
1 parent c6051a9 commit 69bad0c

File tree

1 file changed

+34
-16
lines changed

1 file changed

+34
-16
lines changed

gamification-crowdin-services/src/main/java/io/meeds/crowdin/gamification/storage/CrowdinConsumerStorage.java

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,34 @@
1818
*/
1919
package io.meeds.crowdin.gamification.storage;
2020

21-
import io.meeds.crowdin.gamification.model.*;
22-
import org.apache.commons.httpclient.HttpStatus;
21+
import static io.meeds.crowdin.gamification.utils.Utils.APPROVALS;
22+
import static io.meeds.crowdin.gamification.utils.Utils.AUTHORIZATION;
23+
import static io.meeds.crowdin.gamification.utils.Utils.COMMENT_CREATED_TRIGGER;
24+
import static io.meeds.crowdin.gamification.utils.Utils.COMMENT_DELETED_TRIGGER;
25+
import static io.meeds.crowdin.gamification.utils.Utils.CROWDIN_API_URL;
26+
import static io.meeds.crowdin.gamification.utils.Utils.CROWDIN_CONNECTION_ERROR;
27+
import static io.meeds.crowdin.gamification.utils.Utils.CROWDIN_EVENTS;
28+
import static io.meeds.crowdin.gamification.utils.Utils.PROJECTS;
29+
import static io.meeds.crowdin.gamification.utils.Utils.TOKEN;
30+
import static io.meeds.crowdin.gamification.utils.Utils.WEBHOOKS;
31+
import static io.meeds.crowdin.gamification.utils.Utils.generateRandomSecret;
32+
33+
import java.io.IOException;
34+
import java.io.InputStream;
35+
import java.net.URI;
36+
import java.nio.charset.StandardCharsets;
37+
import java.util.ArrayList;
38+
import java.util.Arrays;
39+
import java.util.HashMap;
40+
import java.util.List;
41+
import java.util.Map;
42+
43+
import javax.ws.rs.core.MediaType;
44+
2345
import org.apache.commons.io.IOUtils;
2446
import org.apache.commons.lang3.StringUtils;
2547
import org.apache.http.HttpResponse;
48+
import org.apache.http.HttpStatus;
2649
import org.apache.http.client.HttpClient;
2750
import org.apache.http.client.methods.HttpDelete;
2851
import org.apache.http.client.methods.HttpGet;
@@ -35,25 +58,20 @@
3558
import org.apache.http.impl.client.HttpClients;
3659
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
3760
import org.apache.http.protocol.HTTP;
38-
import org.exoplatform.commons.utils.CommonsUtils;
39-
import org.exoplatform.services.log.ExoLogger;
40-
import org.exoplatform.services.log.Log;
41-
42-
import io.meeds.crowdin.gamification.exception.CrowdinConnectionException;
43-
4461
import org.json.JSONArray;
4562
import org.json.JSONObject;
4663
import org.springframework.stereotype.Component;
4764

48-
import javax.ws.rs.core.MediaType;
49-
50-
import static io.meeds.crowdin.gamification.utils.Utils.*;
65+
import org.exoplatform.commons.utils.CommonsUtils;
66+
import org.exoplatform.services.log.ExoLogger;
67+
import org.exoplatform.services.log.Log;
5168

52-
import java.io.IOException;
53-
import java.io.InputStream;
54-
import java.net.URI;
55-
import java.nio.charset.StandardCharsets;
56-
import java.util.*;
69+
import io.meeds.crowdin.gamification.exception.CrowdinConnectionException;
70+
import io.meeds.crowdin.gamification.model.RemoteApproval;
71+
import io.meeds.crowdin.gamification.model.RemoteDirectory;
72+
import io.meeds.crowdin.gamification.model.RemoteLanguage;
73+
import io.meeds.crowdin.gamification.model.RemoteProject;
74+
import io.meeds.crowdin.gamification.model.WebHook;
5775

5876
@Component
5977
public class CrowdinConsumerStorage {

0 commit comments

Comments
 (0)