Skip to content

Commit

Permalink
Rename RestAdapter.HttpClient to prevent confusion
Browse files Browse the repository at this point in the history
The class name HttpClient suggests that we are using the sync variant,
while in reality we are using AsyncHttpClient under the hood.

See android-async-http/android-async-http#751
  • Loading branch information
Miroslav Bajtoš committed Apr 1, 2015
1 parent 2eef19a commit f4bf3ab
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ android {
dependencies {
compile 'org.atteo:evo-inflector:1.2'
compile 'com.google.guava:guava:18.0'
compile 'com.loopj.android:android-async-http:1.4.5'
compile 'com.loopj.android:android-async-http:1.4.6'
}

task unpackJavadocIncludes(type: Sync) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@

package com.strongloop.android.remoting.adapters;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Scanner;

import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.entity.StringEntity;
import org.apache.http.message.BasicHeader;
import org.apache.http.message.BasicNameValuePair;
import org.json.JSONException;

import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException;
Expand All @@ -32,6 +14,24 @@
import com.loopj.android.http.RequestParams;
import com.strongloop.android.remoting.JsonUtil;

import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.entity.StringEntity;
import org.apache.http.message.BasicHeader;
import org.apache.http.message.BasicNameValuePair;
import org.json.JSONException;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Scanner;

/**
* A specific {@link Adapter} implementation for RESTful servers.
*
Expand All @@ -45,7 +45,7 @@
public class RestAdapter extends Adapter {
private static final String TAG = "remoting.RestAdapter";

private HttpClient client;
private RestHttpClient client;
private RestContract contract;

public RestAdapter(Context context, String url) {
Expand Down Expand Up @@ -84,7 +84,7 @@ public void connect(Context context, String url) {
client = null;
}
else {
client = new HttpClient(context, url);
client = new RestHttpClient(context, url);
client.addHeader("Accept", "application/json");
}
}
Expand Down Expand Up @@ -309,7 +309,7 @@ enum ParameterEncoding {
FORM_MULTIPART
}

private static class HttpClient extends AsyncHttpClient {
private static class RestHttpClient extends AsyncHttpClient {

private static String getVersionName(Context context) {
String appVersion = null;
Expand Down Expand Up @@ -338,7 +338,7 @@ private static String getDeviceName() {
private Context context;
private String baseUrl;

public HttpClient(Context context, String baseUrl) {
public RestHttpClient(Context context, String baseUrl) {
if (baseUrl == null) {
throw new IllegalArgumentException(
"The baseUrl cannot be null");
Expand Down

0 comments on commit f4bf3ab

Please sign in to comment.