Reformat the static imports correctly

googlemaps · Jul 19, 2017 · 94d8c8b · 94d8c8b
1 parent 5b7d373
commit 94d8c8b
Show file tree

Hide file tree

Showing 55 changed files with 130 additions and 174 deletions.
diff --git a/src/main/java/com/google/maps/DirectionsApiRequest.java b/src/main/java/com/google/maps/DirectionsApiRequest.java
@@ -15,6 +15,8 @@
 
 package com.google.maps;
 
+import static com.google.maps.internal.StringJoin.join;
+
 import com.google.maps.model.DirectionsResult;
 import com.google.maps.model.LatLng;
 import com.google.maps.model.TrafficModel;
@@ -24,8 +26,6 @@
 import com.google.maps.model.Unit;
 import org.joda.time.ReadableInstant;
 
-import static com.google.maps.internal.StringJoin.join;
-
 /** Request for the Directions API. */
 public class DirectionsApiRequest
     extends PendingResultBase<DirectionsResult, DirectionsApiRequest, DirectionsApi.Response> {

diff --git a/src/main/java/com/google/maps/DistanceMatrixApiRequest.java b/src/main/java/com/google/maps/DistanceMatrixApiRequest.java
@@ -15,6 +15,8 @@
 
 package com.google.maps;
 
+import static com.google.maps.internal.StringJoin.join;
+
 import com.google.maps.DirectionsApi.RouteRestriction;
 import com.google.maps.DistanceMatrixApi.Response;
 import com.google.maps.model.DistanceMatrix;
@@ -26,8 +28,6 @@
 import com.google.maps.model.Unit;
 import org.joda.time.ReadableInstant;
 
-import static com.google.maps.internal.StringJoin.join;
-
 /** A request to the Distance Matrix API. */
 public class DistanceMatrixApiRequest
     extends PendingResultBase<DistanceMatrix, DistanceMatrixApiRequest, Response> {

diff --git a/src/main/java/com/google/maps/ElevationApi.java b/src/main/java/com/google/maps/ElevationApi.java
@@ -15,6 +15,8 @@
 
 package com.google.maps;
 
+import static com.google.maps.internal.StringJoin.join;
+
 import com.google.maps.errors.ApiException;
 import com.google.maps.internal.ApiConfig;
 import com.google.maps.internal.ApiResponse;
@@ -23,8 +25,6 @@
 import com.google.maps.model.EncodedPolyline;
 import com.google.maps.model.LatLng;
 
-import static com.google.maps.internal.StringJoin.join;
-
 /**
  * The Google Elevation API provides you a simple interface to query locations on the earth for
  * elevation data. Additionally, you may request sampled elevation data along paths, allowing you to

diff --git a/src/main/java/com/google/maps/GaeRequestHandler.java b/src/main/java/com/google/maps/GaeRequestHandler.java
@@ -25,13 +25,12 @@
 import com.google.maps.internal.ApiResponse;
 import com.google.maps.internal.ExceptionsAllowedToRetry;
 import com.google.maps.internal.GaePendingResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.net.MalformedURLException;
 import java.net.Proxy;
 import java.net.URL;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A strategy for handling URL requests using Google App Engine's URL Fetch API.

diff --git a/src/main/java/com/google/maps/GeoApiContext.java b/src/main/java/com/google/maps/GeoApiContext.java
@@ -22,16 +22,15 @@
 import com.google.maps.internal.ApiResponse;
 import com.google.maps.internal.ExceptionsAllowedToRetry;
 import com.google.maps.internal.UrlSigner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.UnsupportedEncodingException;
 import java.net.Proxy;
 import java.net.URLEncoder;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** The entry point for making requests against the Google Geo APIs. */
 public class GeoApiContext {

diff --git a/src/main/java/com/google/maps/GeocodingApiRequest.java b/src/main/java/com/google/maps/GeocodingApiRequest.java
@@ -15,15 +15,15 @@
 
 package com.google.maps;
 
+import static com.google.maps.internal.StringJoin.join;
+
 import com.google.maps.internal.ApiConfig;
 import com.google.maps.model.AddressType;
 import com.google.maps.model.ComponentFilter;
 import com.google.maps.model.GeocodingResult;
 import com.google.maps.model.LatLng;
 import com.google.maps.model.LocationType;
 
-import static com.google.maps.internal.StringJoin.join;
-
 /** Request for the Geocoding API. */
 public class GeocodingApiRequest
     extends PendingResultBase<GeocodingResult[], GeocodingApiRequest, GeocodingApi.Response> {

diff --git a/src/main/java/com/google/maps/GeolocationApi.java b/src/main/java/com/google/maps/GeolocationApi.java
@@ -22,7 +22,6 @@
 import com.google.maps.model.GeolocationPayload;
 import com.google.maps.model.GeolocationResult;
 import com.google.maps.model.LatLng;
-
 import java.util.logging.Logger;
 
 /*

diff --git a/src/main/java/com/google/maps/NearbySearchRequest.java b/src/main/java/com/google/maps/NearbySearchRequest.java
@@ -15,6 +15,8 @@
 
 package com.google.maps;
 
+import static com.google.maps.internal.StringJoin.join;
+
 import com.google.gson.FieldNamingPolicy;
 import com.google.maps.errors.ApiException;
 import com.google.maps.internal.ApiConfig;
@@ -26,8 +28,6 @@
 import com.google.maps.model.PriceLevel;
 import com.google.maps.model.RankBy;
 
-import static com.google.maps.internal.StringJoin.join;
-
 /**
  * A <a href="https://developers.google.com/places/web-service/search#PlaceSearchRequests">Nearby
  * Search</a> request.

diff --git a/src/main/java/com/google/maps/OkHttpRequestHandler.java b/src/main/java/com/google/maps/OkHttpRequestHandler.java
@@ -25,11 +25,10 @@
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.RequestBody;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.net.Proxy;
 import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A strategy for handling URL requests using OkHttp.

diff --git a/src/main/java/com/google/maps/PendingResult.java b/src/main/java/com/google/maps/PendingResult.java
@@ -16,7 +16,6 @@
 package com.google.maps;
 
 import com.google.maps.errors.ApiException;
-
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/com/google/maps/PendingResultBase.java b/src/main/java/com/google/maps/PendingResultBase.java
@@ -19,7 +19,6 @@
 import com.google.maps.internal.ApiConfig;
 import com.google.maps.internal.ApiResponse;
 import com.google.maps.internal.StringJoin.UrlValue;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/src/main/java/com/google/maps/PlaceAutocompleteRequest.java b/src/main/java/com/google/maps/PlaceAutocompleteRequest.java
@@ -15,6 +15,8 @@
 
 package com.google.maps;
 
+import static com.google.maps.internal.StringJoin.join;
+
 import com.google.gson.FieldNamingPolicy;
 import com.google.maps.errors.ApiException;
 import com.google.maps.internal.ApiConfig;
@@ -24,8 +26,6 @@
 import com.google.maps.model.LatLng;
 import com.google.maps.model.PlaceAutocompleteType;
 
-import static com.google.maps.internal.StringJoin.join;
-
 /**
  * A <a
  * href="https://developers.google.com/places/web-service/autocomplete#place_autocomplete_requests">Place

diff --git a/src/main/java/com/google/maps/RoadsApi.java b/src/main/java/com/google/maps/RoadsApi.java
@@ -15,6 +15,8 @@
 
 package com.google.maps;
 
+import static com.google.maps.internal.StringJoin.join;
+
 import com.google.gson.FieldNamingPolicy;
 import com.google.maps.errors.ApiError;
 import com.google.maps.errors.ApiException;
@@ -25,8 +27,6 @@
 import com.google.maps.model.SnappedSpeedLimitResponse;
 import com.google.maps.model.SpeedLimit;
 
-import static com.google.maps.internal.StringJoin.join;
-
 /**
  * The Google Maps Roads API identifies the roads a vehicle was traveling along and provides
  * additional metadata about those roads, such as speed limits.

diff --git a/src/main/java/com/google/maps/TimeZoneApi.java b/src/main/java/com/google/maps/TimeZoneApi.java
@@ -20,7 +20,6 @@
 import com.google.maps.internal.ApiConfig;
 import com.google.maps.internal.ApiResponse;
 import com.google.maps.model.LatLng;
-
 import java.util.TimeZone;
 
 /**

diff --git a/src/main/java/com/google/maps/internal/DateTimeAdapter.java b/src/main/java/com/google/maps/internal/DateTimeAdapter.java
@@ -19,11 +19,10 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 
-import java.io.IOException;
-
 /**
  * This class handles conversion from JSON to {@link DateTime}s.
  *

diff --git a/src/main/java/com/google/maps/internal/DayOfWeekAdaptor.java b/src/main/java/com/google/maps/internal/DayOfWeekAdaptor.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.google.maps.model.OpeningHours.Period.OpenClose.DayOfWeek;
-
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/com/google/maps/internal/DistanceAdapter.java b/src/main/java/com/google/maps/internal/DistanceAdapter.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.google.maps.model.Distance;
-
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/com/google/maps/internal/DurationAdapter.java b/src/main/java/com/google/maps/internal/DurationAdapter.java
@@ -21,7 +21,6 @@
 import com.google.gson.stream.JsonWriter;
 import com.google.maps.model.Distance;
 import com.google.maps.model.Duration;
-
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/com/google/maps/internal/EncodedPolylineInstanceCreator.java b/src/main/java/com/google/maps/internal/EncodedPolylineInstanceCreator.java
@@ -17,7 +17,6 @@
 
 import com.google.gson.InstanceCreator;
 import com.google.maps.model.EncodedPolyline;
-
 import java.lang.reflect.Type;
 
 public class EncodedPolylineInstanceCreator implements InstanceCreator<EncodedPolyline> {

diff --git a/src/main/java/com/google/maps/internal/ExceptionsAllowedToRetry.java b/src/main/java/com/google/maps/internal/ExceptionsAllowedToRetry.java
@@ -16,7 +16,6 @@
 package com.google.maps.internal;
 
 import com.google.maps.errors.ApiException;
-
 import java.util.HashSet;
 
 public final class ExceptionsAllowedToRetry extends HashSet<Class<? extends ApiException>> {

diff --git a/src/main/java/com/google/maps/internal/FareAdapter.java b/src/main/java/com/google/maps/internal/FareAdapter.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.google.maps.model.Fare;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Currency;

diff --git a/src/main/java/com/google/maps/internal/GaePendingResult.java b/src/main/java/com/google/maps/internal/GaePendingResult.java
@@ -41,18 +41,17 @@
 import com.google.maps.model.PlaceDetails.Review.AspectRating.RatingType;
 import com.google.maps.model.PriceLevel;
 import com.google.maps.model.TravelMode;
-import org.joda.time.DateTime;
-import org.joda.time.Instant;
-import org.joda.time.LocalTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import org.joda.time.DateTime;
+import org.joda.time.Instant;
+import org.joda.time.LocalTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A PendingResult backed by a HTTP call executed by Google App Engine URL Fetch capability, a

diff --git a/src/main/java/com/google/maps/internal/GeolocationResponseAdapter.java b/src/main/java/com/google/maps/internal/GeolocationResponseAdapter.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.google.maps.GeolocationApi;
-
 import java.io.IOException;
 import java.util.logging.Logger;
 

diff --git a/src/main/java/com/google/maps/internal/InstantAdapter.java b/src/main/java/com/google/maps/internal/InstantAdapter.java
@@ -19,9 +19,8 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import org.joda.time.Instant;
-
 import java.io.IOException;
+import org.joda.time.Instant;
 
 /** This class handles conversion from JSON to {@link Instant}. */
 public class InstantAdapter extends TypeAdapter<Instant> {

diff --git a/src/main/java/com/google/maps/internal/LatLngAdapter.java b/src/main/java/com/google/maps/internal/LatLngAdapter.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.google.maps.model.LatLng;
-
 import java.io.IOException;
 
 /** Handle conversion from varying types of latitude and longitude representations. */

diff --git a/src/main/java/com/google/maps/internal/LocalTimeAdapter.java b/src/main/java/com/google/maps/internal/LocalTimeAdapter.java
@@ -19,12 +19,11 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 import org.joda.time.LocalTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-import java.io.IOException;
-
 /** This class handles conversion from JSON to {@link LocalTime}. */
 public class LocalTimeAdapter extends TypeAdapter<LocalTime> {
   /** Read a time from the Places API and convert to a {@link LocalTime} */

diff --git a/src/main/java/com/google/maps/internal/OkHttpPendingResult.java b/src/main/java/com/google/maps/internal/OkHttpPendingResult.java
@@ -40,17 +40,16 @@
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
-import org.joda.time.DateTime;
-import org.joda.time.Instant;
-import org.joda.time.LocalTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+import org.joda.time.DateTime;
+import org.joda.time.Instant;
+import org.joda.time.LocalTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A PendingResult backed by a HTTP call executed by OkHttp, a deserialization step using Gson, rate

diff --git a/src/main/java/com/google/maps/internal/PolylineEncoding.java b/src/main/java/com/google/maps/internal/PolylineEncoding.java
@@ -16,7 +16,6 @@
 package com.google.maps.internal;
 
 import com.google.maps.model.LatLng;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

diff --git a/src/main/java/com/google/maps/internal/PriceLevelAdaptor.java b/src/main/java/com/google/maps/internal/PriceLevelAdaptor.java
@@ -20,7 +20,6 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.google.maps.model.PriceLevel;
-
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/com/google/maps/internal/RateLimitExecutorService.java b/src/main/java/com/google/maps/internal/RateLimitExecutorService.java
@@ -16,9 +16,6 @@
 package com.google.maps.internal;
 
 import com.google.common.util.concurrent.RateLimiter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
@@ -32,6 +29,8 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Rate Limit Policy for Google Maps Web Services APIs. */
 public class RateLimitExecutorService implements ExecutorService, Runnable {