jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use UUID instead of new Random().nextInt(...) (#238)

Browse Source 
Summary:
Minor simplification, mostly cleanup.  Arguably, better to avoid the birthday paradox e.g. collision with > a few thousand requests.

Tested via

$ ./gradlew :sample:installDebug
Pull Request resolved: https://github.com/facebook/flipper/pull/238

Reviewed By: danielbuechele

Differential Revision: D9359941

Pulled By: passy

fbshipit-source-id: d2988b58f41d84a52aca060b5c583e055b8b203a
This commit is contained in:
Yuri Schimke
2018-08-20 02:14:09 -07:00
committed by Facebook Github Bot
parent e9471c7197
commit 5eb986d598
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
android/src/main/java/com/facebook/sonar/plugins/network/SonarOkhttpInterceptor.java
View File

@@ -15,6 +15,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import okhttp3.Headers; import okhttp3.Headers;
import okhttp3.Interceptor; import okhttp3.Interceptor;
@@ -38,11 +39,11 @@ public class SonarOkhttpInterceptor implements Interceptor {
@Override @Override
public Response intercept(Interceptor.Chain chain) throws IOException { public Response intercept(Interceptor.Chain chain) throws IOException {
Request request = chain.request(); Request request = chain.request();
int randInt = randInt(1, Integer.MAX_VALUE); String identifier = UUID.randomUUID().toString();
plugin.reportRequest(convertRequest(request, randInt)); plugin.reportRequest(convertRequest(request, identifier));
Response response = chain.proceed(request); Response response = chain.proceed(request);
ResponseBody body = response.body(); ResponseBody body = response.body();
ResponseInfo responseInfo = convertResponse(response, body, randInt); ResponseInfo responseInfo = convertResponse(response, body, identifier);
plugin.reportResponse(responseInfo); plugin.reportResponse(responseInfo);
// Creating new response as can't used response.body() more than once // Creating new response as can't used response.body() more than once
if (responseInfo.body != null) { if (responseInfo.body != null) {
@@ -67,10 +68,10 @@ public class SonarOkhttpInterceptor implements Interceptor {
} }
} }
private RequestInfo convertRequest(Request request, int identifier) { private RequestInfo convertRequest(Request request, String identifier) {
List<NetworkReporter.Header> headers = convertHeader(request.headers()); List<NetworkReporter.Header> headers = convertHeader(request.headers());
RequestInfo info = new RequestInfo(); RequestInfo info = new RequestInfo();
info.requestId = String.valueOf(identifier); info.requestId = identifier;
info.timeStamp = System.currentTimeMillis(); info.timeStamp = System.currentTimeMillis();
info.headers = headers; info.headers = headers;
info.method = request.method(); info.method = request.method();
@@ -82,11 +83,11 @@ public class SonarOkhttpInterceptor implements Interceptor {
return info; return info;
} }
private ResponseInfo convertResponse(Response response, ResponseBody body, int identifier) { private ResponseInfo convertResponse(Response response, ResponseBody body, String identifier) {
List<NetworkReporter.Header> headers = convertHeader(response.headers()); List<NetworkReporter.Header> headers = convertHeader(response.headers());
ResponseInfo info = new ResponseInfo(); ResponseInfo info = new ResponseInfo();
info.requestId = String.valueOf(identifier); info.requestId = identifier;
info.timeStamp = response.receivedResponseAtMillis(); info.timeStamp = response.receivedResponseAtMillis();
info.statusCode = response.code(); info.statusCode = response.code();
info.headers = headers; info.headers = headers;
@@ -107,10 +108,4 @@ public class SonarOkhttpInterceptor implements Interceptor {
} }
return list; return list;
} }
private int randInt(int min, int max) {
Random rand = new Random();
int randomNum = rand.nextInt((max - min) + 1) + min;
return randomNum;
}
} }