ApiConfig now controls GET vs POST.

Builder patter utilized in the model of the other API calls.

POST payload serialized GeolocationApiRequest and passed as string to POST handler

Error mapping moved to ApiException.from()

Closes #27
Closes #26
Closes #24
Closes #18
Closes #6
Closes #28

Author: kwnevarez

src/main/java/com/google/maps/GeoApiContext.java

@@ -141,9 +141,9 @@ <T, R extends ApiResponse<T>> PendingResult<T> get(ApiConfig config, Class<? ext
         config.supportsClientId, query.toString());
   }
 
-  <T, R extends ApiResponse<T>, P> PendingResult<T> post(ApiConfig config,
+  <T, R extends ApiResponse<T>> PendingResult<T> post(ApiConfig config,
       Class<? extends R> clazz,
-      P payload) {
+      Map<String, String> params) {
 
     checkContext(config.supportsClientId);
 
@@ -168,10 +168,7 @@ <T, R extends ApiResponse<T>, P> PendingResult<T> post(ApiConfig config,
       hostName = baseUrlOverride;
     }
 
-    Gson gson = new Gson();
-    String jsonPayload = gson.toJson(payload);
-
-    return requestHandler.handlePost(hostName, url.toString(), jsonPayload, USER_AGENT, clazz, config.fieldNamingPolicy, errorTimeout);
+    return requestHandler.handlePost(hostName, url.toString(), params.get("_payload"), USER_AGENT, clazz, config.fieldNamingPolicy, errorTimeout);
   }
 
   private <T, R extends ApiResponse<T>> PendingResult<T> getWithPath(Class<R> clazz,

src/main/java/com/google/maps/GeolocationApi.java

@@ -39,15 +39,18 @@ public class GeolocationApi {
   private static final Logger LOG = Logger.getLogger(GeolocationApi.class.getName());
 
    static final ApiConfig GEOLOCATION_API_CONFIG = new ApiConfig("/geolocation/v1/geolocate")
-      .hostName(API_BASE_URL)
-      .supportsClientId(false)
-      .fieldNamingPolicy(FieldNamingPolicy.IDENTITY);
+       .hostName(API_BASE_URL)
+       .supportsClientId(false)
+       .fieldNamingPolicy(FieldNamingPolicy.IDENTITY)
+       .requestVerb("POST");
 
   private GeolocationApi () {
   }
 
   public static PendingResult<GeolocationResult> geolocate(GeoApiContext context, GeolocationPayload payload) {
-    return context.post(GEOLOCATION_API_CONFIG, Response.class, payload);
+    return new GeolocationApiRequest(context)
+        .Payload(payload)
+        .CreatePayload();
   }
 
   public static GeolocationApiRequest newRequest(GeoApiContext context) {
@@ -80,23 +83,7 @@ public ApiException getError() {
         return null;
       }
       ApiException e;
-      // try and fit the older error codes into the new style geo api error formats
-      if(reason.equals("keyInvalid")) {
-        e = ApiException.from("ACCESS_NOT_CONFIGURED", reason +" - "+ message);
-      } else if(reason.equals("dailyLimitExceeded")) {
-        e = ApiException.from("RESOURCE_EXHAUSTED", reason +" - "+ message);
-      } else if(reason.equals("userRateLimitExceeded")) {
-        e = ApiException.from("RESOURCE_EXHAUSTED", reason +" - "+ message);
-      } else if(reason.equals("notFound")) {
-        e = ApiException.from("ZERO_RESULTS", reason +" - "+ message);
-      } else if(reason.equals("parseError")) {
-        e = ApiException.from("INVALID_ARGUMENT", reason +" - "+ message);
-      } else if(reason.equals("invalid")) {
-        e = ApiException.from("INVALID_ARGUMENT", reason +" - "+ message);
-      } else {
-        e = ApiException.from("UNKNOWN_ERROR", reason +" - "+ message);
-      }
-      return e;
+      return ApiException.from(reason, message);
     }
   }
 }

src/main/java/com/google/maps/GeolocationApiRequest.java

@@ -15,23 +15,97 @@
 
 package com.google.maps;
 
+import com.google.gson.Gson;
+import com.google.maps.model.CellTower;
 import com.google.maps.model.GeolocationPayload;
+import com.google.maps.model.GeolocationPayload.GeolocationPayloadBuilder;
 import com.google.maps.model.GeolocationResult;
+import com.google.maps.model.WifiAccessPoint;
 
 /**
  * Request for the Geolocation API.
  */
 public class GeolocationApiRequest
     extends PendingResultBase<GeolocationResult, GeolocationApiRequest, GeolocationApi.Response>{
 
-  private GeolocationPayload payload;
+  private GeolocationPayload payload = null;
+  private GeolocationPayloadBuilder builder = null;
+
 
   GeolocationApiRequest(GeoApiContext context) {
     super(context, GeolocationApi.GEOLOCATION_API_CONFIG, GeolocationApi.Response.class);
+    builder = new GeolocationPayload.GeolocationPayloadBuilder();
   }
 
   @Override
   protected void validateRequest() {
-    // TODO: see DirectionsApiRequest for an example on how to validate
+    if(this.payload.considerIp != null
+        && this.payload.considerIp == false
+        && this.payload.wifiAccessPoints != null
+        && this.payload.wifiAccessPoints.length < 2) {
+      throw new IllegalArgumentException("Request must contain two or more 'Wifi Access Points'");
+    }
+  }
+  public GeolocationApiRequest HomeMobileCountryCode(int newHomeMobileCountryCode)
+  {
+    this.builder.HomeMobileCountryCode(newHomeMobileCountryCode);
+    return this;
+  }
+  public GeolocationApiRequest HomeMobileNetworkCode(int newHomeMobileNetworkCode)
+  {
+    this.builder.HomeMobileNetworkCode(newHomeMobileNetworkCode);
+    return this;
+  }
+  public GeolocationApiRequest RadioType(String newRadioType)
+  {
+    this.builder.RadioType(newRadioType);
+    return this;
+  }
+  public GeolocationApiRequest Carrier(String newCarrier)
+  {
+    this.builder.Carrier(newCarrier);
+    return this;
+  }
+  public GeolocationApiRequest ConsiderIp(boolean newConsiderIp)
+  {
+    this.builder.ConsiderIp(newConsiderIp);
+    return this;
+  }
+  public GeolocationApiRequest CellTowers(CellTower[] newCellTowers)
+  {
+    this.builder.CellTowers(newCellTowers);
+    return this;
+  }
+  public GeolocationApiRequest AddCellTower(CellTower newCellTower)
+  {
+    this.builder.AddCellTower(newCellTower);
+    return this;
+  }
+  public GeolocationApiRequest WifiAccessPoints(WifiAccessPoint[] newWifiAccessPoints)
+  {
+    this.builder.WifiAccessPoints(newWifiAccessPoints);
+    return this;
+  }
+  public GeolocationApiRequest AddWifiAccessPoint(WifiAccessPoint newWifiAccessPoint)
+  {
+    this.builder.AddWifiAccessPoint(newWifiAccessPoint);
+    return this;
+  }
+  public GeolocationApiRequest Payload(GeolocationPayload payload)
+  {
+    this.payload = payload;
+    return this;
+  }
+  public GeolocationApiRequest CreatePayload()
+  {
+    if(this.payload == null) {
+      // if the payload has not been set, create it
+      this.payload = this.builder.createGeolocationPayload();
+    } else {
+      // use the payload that has been explicitly set by the Payload method above
+    }
+    Gson gson = new Gson();
+    String jsonPayload = gson.toJson(this.payload);
+    return param("_payload", jsonPayload);
   }
 }

src/main/java/com/google/maps/OkHttpRequestHandler.java

@@ -68,10 +68,6 @@ public <T, R extends ApiResponse<T>> PendingResult<T> handlePost(String hostName
         .header("User-Agent", userAgent)
         .url(hostName + url).build();
 
-    // TODO: remove these logs
-    LOG.log(Level.INFO, "Request: {0}", hostName + url);
-    LOG.log(Level.INFO, "Request Body: {0}", payload);
-
     return new OkHttpPendingResult<T, R>(req, client, clazz, fieldNamingPolicy, errorTimeout);
   }
   @Override

src/main/java/com/google/maps/PendingResultBase.java

@@ -75,7 +75,11 @@ private PendingResult<T> makeRequest() {
           "'await', 'awaitIgnoreError' or 'setCallback' was already called.");
     }
     validateRequest();
