Merge pull request #202 from North-Two-Five/fix/url-malformed

cant put dots in Retrofits service path

Author: pooyaj

analytics-core/src/main/java/com/segment/analytics/http/SegmentService.java

@@ -7,6 +7,6 @@
 
 /** REST interface for the Segment API. */
 public interface SegmentService {
-  @POST("")
+  @POST(".")
   Call<UploadResponse> upload(@Body Batch batch);
 }

analytics/src/main/java/com/segment/analytics/Analytics.java

@@ -124,7 +124,8 @@ private Message buildMessage(MessageBuilder builder) {
 
   /** Fluent API for creating {@link Analytics} instances. */
   public static class Builder {
-    private static final HttpUrl DEFAULT_ENDPOINT = HttpUrl.parse("https://api.segment.io");
+    private static final String DEFAULT_ENDPOINT = "https://api.segment.io";
+    private static final String DEFAULT_PATH = "/v1/import/";
     private static final String DEFAULT_USER_AGENT = "analytics-java/" + AnalyticsVersion.get();
 
     private final String writeKey;
@@ -176,7 +177,7 @@ public Builder endpoint(String endpoint) {
       if (endpoint == null || endpoint.trim().length() == 0) {
         throw new NullPointerException("endpoint cannot be null or empty.");
       }
-      this.endpoint = HttpUrl.parse(endpoint + "/v1/import/");
+      this.endpoint = HttpUrl.parse(endpoint + DEFAULT_PATH);
       return this;
     }
 
@@ -324,16 +325,17 @@ public Analytics build() {
               .create();
 
       if (endpoint == null) {
-        endpoint = DEFAULT_ENDPOINT;
+        endpoint = HttpUrl.parse(DEFAULT_ENDPOINT + DEFAULT_PATH);
+      }
 
-        if (uploadURL != null) {
-          endpoint = uploadURL;
-        }
+      if (endpoint == null && uploadURL != null) {
+        endpoint = uploadURL;
       }
 
       if (client == null) {
         client = Platform.get().defaultClient();
       }
+
       if (log == null) {
         log = Log.NONE;
       }