more cleanup - added debugging for testing

synapticloop · Dec 9, 2016 · 1a93d08 · 1a93d08
1 parent 64a4cf3
commit 1a93d08
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 139 deletions.
diff --git a/src/main/java/synapticloop/linode/LinodeApi.java b/src/main/java/synapticloop/linode/LinodeApi.java
@@ -4,8 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;
@@ -20,12 +18,62 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import synapticloop.linode.api.request.AccountRequest;
+import synapticloop.linode.api.request.ApiRequest;
+import synapticloop.linode.api.request.AvailRequest;
+import synapticloop.linode.api.request.DomainRequest;
+import synapticloop.linode.api.request.ImageRequest;
+import synapticloop.linode.api.request.LinodeRequest;
+import synapticloop.linode.api.request.NodebalancerRequest;
+import synapticloop.linode.api.request.StackscriptRequest;
+import synapticloop.linode.api.request.TestRequest;
+import synapticloop.linode.api.request.UserRequest;
+import synapticloop.linode.api.response.AccountEstimateInvoiceResponse;
+import synapticloop.linode.api.response.AccountInfoResponse;
+import synapticloop.linode.api.response.ApiSpecResponse;
+import synapticloop.linode.api.response.AvailDatacentersResponse;
+import synapticloop.linode.api.response.AvailDistributionsResponse;
+import synapticloop.linode.api.response.AvailKernelsResponse;
+import synapticloop.linode.api.response.AvailLinodePlansResponse;
+import synapticloop.linode.api.response.AvailNodeBalancersResponse;
+import synapticloop.linode.api.response.AvailStackscriptsResponse;
+import synapticloop.linode.api.response.DomainListResponse;
+import synapticloop.linode.api.response.DomainResourceListResponse;
+import synapticloop.linode.api.response.DomainResourceResponse;
+import synapticloop.linode.api.response.DomainResponse;
+import synapticloop.linode.api.response.ImageListResponse;
+import synapticloop.linode.api.response.ImageResponse;
+import synapticloop.linode.api.response.LinodeConfigListResponse;
+import synapticloop.linode.api.response.LinodeConfigResponse;
+import synapticloop.linode.api.response.LinodeDiskListResponse;
+import synapticloop.linode.api.response.LinodeDiskResponse;
+import synapticloop.linode.api.response.LinodeImageResponse;
+import synapticloop.linode.api.response.LinodeIpListResponse;
+import synapticloop.linode.api.response.LinodeIpResponse;
+import synapticloop.linode.api.response.LinodeIpSetRdnsResponse;
+import synapticloop.linode.api.response.LinodeIpSwapResponse;
+import synapticloop.linode.api.response.LinodeJobListResponse;
+import synapticloop.linode.api.response.LinodeJobResponse;
+import synapticloop.linode.api.response.LinodeKvmIfyResponse;
+import synapticloop.linode.api.response.LinodeListResponse;
+import synapticloop.linode.api.response.LinodeMutateResponse;
+import synapticloop.linode.api.response.LinodeResizeResponse;
+import synapticloop.linode.api.response.LinodeResponse;
+import synapticloop.linode.api.response.NodebalancerConfigListResponse;
+import synapticloop.linode.api.response.NodebalancerConfigResponse;
+import synapticloop.linode.api.response.NodebalancerListResponse;
+import synapticloop.linode.api.response.NodebalancerNodeListResponse;
+import synapticloop.linode.api.response.NodebalancerNodeResponse;
+import synapticloop.linode.api.response.NodebalancerResponse;
+import synapticloop.linode.api.response.StackscriptListResponse;
+import synapticloop.linode.api.response.StackscriptResponse;
+import synapticloop.linode.api.response.TestEchoResponse;
+import synapticloop.linode.api.response.UserGetApiKeyResponse;
 import synapticloop.linode.exception.ApiException;
 
-import synapticloop.linode.api.request.*;
-import synapticloop.linode.api.response.*;
-
 /**
  * The main class for interacting with the Linode api.
  * 
@@ -92,10 +140,13 @@ public LinodeApiResponse execute(LinodeApiRequest linodeApiRequest) throws ApiEx
 			for (String parameterKey : parameters.keySet()) {
 				postParameters.add(new BasicNameValuePair(parameterKey, parameters.get(parameterKey)));
 			}
-
 
 			String response = callApi(linodeApiRequest.getAction(), httpPost, postParameters);
 
+			if(LOGGER.isDebugEnabled()) {
+				LOGGER.debug(String.format("Action '%s' received JSON response of '%s'", linodeApiRequest.getAction(), response));
+			}
+
 			return(new LinodeApiResponse(new JSONObject(response)));
 		} catch (JSONException ex) {
 			throw new ApiException(ex);
@@ -182,6 +233,7 @@ private String callApi(String action, HttpPost httpPost, ArrayList<NameValuePair
 					LOGGER.debug("Response for end point '{}', with action '{}': {}", API_ENDPOINT, action, response);
 				}
 			}
+
 			return(response);
 
 		} catch (IOException ex) {