Adding methods to change baseUrl

There was no way to change the default URL when using a token instead
of the API Key. These methods were added to overcome that.

Author: David Sánchez

src/main/java/com/ubidots/ApiClient.java

@@ -9,9 +9,9 @@
 import com.google.gson.JsonParser;
 
 public class ApiClient {
-	
+
 	private ServerBridge bridge;
-	
+
 	public ApiClient(String apiKey) {
 		bridge = new ServerBridge(apiKey);
 	}
@@ -20,7 +20,7 @@ public ApiClient(String apiKey, String baseUrl) {
 		bridge = new ServerBridge(apiKey, baseUrl);
 	}
 
-    public ApiClient() {}
+	public ApiClient() {}
 
 	ServerBridge getServerBridge() {
 		return bridge;
@@ -31,77 +31,81 @@ public ApiClient fromToken(String token) {
 		return this;
 	}
 
+	public void setBaseUrl(String baseUrl) {
+		bridge.setBaseUrl(baseUrl);
+	}
+
 	public DataSource[] getDataSources() {
 		String json = bridge.get("datasources");
-		
+
 		Gson gson = new Gson();
 		List<Map<String, Object>> rawDataSources = gson.fromJson(json, List.class);
-		
+
 		DataSource[] dataSources = new DataSource[rawDataSources.size()];
-		
+
 		for (int i = 0; i < rawDataSources.size(); i++) {
 			dataSources[i] = new DataSource(rawDataSources.get(i), this);
 		}
 
 		return dataSources;
 	}
-	
+
 	public DataSource getDataSource(String id) {
 		String json = bridge.get("datasources/" + id);
-		
+
 		Gson gson = new Gson();
 		Map<String, Object> rawDataSource = (Map<String, Object>) gson.fromJson(json, Map.class);
-		
+
 		if (rawDataSource.containsKey("detail"))
 			return null;
 		else
 			return new DataSource(rawDataSource, this);
 	}
-	
+
 	public DataSource createDataSource(String name) {
 		return createDataSource(name, null, null);
 	}
-	
+
 	public DataSource createDataSource(String name, Map<String, String> context, List<String> tags) {
 		Map<String, Object> data = new HashMap<String, Object>();
 		data.put("name", name);
-		
-		if (context != null) 
+
+		if (context != null)
 			data.put("context", context);
-		
+
 		if (tags != null)
 			data.put("tags", tags);
-		
+
 		Gson gson = new Gson();
 		String json = bridge.post("datasources/", gson.toJson(data));
 		Map<String, Object> rawDataSource = (Map<String, Object>) gson.fromJson(json, Map.class);
-		
+
 		DataSource ds = new DataSource(rawDataSource, this);
 
 		return ds;
 	}
-	
+
 	public Variable[] getVariables() {
 		String json = bridge.get("variables");
-		
+
 		Gson gson = new Gson();
 		List<Map<String, Object>> rawVariables = gson.fromJson(json, List.class);
-		
+
 		Variable[] variables = new Variable[rawVariables.size()];
-		
+
 		for (int i = 0; i < rawVariables.size(); i++) {
 			variables[i] = new Variable(rawVariables.get(i), this);
 		}
-		
+
 		return variables;
 	}
 
 	public Variable getVariable(String id) {
 		String json = bridge.get("variables/" + id);
-		
+
 		Gson gson = new Gson();
 		Map<String, Object> rawVariable = (Map<String, Object>) gson.fromJson(json, Map.class);
-		
+
 		if (rawVariable.containsKey("detail"))
 			return null;
 		else

src/main/java/com/ubidots/ServerBridge.java

@@ -25,25 +25,25 @@
 
 /**
  * A Bridge between the Server and API objects.
- * 
+ *
  * Responsibilities: Make petitions to the browser with the right headers
  * and arguments.
  * @author Ubidots
  */
 
 public class ServerBridge {
-	
+
 	/* Final static variables */
 	public static final String DEFAULT_BASE_URL = "https://things.ubidots.com/api/v1.6/";
-	
+
 	/* Instance variables */
 	private String baseUrl;
 	private String apiKey;
 	private String token;
 	private Map<String, String> tokenHeader;
 	private Map<String, String> apiKeyHeader;
-	
-	
+
+
 	ServerBridge(String apiKey) {
 		this(apiKey, DEFAULT_BASE_URL);
 	}
@@ -55,7 +55,7 @@ public class ServerBridge {
 
 		apiKeyHeader = new HashMap<>();
 		apiKeyHeader.put("X-UBIDOTS-APIKEY", this.apiKey);
-		
+
 		initialize();
 	}
 
@@ -68,65 +68,78 @@ public class ServerBridge {
 		tokenHeader.put("X-AUTH-TOKEN", token);
 	}
 
+	ServerBridge(String token, boolean isToken, String baseUrl) {
+		this.token = token;
+		this.baseUrl = baseUrl;
+		apiKey = null;
+
+		tokenHeader = new HashMap<>();
+		tokenHeader.put("X-AUTH-TOKEN", token);
+	}
+
 	public void initialize() {
 		recieveToken();
 	}
-	
+
+	public void setBaseUrl(String baseUrl) {
+		this.baseUrl = baseUrl;
+	}
+
 	private void recieveToken() {
 		Gson gson = new Gson();
 		token = (String) gson.fromJson(postWithApiKey("auth/token"), Map.class).get("token");
-	
+
 		tokenHeader = new HashMap<>();
 		tokenHeader.put("X-AUTH-TOKEN", token);
 	}
-	
+
 	private String postWithApiKey(String path) {
 		String response = null; // return variable
-		Map<String, String> headers = prepareHeaders(apiKeyHeader);		
-		
+		Map<String, String> headers = prepareHeaders(apiKeyHeader);
+
 		try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
 			String url = baseUrl + path;
 
 			HttpPost post = new HttpPost(url);
-			
+
 			for (String name : headers.keySet()) {
-				post.setHeader(name, headers.get(name)); 
+				post.setHeader(name, headers.get(name));
 			}
-			
+
 			HttpResponse resp = client.execute(post);
-			
+
 			BufferedReader rd = new BufferedReader(
 				new InputStreamReader(resp.getEntity().getContent()));
 
 			StringBuffer result = new StringBuffer();
 			String line;
-			
+
 			while ((line = rd.readLine()) != null) {
 				result.append(line);
 			}
 
 			response = result.toString();
 		} catch (Exception e) {
 			e.printStackTrace();
-		} 
-		
+		}
+
 		return response;
 	}
-	
+
 	private Map<String, String> getCustomHeaders() {
 		Map<String, String> customHeaders = new HashMap<>();
-		
+
 		customHeaders.put("content-type", "application/json");
-		
+
 		return customHeaders;
 	}
-	
+
 	private Map<String, String> prepareHeaders(Map<String, String> arg) {
 		Map<String, String> headers = new HashMap<>();
-		
+
 		headers.putAll(getCustomHeaders());
 		headers.putAll(arg);
-		
+
 		return headers;
 	}
 
@@ -167,19 +180,19 @@ String get(String path, Map<String, String> customParams) {
 			String url = baseUrl + path;
 
 			HttpGet get = new HttpGet(url);
-			
+
 			for (String name : headers.keySet()) {
-				get.setHeader(name, headers.get(name)); 
+				get.setHeader(name, headers.get(name));
 			}
-			
+
 			HttpResponse resp = client.execute(get);
-			
+
 			BufferedReader rd = new BufferedReader(
 				new InputStreamReader(resp.getEntity().getContent()));
 
 			StringBuffer result = new StringBuffer();
 			String line;
-			
+
 			while ((line = rd.readLine()) != null) {
 				result.append(line);
 			}
@@ -195,7 +208,7 @@ String get(String path, Map<String, String> customParams) {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		
+
 		return response;
 	}
 
@@ -214,32 +227,32 @@ String post(String path, String json) {
 			String url = baseUrl + path;
 
 			HttpPost post = new HttpPost(url);
-			
+
 			for (String name : headers.keySet()) {
-				post.setHeader(name, headers.get(name)); 
+				post.setHeader(name, headers.get(name));
 			}
-			
+
 			post.setEntity(new StringEntity(json));
 			HttpResponse resp = client.execute(post);
-			
+
 			BufferedReader rd = new BufferedReader(
 				new InputStreamReader(resp.getEntity().getContent()));
 
 			StringBuffer result = new StringBuffer();
 			String line;
-			
+
 			while ((line = rd.readLine()) != null) {
 				result.append(line);
 			}
 
 			response = result.toString();
 		} catch (Exception e) {
 			e.printStackTrace();
-		} 
-		
+		}
+
 		return response;
 	}
-	
+
 	/**
 	 * Perform a DELETE request on the API with a given path
 	 * @param path Path to append to the base URL.
@@ -254,32 +267,32 @@ String delete(String path) {
 			String url = baseUrl + path;
 
 			HttpDelete delete = new HttpDelete(url);
-			
+
 			for (String name : headers.keySet()) {
-				delete.setHeader(name, headers.get(name)); 
+				delete.setHeader(name, headers.get(name));
 			}
-			
+
 			HttpResponse resp = client.execute(delete);
-			
+
 			if (resp.getEntity() == null)  {
 				response = "";
 			} else {
 				BufferedReader rd = new BufferedReader(
 					new InputStreamReader(resp.getEntity().getContent()));
-	
+
 				StringBuffer result = new StringBuffer();
 				String line;
-				
+
 				while ((line = rd.readLine()) != null) {
 					result.append(line);
 				}
-	
+
 				response = result.toString();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		} 
-		
+		}
+
 		return response;
 	}
 }