MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use HttpRequests

Browse Source
This commit is contained in:
Vladimir Krivosheev
2018-03-19 11:20:17 +01:00
parent 6ed7f245d9
commit e330c854c2
2 changed files with 40 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/internal/statistic/eventLog/EventLogStatisticsService.java
+16 -40
View File
@@ -9,29 +9,17 @@ import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceCom
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationListener;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.io.StreamUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.HttpClientBuilder;
import com.intellij.util.io.HttpRequests;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class EventLogStatisticsService implements StatisticsService {
private static final Logger LOG = Logger.getInstance("com.intellij.internal.statistic.eventLog.EventLogStatisticsService");
private static final ContentType APPLICATION_JSON = ContentType.create("application/json", Consts.UTF_8);
private static final EventLogStatisticsSettingsService mySettingsService = EventLogStatisticsSettingsService.getInstance();
@@ -65,21 +53,26 @@ public class EventLogStatisticsService implements StatisticsService {
continue;
}
final HttpClient httpClient = HttpClientBuilder.create().build();
final HttpPost post = createPostRequest(serviceUrl, LogEventSerializer.INSTANCE.toString(request));
final HttpResponse response = httpClient.execute(post);
final int code = response.getStatusLine().getStatusCode();
if (code == HttpStatus.SC_OK) {
try {
HttpRequests
.post(serviceUrl, "application/json")
.isReadResponseOnError(true)
.connect(request1 -> {
request1.write(LogEventSerializer.INSTANCE.toString(request));
if (LOG.isTraceEnabled()) {
LOG.trace(file.getName() + " -> " + request1.readString());
}
return null;
});
succeed++;
toRemove.add(file);
}
else if (code == HttpStatus.SC_BAD_REQUEST) {
catch (HttpRequests.HttpStatusException e) {
toRemove.add(file);
}
if (LOG.isTraceEnabled()) {
LOG.trace(file.getName() + " -> " + getResponseMessage(response));
if (LOG.isTraceEnabled()) {
LOG.trace(file.getName() + " -> " + e.getMessage());
}
}
}
@@ -136,25 +129,8 @@ public class EventLogStatisticsService implements StatisticsService {
}
}
@NotNull
public static HttpPost createPostRequest(@NotNull String serviceUrl, @NotNull String content) {
final HttpPost post = new HttpPost(serviceUrl);
final StringEntity postingString = new StringEntity(content, APPLICATION_JSON);
post.setEntity(postingString);
return post;
}
@Override
public Notification createNotification(@NotNull String groupDisplayId, @Nullable NotificationListener listener) {
return null;
}
@NotNull
private static String getResponseMessage(HttpResponse response) throws IOException {
HttpEntity entity = response.getEntity();
if (entity != null) {
return StreamUtil.readText(entity.getContent(), CharsetToolkit.UTF8);
}
return Integer.toString(response.getStatusLine().getStatusCode());
}
}
platform/platform-impl/src/com/intellij/internal/statistic/service/fus/FUStatisticsService.java
+24 -37
View File
@@ -9,18 +9,10 @@ import com.intellij.internal.statistic.service.fus.collectors.FUStatisticsPersis
import com.intellij.internal.statistic.service.fus.collectors.FUStatisticsStateService;
import com.intellij.openapi.application.ex.ApplicationManagerEx;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.io.StreamUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.HttpClientBuilder;
import com.intellij.util.io.HttpRequests;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.util.Set;
public class FUStatisticsService extends ConfigurableStatisticsService<FUStatisticsSettingsService> {
@@ -52,44 +44,39 @@ public class FUStatisticsService extends ConfigurableStatisticsService<FUStatist
throw new StatServiceException("There are no data from collectors to send");
}
HttpResponse response = postStatistics(serviceUrl, dataToSend);
HttpRequests.post(serviceUrl, "application/json")
.isReadResponseOnError(true)
.connect(request -> {
request.write(dataToSend);
if (LOG.isDebugEnabled()) {
String message = request.readString();
if (message.isEmpty()) {
LOG.debug(Integer.toString(((HttpURLConnection)request.getConnection()).getResponseCode()));
}
else {
LOG.debug(message);
}
}
return null;
});
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
String responseMessage = getResponseMessage(response);
LOG.info(responseMessage);
throw new StatServiceException("Error during data sending. \n " + responseMessage);
}
FUStatisticsPersistence.clearSessionPersistence(System.currentTimeMillis());
FUStatisticsPersistence.persistSentData(dataToSend);
FUStatisticsPersistence.persistDataFromCollectors(allDataFromCollectors.asJsonString());
if (LOG.isDebugEnabled()) LOG.debug(getResponseMessage(response));
return dataToSend;
} catch (Exception e) {
}
catch (HttpRequests.HttpStatusException e) {
String responseMessage = e.getMessage();
LOG.info(responseMessage);
throw new StatServiceException("Error during data sending. \n " + responseMessage);
}
catch (Exception e) {
LOG.info(e);
throw new StatServiceException("Error during data sending.", e);
}
}
private static HttpResponse postStatistics(String serviceUrl, String content) throws IOException {
HttpClient httpClient = HttpClientBuilder.create().build();
HttpPost post = new HttpPost(serviceUrl);
StringEntity postingString = new StringEntity(content);
post.setEntity(postingString);
post.setHeader("Content-type", "application/json");
return httpClient.execute(post);
}
@NotNull
private static String getResponseMessage(HttpResponse response) throws IOException {
HttpEntity entity = response.getEntity();
if (entity != null) {
return StreamUtil.readText(entity.getContent(), CharsetToolkit.UTF8);
}
return Integer.toString(response.getStatusLine().getStatusCode());
}
@Override
public FUStatisticsSettingsService getConnectionService() {
return mySettingsService;