merge master

Author: pjagielski

.gitignore

@@ -2,6 +2,7 @@
 .project
 .settings
 eclipsebin
+.gradletasknamecache
 
 bin
 gen

CHANGELOG.md

@@ -1,6 +1,22 @@
-v0.5.3 - TBD
+v0.6.1 - TBD
 ------------
 
+v0.6.0 - 11/11/2016
+------------
+This release moves all our endpoints to the new 1.2 version! This update brings support to upfront pricing and fares, which is now reflected in RideEstimate and usable in RideRequestParameters.
+
+### Added
+- Fare to RideEstimate, this will be returned in the case of a product that supports upfront pricing.
+
+- [Pull #24](https://github.com/uber/rides-java-sdk/pull/24) Add Ride.Status
+- [Pull #24](https://github.com/uber/rides-java-sdk/pull/24) Add SMS number field to Driver
+
+### Breaking
+ - Price in RideEstimate is now Estimate and will be null for products that support upfront pricing.
+ - PriceEstimate uses BigDecimal in place of Integer for our low and high estimates.
+ - RideRequestButton now requires both a pickup and a dropoff for estimating.
+ - Removed all China endpoint support.
+
 v0.5.2 - 7/11/2016
 ------------
 ### Added

README.md

@@ -8,13 +8,13 @@ This SDK helps your Java App make HTTP requests to the Uber Rides API.
 #### Before you begin
 Register your app in the [Uber developer dashboard](https://developer.uber.com/dashboard). Notice that the app gets a client ID, secret, and server token required for authenticating with the API. 
 
-Note: Using Android? Be sure to checkout the [Uber Android SDK](https://github.com/uber/rides-android-sdk) in addition, which has native authentication mechanisms.
+Note: Using Android? Be sure to checkout the [Uber Android SDK](github.com/uber/rides-android-sdk) in addition, which has native authentication mechanisms.
 
 #### Gradle
 If using Gradle, add this to your project’s `build.gradle` file:
 ```gradle
 dependencies {
-    compile 'com.uber.sdk:rides:0.5.2'
+    compile 'com.uber.sdk:rides:0.6.0'
 }
 ```
 
@@ -24,7 +24,7 @@ If using Maven, add this to your project's `pom.xml` file:
 <dependency>
   <groupId>com.uber.sdk</groupId>
   <artifactId>rides</artifactId>
-  <version>0.5.2</version>
+  <version>0.6.0</version>
 </dependency>
 ```
 

gradle.properties

@@ -24,4 +24,4 @@ group=com.uber.sdk
 groupId=com.uber.sdk
 artifactId=rides
 githubDownloadPrefix=https://github.com/uber/rides-java-sdk/releases/download/
-version=0.5.3-SNAPSHOT
+version=0.6.1-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -25,4 +25,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

sdk/build.gradle

@@ -111,6 +111,12 @@ uploadArchives {
                         name 'Alex Texter'
                         email '[email protected]'
                     }
+
+                    developer {
+                        id 'tyvsmith'
+                        name 'Ty Smith'
+                        email '[email protected]'
+                    }
                 }
             }
         }
@@ -123,6 +129,7 @@ dependencies {
 
     compile 'com.squareup.retrofit2:retrofit:2.0.2'
     compile 'com.squareup.retrofit2:converter-moshi:2.0.2'
+    compile 'com.squareup.moshi:moshi:1.2.0'
     compile 'com.squareup.okhttp3:okhttp:3.2.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
 

sdk/src/main/java/com/uber/sdk/core/auth/AccessTokenAuthenticator.java

@@ -38,7 +38,7 @@
 public class AccessTokenAuthenticator implements Authenticator {
 
     private static final String HEADER_BEARER_ACCESS_VALUE = "Bearer %s";
-    private static final String TOKEN_URL = "https://login.%s/oauth/v2/mobile/";
+    private static final String TOKEN_URL = "%s/oauth/v2/mobile/";
 
     private final SessionConfiguration sessionConfiguration;
     private final AccessTokenStorage tokenStorage;
@@ -48,8 +48,7 @@ public AccessTokenAuthenticator(SessionConfiguration sessionConfiguration,
                                     AccessTokenStorage tokenStorage) {
         this(sessionConfiguration,
                 tokenStorage,
-                createOAuthService(String.format(TOKEN_URL,
-                        sessionConfiguration.getEndpointRegion().domain)));
+                createOAuthService(String.format(TOKEN_URL, sessionConfiguration.getLoginHost())));
     }
 
     AccessTokenAuthenticator(SessionConfiguration sessionConfiguration,

sdk/src/main/java/com/uber/sdk/rides/auth/OAuth2Credentials.java

@@ -22,12 +22,7 @@
 
 package com.uber.sdk.rides.auth;
 
-import com.google.api.client.auth.oauth2.AuthorizationCodeFlow;
-import com.google.api.client.auth.oauth2.AuthorizationCodeTokenRequest;
-import com.google.api.client.auth.oauth2.BearerToken;
-import com.google.api.client.auth.oauth2.ClientParametersAuthentication;
-import com.google.api.client.auth.oauth2.Credential;
-import com.google.api.client.auth.oauth2.TokenResponse;
+import com.google.api.client.auth.oauth2.*;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
@@ -39,6 +34,7 @@
 import com.uber.sdk.rides.client.SessionConfiguration;
 import com.uber.sdk.rides.client.utils.Preconditions;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -47,10 +43,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import javax.annotation.Nullable;
-
-import static com.uber.sdk.rides.client.SessionConfiguration.EndpointRegion.WORLD;
-
 /**
  * Utility for creating and managing OAuth 2.0 Credentials.
  */
@@ -69,7 +61,6 @@ public class OAuth2Credentials {
      */
     public static class Builder {
 
-        private SessionConfiguration.EndpointRegion loginRegion;
         private Set<Scope> scopes;
         private Set<String> customScopes;
         private String clientId;
@@ -78,12 +69,12 @@ public static class Builder {
         private HttpTransport httpTransport;
         private AuthorizationCodeFlow authorizationCodeFlow;
         private AbstractDataStoreFactory credentialDataStoreFactory;
+        private String loginHost = "https://login.uber.com";
 
         /**
          * Set the {@link SessionConfiguration} information
          */
         public Builder setSessionConfiguration(SessionConfiguration configuration) {
-            this.loginRegion = configuration.getEndpointRegion();
             if (scopes != null) {
                 this.scopes = new HashSet<>(configuration.getScopes());
             }
@@ -95,14 +86,7 @@ public Builder setSessionConfiguration(SessionConfiguration configuration) {
             this.clientId = configuration.getClientId();
             this.clientSecret = configuration.getClientSecret();
             this.redirectUri = configuration.getRedirectUri();
-            return this;
-        }
-
-        /**
-         * Sets the authorization server domain.
-         */
-        public Builder setLoginRegion(SessionConfiguration.EndpointRegion loginRegion) {
-            this.loginRegion = loginRegion;
+            this.loginHost = configuration.getLoginHost();
             return this;
         }
 
@@ -205,21 +189,17 @@ public OAuth2Credentials build() {
                 credentialDataStoreFactory = MemoryDataStoreFactory.getDefaultInstance();
             }
 
-            if (loginRegion == null) {
-                loginRegion = WORLD;
-            }
-
             if (authorizationCodeFlow == null) {
                 try {
                     AuthorizationCodeFlow.Builder builder =
                             new AuthorizationCodeFlow.Builder(
                                     BearerToken.authorizationHeaderAccessMethod(),
                                     httpTransport,
                                     new JacksonFactory(),
-                                    new GenericUrl(getLoginDomain(loginRegion) + TOKEN_PATH),
+                                    new GenericUrl(loginHost + TOKEN_PATH),
                                     new ClientParametersAuthentication(clientId, clientSecret),
                                     clientId,
-                                    getLoginDomain(loginRegion) + AUTHORIZATION_PATH);
+                                    loginHost + AUTHORIZATION_PATH);
                     if (oAuth2Credentials.scopes != null && !oAuth2Credentials.scopes.isEmpty()) {
                         builder.setScopes(oAuth2Credentials.scopes);
                     }
@@ -232,10 +212,6 @@ public OAuth2Credentials build() {
             oAuth2Credentials.authorizationCodeFlow = authorizationCodeFlow;
             return oAuth2Credentials;
         }
-
-        private String getLoginDomain(SessionConfiguration.EndpointRegion endpointRegion) {
-            return "https://login." + endpointRegion.domain;
-        }
     }
 
     private OAuth2Credentials() {}

sdk/src/main/java/com/uber/sdk/rides/client/SessionConfiguration.java

@@ -30,7 +30,7 @@
 import java.util.HashSet;
 import java.util.Locale;
 
-import static com.uber.sdk.rides.client.SessionConfiguration.EndpointRegion.WORLD;
+import static com.uber.sdk.rides.client.SessionConfiguration.EndpointRegion.DEFAULT;
 import static com.uber.sdk.rides.client.utils.Preconditions.checkNotNull;
 
 /**
@@ -54,14 +54,20 @@ public enum Environment {
     }
 
     public enum EndpointRegion {
-        WORLD("uber.com"),
-        CHINA("uber.com.cn");
+        DEFAULT("uber.com");
 
-        public String domain;
+        private String domain;
 
         EndpointRegion(String domain) {
             this.domain = domain;
         }
+
+        /**
+         * @return domain to use.
+         */
+        public String getDomain() {
+            return domain;
+        }
     }
 
     /**
@@ -72,7 +78,6 @@ public static class Builder {
         private String clientSecret;
         private String serverToken;
         private String redirectUri;
-        private EndpointRegion region = EndpointRegion.WORLD;
         private Environment environment;
         private Collection<Scope> scopes;
         private Collection<String> customScopes;
@@ -126,17 +131,6 @@ public Builder setRedirectUri(@Nonnull String redirectUri) {
             return this;
         }
 
-        /**
-         * Set the {@link EndpointRegion} your app is registered in.
-         * Used to determine what endpoints to send requests to.
-         *
-         * @param region The {@link EndpointRegion} the SDK should use
-         */
-        public Builder setEndpointRegion(@Nonnull EndpointRegion region) {
-            this.region = region;
-            return this;
-        }
-
         /**
          * Sets the {@link Environment} to be used for API requests
          *
@@ -192,10 +186,6 @@ public Builder setLocale(@Nonnull Locale locale) {
         public SessionConfiguration build() {
             checkNotNull(clientId, "Client must be set");
 
-            if (region == null) {
-                region = WORLD;
-            }
-
             if (environment == null) {
                 environment = Environment.PRODUCTION;
             }
@@ -221,7 +211,7 @@ public SessionConfiguration build() {
                     clientSecret,
                     serverToken,
                     redirectUri,
-                    region,
+                    DEFAULT,
                     environment,
                     baseUrl,
                     scopes,
@@ -234,7 +224,7 @@ public SessionConfiguration build() {
     private final String clientSecret;
     private final String serverToken;
     private final String redirectUri;
-    private final EndpointRegion region;
+    private final EndpointRegion endpointRegion;
     private final Environment environment;
     private final String baseUrl;
     private final Collection<Scope> scopes;
@@ -245,7 +235,7 @@ protected SessionConfiguration(@Nonnull String clientId,
                                    @Nonnull String clientSecret,
                                    @Nonnull String serverToken,
                                    @Nonnull String redirectUri,
-                                   @Nonnull EndpointRegion region,
+                                   @Nonnull EndpointRegion endpointRegion,
                                    @Nonnull Environment environment,
                                    String baseUrl,
                                    @Nonnull Collection<Scope> scopes,
@@ -255,7 +245,7 @@ protected SessionConfiguration(@Nonnull String clientId,
         this.clientSecret = clientSecret;
         this.serverToken = serverToken;
         this.redirectUri = redirectUri;
-        this.region = region;
+        this.endpointRegion = endpointRegion;
         this.environment = environment;
         this.baseUrl = baseUrl;
         this.scopes = scopes;
@@ -300,22 +290,22 @@ public String getRedirectUri() {
     }
 
     /**
-     * Gets the current {@link EndpointRegion} the SDK is using.
-     * Defaults to {@link EndpointRegion#WORLD}.
+     * Gets the environment configured, either {@link Environment#PRODUCTION} or {@link Environment#SANDBOX}
      *
-     * @return The {@link EndpointRegion} the SDK is using.
+     * @return {@link Environment} that is configured
      */
-    public EndpointRegion getEndpointRegion() {
-        return region;
+    public Environment getEnvironment() {
+        return environment;
     }
 
     /**
-     * Gets the environment configured, either {@link Environment#PRODUCTION} or {@link Environment#SANDBOX}
+     * Gets the current {@link EndpointRegion} the SDK is using.
+     * Defaults to {@link EndpointRegion#DEFAULT}.
      *
-     * @return {@link Environment} that is configured
+     * @return the {@link EndpointRegion} the SDK us using.
      */
-    public Environment getEnvironment() {
-        return environment;
+    public EndpointRegion getEndpointRegion() {
+        return endpointRegion;
     }
 
     /**
@@ -325,7 +315,15 @@ public Environment getEnvironment() {
     public String getEndpointHost() {
         return baseUrl != null ?
                 baseUrl :
-                String.format("https://%s.%s", environment.subDomain, region.domain);
+                String.format("https://%s.%s", environment.subDomain, DEFAULT.getDomain());
+    }
+
+    /**
+     * Gets the login host used to sign in to the Uber API.
+     */
+    @Nonnull
+    public String getLoginHost() {
+        return String.format("https://login.%s", DEFAULT.getDomain());
     }
 
     /**
@@ -358,7 +356,6 @@ public Builder newBuilder() {
         return new Builder()
                 .setClientId(clientId)
                 .setRedirectUri(redirectUri)
-                .setEndpointRegion(region)
                 .setEnvironment(environment)
                 .setScopes(scopes);
     }

sdk/src/main/java/com/uber/sdk/rides/client/UberRidesApi.java

@@ -24,6 +24,7 @@
 
 import com.squareup.moshi.Moshi;
 import com.uber.sdk.rides.client.internal.ApiInterceptor;
+import com.uber.sdk.rides.client.internal.BigDecimalAdapter;
 import com.uber.sdk.rides.client.internal.RefreshAuthenticator;
 import com.uber.sdk.rides.client.services.RidesService;
 import okhttp3.OkHttpClient;
@@ -126,7 +127,7 @@ OkHttpClient createClient(OkHttpClient client,
         }
 
         Retrofit createRetrofit(OkHttpClient client, Session session) {
-            Moshi moshi = new Moshi.Builder().build();
+            Moshi moshi = new Moshi.Builder().add(new BigDecimalAdapter()).build();
 
             return new Retrofit.Builder()
                     .addConverterFactory(MoshiConverterFactory.create(moshi))