Language level compatibility

Author: smarek

library/src/main/java/com/loopj/android/http/AsyncHttpClient.java

@@ -211,8 +211,8 @@ public AsyncHttpClient(SchemeRegistry schemeRegistry) {
         ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager(httpParams, schemeRegistry);
 
         threadPool = Executors.newCachedThreadPool();
-        requestMap = new WeakHashMap<Context, List<RequestHandle>>();
-        clientHeaderMap = new HashMap<String, String>();
+        requestMap = new WeakHashMap<>();
+        clientHeaderMap = new HashMap<>();
 
         httpContext = new SyncBasicHttpContext(new BasicHttpContext());
         httpClient = new DefaultHttpClient(cm, httpParams);
@@ -930,7 +930,7 @@ protected RequestHandle sendRequest(DefaultHttpClient client, HttpContext httpCo
             // Add request to request map
             List<RequestHandle> requestList = requestMap.get(context);
             if (requestList == null) {
-                requestList = new LinkedList<RequestHandle>();
+                requestList = new LinkedList<>();
                 requestMap.put(context, requestList);
             }
 

library/src/main/java/com/loopj/android/http/JsonStreamerEntity.java

@@ -73,11 +73,11 @@ class JsonStreamerEntity implements HttpEntity {
 
     // K/V objects to be uploaded.
     private final Map<String, Object> kvParams =
-        new HashMap<String, Object>();
+        new HashMap<>();
 
     // Streams and their associated meta-data to be uploaded.
     private final Map<String, RequestParams.StreamWrapper> streamParams =
-        new HashMap<String, RequestParams.StreamWrapper>();
+        new HashMap<>();
 
     // Whether to use gzip compression while uploading
     private final Header contentEncoding;

library/src/main/java/com/loopj/android/http/PersistentCookieStore.java

@@ -59,7 +59,7 @@ public class PersistentCookieStore implements CookieStore {
      */
     public PersistentCookieStore(Context context) {
         cookiePrefs = context.getSharedPreferences(COOKIE_PREFS, 0);
-        cookies = new ConcurrentHashMap<String, Cookie>();
+        cookies = new ConcurrentHashMap<>();
 
         // Load any previously stored cookies into the store
         String storedCookieNames = cookiePrefs.getString(COOKIE_NAME_STORE, null);
@@ -143,7 +143,7 @@ public boolean clearExpired(Date date) {
 
     @Override
     public List<Cookie> getCookies() {
-        return new ArrayList<Cookie>(cookies.values());
+        return new ArrayList<>(cookies.values());
     }
 
     /**

library/src/main/java/com/loopj/android/http/RequestHandle.java

@@ -9,7 +9,7 @@ public class RequestHandle {
     private final WeakReference<AsyncHttpRequest> request;
 
     public RequestHandle(AsyncHttpRequest request) {
-        this.request = new WeakReference<AsyncHttpRequest>(request);
+        this.request = new WeakReference<>(request);
     }
 
     /**

library/src/main/java/com/loopj/android/http/RequestParams.java

@@ -93,10 +93,10 @@ public class RequestParams {
     protected final static String LOG_TAG = "RequestParams";
     protected boolean isRepeatable;
     protected boolean useJsonStreamer;
-    protected ConcurrentHashMap<String, String> urlParams = new ConcurrentHashMap<String, String>();
-    protected ConcurrentHashMap<String, StreamWrapper> streamParams = new ConcurrentHashMap<String, StreamWrapper>();
-    protected ConcurrentHashMap<String, FileWrapper> fileParams = new ConcurrentHashMap<String, FileWrapper>();
-    protected ConcurrentHashMap<String, Object> urlParamsWithObjects = new ConcurrentHashMap<String, Object>();
+    protected ConcurrentHashMap<String, String> urlParams = new ConcurrentHashMap<>();
+    protected ConcurrentHashMap<String, StreamWrapper> streamParams = new ConcurrentHashMap<>();
+    protected ConcurrentHashMap<String, FileWrapper> fileParams = new ConcurrentHashMap<>();
+    protected ConcurrentHashMap<String, Object> urlParamsWithObjects = new ConcurrentHashMap<>();
     protected String contentEncoding = HTTP.UTF_8;
 
     /**
@@ -458,7 +458,7 @@ private HttpEntity createMultipartEntity(ResponseHandlerInterface progressHandle
     }
 
     protected List<BasicNameValuePair> getParamsList() {
-        List<BasicNameValuePair> lparams = new LinkedList<BasicNameValuePair>();
+        List<BasicNameValuePair> lparams = new LinkedList<>();
 
         for (ConcurrentHashMap.Entry<String, String> entry : urlParams.entrySet()) {
             lparams.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
@@ -470,7 +470,7 @@ protected List<BasicNameValuePair> getParamsList() {
     }
 
     private List<BasicNameValuePair> getParamsList(String key, Object value) {
-        List<BasicNameValuePair> params = new LinkedList<BasicNameValuePair>();
+        List<BasicNameValuePair> params = new LinkedList<>();
         if (value instanceof Map) {
             Map map = (Map) value;
             List list = new ArrayList<Object>(map.keySet());

library/src/main/java/com/loopj/android/http/RetryHandler.java

@@ -40,8 +40,8 @@
 import javax.net.ssl.SSLException;
 
 class RetryHandler implements HttpRequestRetryHandler {
-    private final static HashSet<Class<?>> exceptionWhitelist = new HashSet<Class<?>>();
-    private final static HashSet<Class<?>> exceptionBlacklist = new HashSet<Class<?>>();
+    private final static HashSet<Class<?>> exceptionWhitelist = new HashSet<>();
+    private final static HashSet<Class<?>> exceptionBlacklist = new HashSet<>();
 
     static {
         // Retry if the server dropped connection on us

library/src/main/java/com/loopj/android/http/SimpleMultipartEntity.java

@@ -61,7 +61,7 @@ class SimpleMultipartEntity implements HttpEntity {
     private final byte[] boundaryEnd;
     private boolean isRepeatable;
 
-    private final List<FilePart> fileParts = new ArrayList<FilePart>();
+    private final List<FilePart> fileParts = new ArrayList<>();
 
     // The buffer we use for building the message excluding files and the last
     // boundary

sample/src/main/java/com/loopj/android/http/sample/SampleParentActivity.java

@@ -83,7 +83,7 @@ public void onClick(View v) {
     };
 
     protected Header[] getRequestHeaders() {
-        List<Header> headers = new ArrayList<Header>();
+        List<Header> headers = new ArrayList<>();
         String headersRaw = headersEditText.getText() == null ? null : headersEditText.getText().toString();
 
         if (headersRaw != null && headersRaw.length() > 3) {

sample/src/main/java/com/loopj/android/http/sample/WaypointsActivity.java

@@ -14,7 +14,7 @@ public class WaypointsActivity extends ListActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, samples));
+        setListAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, samples));
     }
 
     @Override