From 4e8ab9f756aee7a02bee54afc5ca553ab52b8506 Mon Sep 17 00:00:00 2001 From: George Kankava Date: Mon, 9 May 2016 19:51:32 +0400 Subject: [PATCH] Multiple code improvements - squid:S1319, squid:S2583, squid:S1301, squid:SwitchLastCaseIsDefaultCheck, squid:S1141, squid:S1151, squid:S1854 --- .../example/fragment/MeiziFragment.java | 13 ++-- .../com/huxq17/example/http/HttpSender.java | 19 ++--- .../java/com/huxq17/example/http/OKHttp.java | 78 +++++++++---------- .../example/http/request/HttpHeader.java | 7 +- .../example/http/request/HttpRequest.java | 5 +- .../example/http/request/RequestParams.java | 9 ++- .../example/http/response/HttpResponse.java | 13 ++-- 7 files changed, 70 insertions(+), 74 deletions(-) diff --git a/app/src/main/java/com/huxq17/example/fragment/MeiziFragment.java b/app/src/main/java/com/huxq17/example/fragment/MeiziFragment.java index 88ab5da..cc2e473 100644 --- a/app/src/main/java/com/huxq17/example/fragment/MeiziFragment.java +++ b/app/src/main/java/com/huxq17/example/fragment/MeiziFragment.java @@ -20,6 +20,8 @@ import java.util.ArrayList; import java.util.List; +import static com.huxq17.swipecardsview.SwipeCardsView.SlideType.*; + /** * Created by huxq17 on 2016/4/11. */ @@ -71,13 +73,10 @@ public void onShow(int index) { @Override public void onCardVanish(int index, SwipeCardsView.SlideType type) { String orientation = ""; - switch (type) { - case LEFT: - orientation = "向左飞出"; - break; - case RIGHT: - orientation = "向右飞出"; - break; + if (type == LEFT) { + orientation = "向左飞出"; + } else if(type == RIGHT) { + orientation = "向右飞出"; } // toast("test position = "+index+";卡片"+orientation); } diff --git a/app/src/main/java/com/huxq17/example/http/HttpSender.java b/app/src/main/java/com/huxq17/example/http/HttpSender.java index 8834df2..565df01 100644 --- a/app/src/main/java/com/huxq17/example/http/HttpSender.java +++ b/app/src/main/java/com/huxq17/example/http/HttpSender.java @@ -10,6 +10,7 @@ import java.io.File; import java.util.LinkedHashMap; +import java.util.Map; /** * Created by huxq17 on 2015/11/16. @@ -27,7 +28,7 @@ public static HttpSender instance() { public void post(final String url, - LinkedHashMap headers, final String params, + Map headers, final String params, final LoadListener listener, Object... tag) { HttpRequest.Builder builder = new HttpRequest.Builder(); builder.url(url); @@ -41,7 +42,7 @@ public void post(final String url, mHttpBase.post(request, listener, tag); } - public void post(final String url, LinkedHashMap headers, LinkedHashMap params, + public void post(final String url, Map headers, Map params, LoadListener listener, Object... tag) { HttpRequest.Builder builder = new HttpRequest.Builder(); builder.url(url); @@ -51,7 +52,7 @@ public void post(final String url, LinkedHashMap headers, Linked mHttpBase.post(request, listener, tag); } - public HttpResponse postSync(final String url, LinkedHashMap headers, LinkedHashMap params, + public HttpResponse postSync(final String url, Map headers, Map params, Object... tag) { HttpRequest.Builder builder = new HttpRequest.Builder(); builder.url(url); @@ -61,7 +62,7 @@ public HttpResponse postSync(final String url, LinkedHashMap hea return mHttpBase.post(request, null, tag); } - public void get(String url, LinkedHashMap headers, String params, + public void get(String url, Map headers, String params, final LoadListener listener, Object... tag) { if (!TextUtils.isEmpty(params)) { url = url + "?" + params; @@ -73,7 +74,7 @@ public void get(String url, LinkedHashMap headers, String params mHttpBase.get(builder.build(), listener, tag); } - public HttpResponse getInputStreamSync(String url, LinkedHashMap headers, String params, Object... tag) { + public HttpResponse getInputStreamSync(String url, Map headers, String params, Object... tag) { if (!TextUtils.isEmpty(params)) { url = url + "?" + params; } @@ -82,7 +83,7 @@ public HttpResponse getInputStreamSync(String url, LinkedHashMap addHeaders(builder, headers); return mHttpBase.get(builder.build(), null, tag); } - public HttpResponse getSync(String url, LinkedHashMap headers, String params, Object... tag){ + public HttpResponse getSync(String url, Map headers, String params, Object... tag){ if (!TextUtils.isEmpty(params)) { url = url + "?" + params; } @@ -111,7 +112,7 @@ public HttpResponse headerSync(String url, Object... tag) { return response; } - public void upload(String url, LinkedHashMap headers, File[] files, LinkedHashMap params, LoadListener listener, Object tag) { + public void upload(String url, Map headers, File[] files, Map params, LoadListener listener, Object tag) { HttpRequest.Builder builder = new HttpRequest.Builder(); builder.url(url).setParams(params); addHeaders(builder, headers); @@ -121,7 +122,7 @@ public void upload(String url, LinkedHashMap headers, File[] fil mHttpBase.post(builder.build(), listener, tag); } - public void upload(String url, LinkedHashMap headers, File[] files, LoadListener listener, Object tag) { + public void upload(String url, Map headers, File[] files, LoadListener listener, Object tag) { upload(url, headers, files, null, listener, tag); } @@ -137,7 +138,7 @@ public void upload(String url, LinkedHashMap headers, File[] fil // TaskPool.getInstance().execute(new DownLoadTask(info,context,listener,tag)); // } - private void addHeaders(HttpRequest.Builder builder, LinkedHashMap headers) { + private void addHeaders(HttpRequest.Builder builder, Map headers) { if (headers != null && headers.size() > 0) { builder.setHeader(headers); } diff --git a/app/src/main/java/com/huxq17/example/http/OKHttp.java b/app/src/main/java/com/huxq17/example/http/OKHttp.java index 17560e4..92e8d11 100644 --- a/app/src/main/java/com/huxq17/example/http/OKHttp.java +++ b/app/src/main/java/com/huxq17/example/http/OKHttp.java @@ -19,11 +19,13 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.CookieManager; import java.net.CookiePolicy; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.TimeUnit; import okhttp3.Call; @@ -36,6 +38,7 @@ import okhttp3.RequestBody; import okhttp3.Response; +import static com.huxq17.example.http.response.ResponseType.*; /** * Created by xiaoqian.hu on 2015/10/15. @@ -148,7 +151,7 @@ private RequestBody buildRequestBody(RequestParams requestParams) { String contentType = requestParams.getContentType(); String charset = requestParams.getCharSet(); String params = requestParams.toString(); - LinkedHashMap paramsHashmap = requestParams.getmParams(); + Map paramsHashmap = requestParams.getmParams(); if (params == null || TextUtils.isEmpty(contentType) || TextUtils.isEmpty(charset)) { throw new RuntimeException("params is null"); } @@ -182,7 +185,7 @@ private RequestBody buildRequestBody(RequestParams requestParams) { } private void addHeader(Request.Builder builder, HttpHeader header) { - HashMap headers = header.getHeaders(); + Map headers = header.getHeaders(); if (headers != null && headers.size() > 0) { for (HashMap.Entry map : headers.entrySet()) { @@ -225,20 +228,17 @@ private HttpResponse execute(ResponseType type, Request request, boolean synchro httpResponse.setResponseType(type); Response response = call.execute(); String string = null; - switch (type) { - case String: - try { - string = response.body().string(); - } catch (IOException e) { - } catch (Exception e) { - e.printStackTrace(); - } - httpResponse.setString(string); + if (type == String) { + try { + string = response.body().string(); + } catch (IOException e) { + } catch (Exception e) { + e.printStackTrace(); + } + httpResponse.setString(string); // LogUtils.d("okresult: " + string); - break; - case InputStream: + } else if(type == InputStream) { httpResponse.setInputStream(response.body().byteStream()); - break; } httpResponse.setContentLength(response.body().contentLength()); } catch (Exception e) { @@ -275,20 +275,17 @@ private void execute() { String string = null; httpResponse.setContentLength(response.body().contentLength()); httpResponse.setResponseType(mType); - switch (mType) { - case String: - try { - string = response.body().string(); - } catch (IOException e) { - } catch (Exception e) { - e.printStackTrace(); - } - httpResponse.setString(string); - LogUtils.d("okresult: " + string + ";contentLength=" + response.body().contentLength()); - break; - case InputStream: - httpResponse.setInputStream(response.body().byteStream()); - break; + if (mType == String) { + try { + string = response.body().string(); + } catch (IOException e) { + } catch (Exception e) { + e.printStackTrace(); + } + httpResponse.setString(string); + LogUtils.d("okresult: " + string + ";contentLength=" + response.body().contentLength()); + } else if(mType == InputStream) { + httpResponse.setInputStream(response.body().byteStream()); } notifySuccess(httpResponse); } catch (Exception e) { @@ -317,20 +314,17 @@ public void onResponse(Response response) throws IOException { synchronized (NetWorkTask.this) { HttpResponse httpResponse = new HttpResponse(); String string = null; - switch (mType) { - case String: - try { - string = response.body().string(); - } catch (IOException e) { - } catch (Exception e) { - e.printStackTrace(); - } - httpResponse.setString(string); - LogUtils.d("okresult: " + string); - break; - case InputStream: - httpResponse.setInputStream(response.body().byteStream()); - break; + if (mType == String) { + try { + string = response.body().string(); + } catch (IOException e) { + } catch (Exception e) { + e.printStackTrace(); + } + httpResponse.setString(string); + LogUtils.d("okresult: " + string); + } else if(mType == InputStream) { + httpResponse.setInputStream(response.body().byteStream()); } httpResponse.setString(string); httpResponse.setContentLength(response.body().contentLength()); diff --git a/app/src/main/java/com/huxq17/example/http/request/HttpHeader.java b/app/src/main/java/com/huxq17/example/http/request/HttpHeader.java index 444feb8..59b33c1 100644 --- a/app/src/main/java/com/huxq17/example/http/request/HttpHeader.java +++ b/app/src/main/java/com/huxq17/example/http/request/HttpHeader.java @@ -2,9 +2,10 @@ import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.Map; public final class HttpHeader { - private HashMap mHeader; + private Map mHeader; public HttpHeader() { mHeader = new HashMap<>(); @@ -16,14 +17,14 @@ public HttpHeader() { public void addHeader(String name,String value){ mHeader.put(name,value); } - public void setHeader(LinkedHashMap header){ + public void setHeader(Map header){ this.mHeader = header; } public void removeHeader(String name){ mHeader.remove(name); } - public HashMap getHeaders(){ + public Map getHeaders(){ return mHeader; } public void clear(){ diff --git a/app/src/main/java/com/huxq17/example/http/request/HttpRequest.java b/app/src/main/java/com/huxq17/example/http/request/HttpRequest.java index 539815f..6c6fbd0 100644 --- a/app/src/main/java/com/huxq17/example/http/request/HttpRequest.java +++ b/app/src/main/java/com/huxq17/example/http/request/HttpRequest.java @@ -4,6 +4,7 @@ import java.io.File; import java.util.LinkedHashMap; +import java.util.Map; /** * Created by huxq17 on 2015/11/24. @@ -96,7 +97,7 @@ public Builder synchron() { return this; } - public Builder setHeader(LinkedHashMap header) { + public Builder setHeader(Map header) { this.header.setHeader(header); return this; } @@ -106,7 +107,7 @@ public Builder removeHeader(String name) { return this; } - public Builder setParams(LinkedHashMap params) { + public Builder setParams(Map params) { if (params == null) { throw new RuntimeException("params==null"); } diff --git a/app/src/main/java/com/huxq17/example/http/request/RequestParams.java b/app/src/main/java/com/huxq17/example/http/request/RequestParams.java index 33a18ff..665171e 100644 --- a/app/src/main/java/com/huxq17/example/http/request/RequestParams.java +++ b/app/src/main/java/com/huxq17/example/http/request/RequestParams.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; /** @@ -19,7 +20,7 @@ public class RequestParams { private String charSet = "utf-8"; private String stringParams; - private LinkedHashMap mParams; + private Map mParams; private List mFiles; public RequestParams() { @@ -29,7 +30,7 @@ public RequestParams() { public boolean isEmpty() { return TextUtils.isEmpty(stringParams) && - (mParams == null || mParams != null && mParams.size() == 0) && (mFiles == null || mFiles != null && mFiles.size() == 0); + (mParams == null || mParams.size() == 0) && (mFiles == null || mFiles.size() == 0); } /** @@ -42,7 +43,7 @@ public void addParams(String name, Object params) { mParams.put(name, params); } - public void setParams(LinkedHashMap params) { + public void setParams(Map params) { mParams = params; } @@ -98,7 +99,7 @@ public void clear() { mFiles.clear(); } - public LinkedHashMap getmParams() { + public Map getmParams() { return mParams; } diff --git a/app/src/main/java/com/huxq17/example/http/response/HttpResponse.java b/app/src/main/java/com/huxq17/example/http/response/HttpResponse.java index a36dc0b..222600c 100644 --- a/app/src/main/java/com/huxq17/example/http/response/HttpResponse.java +++ b/app/src/main/java/com/huxq17/example/http/response/HttpResponse.java @@ -3,6 +3,8 @@ import java.io.InputStream; import java.io.Serializable; +import static com.huxq17.example.http.response.ResponseType.*; + /** * Created by huxq17 on 2015/11/28. */ @@ -26,13 +28,10 @@ private void check(ResponseType requstType) { StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append("response type mismatch,you need type is ").append(requstType) .append(" ，but your configuration is ").append(type).append(" ,so you should config responseType like this:"); - switch (requstType) { - case String: - stringBuffer.append(" builder.setResponseType(ResponseType.String);"); - break; - case InputStream: - stringBuffer.append(" builder.setResponseType(ResponseType.InputStream);"); - break; + if (requstType == String) { + stringBuffer.append(" builder.setResponseType(ResponseType.String);"); + } else if (requstType == InputStream) { + stringBuffer.append(" builder.setResponseType(ResponseType.InputStream);"); } throw new RuntimeException(stringBuffer.toString()); }