-    delegate = context.get(config, responseClass, params);
+    if(config.requestVerb == "GET") {
+      delegate = context.get(config, responseClass, params);
+    } else if (config.requestVerb == "POST") {
+      delegate = context.post(config, responseClass, params);
+    }
     return delegate;
   }
 

src/main/java/com/google/maps/errors/ApiException.java

@@ -65,6 +65,21 @@ public static ApiException from(String status, String errorMessage) {
       return new RequestDeniedException(errorMessage);
     }
 
+    // Geolocation Errors
+    if("keyInvalid".equals(status)) {
+      return new AccessNotConfiguredException(errorMessage);
+    } else if("dailyLimitExceeded".equals(status)) {
+      return new OverDailyLimitException(errorMessage);
+    } else if("userRateLimitExceeded".equals(status)) {
+      return new OverQueryLimitException(errorMessage);
+    } else if("notFound".equals(status)) {
+      return new NotFoundException(errorMessage);
+    } else if("parseError".equals(status)) {
+      return new InvalidRequestException(errorMessage);
+    } else if("invalid".equals(status)) {
+      return new InvalidRequestException(errorMessage);
+    }
+
     // We've hit an unknown error. This is not a state we should hit,
     // but we don't want to crash a user's application if we introduce a new error.
     return new UnknownErrorException("An unexpected error occurred. "

src/main/java/com/google/maps/internal/ApiConfig.java

@@ -25,6 +25,7 @@ public class ApiConfig {
   public FieldNamingPolicy fieldNamingPolicy = FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES;
   public String hostName = "https://maps.googleapis.com";
   public boolean supportsClientId = true;
+  public String requestVerb = "GET";
 
   public ApiConfig(String path) {
     this.path = path;
@@ -44,4 +45,9 @@ public ApiConfig supportsClientId(boolean supportsClientId) {
     this.supportsClientId = supportsClientId;
     return this;
   }
+
+  public ApiConfig requestVerb(String requestVerb) {
+    this.requestVerb = requestVerb;
+    return this;
+  }
 }

src/main/java/com/google/maps/internal/GeolocationResponseAdapter.java

@@ -6,10 +6,7 @@
 import com.google.gson.stream.JsonWriter;
 import com.google.maps.GeolocationApi;
 
-import sun.rmi.runtime.Log;
-
 import java.io.IOException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 

src/main/java/com/google/maps/internal/OkHttpPendingResult.java

@@ -216,10 +216,6 @@ private T parseResponse(OkHttpPendingResult<T, R> request, Response response) th
     R resp;
     String contentType = response.header("Content-Type");
 
-    // TODO: remove these logs
-    LOG.log(Level.INFO, "Response: {0}", response);
-    LOG.log(Level.INFO, "Response Body: {0}", new String(bytes, "utf8"));
-
     // Places Photo API special case
     if (contentType != null &&
         contentType.startsWith("image") &&
@@ -257,8 +253,6 @@ private T parseResponse(OkHttpPendingResult<T, R> request, Response response) th
     try {
       resp = gson.fromJson(new String(bytes, "utf8"), responseClass);
     } catch (JsonSyntaxException e) {
-      // TODO: remove these logs
-      LOG.log(Level.INFO, "JsonSyntaxException: {0}", e);
       // Check HTTP status for a more suitable exception
       if (!response.isSuccessful()) {
         // Some of the APIs return 200 even when the API request fails, as long as the transport