Merge pull request #901 from watson-developer-cloud/develop

Release v5.1.1

Author: lpatino10

.bumpversion.cfg

@@ -3,6 +3,8 @@ current_version = 5.1.0
 
 [bumpversion:file:README.md]
 
+[bumpversion:file:assistant/README.md]
+
 [bumpversion:file:conversation/README.md]
 
 [bumpversion:file:discovery/README.md]

README.md

@@ -16,7 +16,7 @@ Java client library to use the [Watson APIs][wdc].
   * [Usage](#usage)
   * [Getting the Service Credentials](#getting-the-service-credentials)
   * IBM Watson Services
-    * [Conversation](conversation)
+    * [Assistant](assistant)
     * [Discovery](discovery)
     * [Language Translator](language-translator)
     * [Natural Language Classifier](natural-language-classifier)
@@ -71,10 +71,10 @@ All the services:
 'com.ibm.watson.developer_cloud:java-sdk:5.1.0'
 ```
 
-Only Conversation:
+Only Assistant:
 
 ```gradle
-'com.ibm.watson.developer_cloud:conversation:5.1.0'
+'com.ibm.watson.developer_cloud:assistant:5.0.1'
 ```
 
 ##### Development Snapshots
@@ -143,7 +143,7 @@ Override the `configureHttpClient()` method and add the proxy using the `OkHttpC
 For example:
 
 ```java
-Conversation service = new Conversation("2018-02-16") {
+Assistant service = new Assistant("2018-02-16") {
   @Override
   protected OkHttpClient configureHttpClient() {
     Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("proxyHost", 8080));
@@ -196,7 +196,7 @@ For example, if you have the conversation service in Germany, the Endpoint may b
 You will need to call
 
 ```java
-Conversation service = new Conversation("2018-02-16");
+Assistant service = new Assistant("2018-02-16");
 service.sentEndPoint("https://gateway-fra.watsonplatform.net/conversation/api")
 ```
 
@@ -295,4 +295,5 @@ or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-watson).
 [sonatype_snapshots]: https://oss.sonatype.org/content/repositories/snapshots/com/ibm/watson/developer_cloud/
 [vcap_services]: https://docs.run.pivotal.io/devguide/deploy-apps/environment-variable.html#VCAP-SERVICES
 
-[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-4.2.0/java-sdk-5.1.0-jar-with-dependencies.jar
+
+[jar]: https://github.com/watson-developer-cloud/java-sdk/releases/download/java-sdk-5.1.0/java-sdk-5.1.0-jar-with-dependencies.jar

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/Assistant.java

@@ -18,7 +18,6 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.ibm.watson.developer_cloud.assistant.v1.model.LogPagination;
-import com.ibm.watson.developer_cloud.util.RequestUtils;
 import okhttp3.HttpUrl;
 
 import java.io.IOException;
@@ -30,6 +29,7 @@ public class LogPaginationTypeAdapter extends TypeAdapter<LogPagination> {
   private static final String MATCHED = "matched";
   private static final String NEXT_URL = "next_url";
   private static final String CURSOR = "cursor";
+  private static final String DEFAULT_ENDPOINT = "http://do.not.use";
 
   /*
    * (non-Javadoc)
@@ -60,7 +60,7 @@ public LogPagination read(JsonReader reader) throws IOException {
       String name = reader.nextName();
       if (name.equals(NEXT_URL)) {
         String nextUrl = reader.nextString();
-        HttpUrl url = HttpUrl.parse(RequestUtils.DEFAULT_ENDPOINT + nextUrl);
+        HttpUrl url = HttpUrl.parse(DEFAULT_ENDPOINT + nextUrl);
         pagination.setCursor(url.queryParameter(CURSOR));
         pagination.setNextUrl(nextUrl);
       } else if (name.equals(MATCHED)) {

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/util/LogPaginationTypeAdapter.java

@@ -18,7 +18,6 @@
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.ibm.watson.developer_cloud.assistant.v1.model.Pagination;
-import com.ibm.watson.developer_cloud.util.RequestUtils;
 import okhttp3.HttpUrl;
 
 import java.io.IOException;
@@ -32,6 +31,7 @@ public class PaginationTypeAdapter extends TypeAdapter<Pagination> {
   private static final String NEXT_URL = "next_url";
   private static final String REFRESH_URL = "refresh_url";
   private static final String CURSOR = "cursor";
+  private static final String DEFAULT_ENDPOINT = "http://do.not.use";
 
   /*
    * (non-Javadoc)
@@ -66,7 +66,7 @@ public Pagination read(JsonReader reader) throws IOException {
         pagination.setRefreshUrl(reader.nextString());
       } else if (name.equals(NEXT_URL)) {
         String nextUrl = reader.nextString();
-        HttpUrl url = HttpUrl.parse(RequestUtils.DEFAULT_ENDPOINT + nextUrl);
+        HttpUrl url = HttpUrl.parse(DEFAULT_ENDPOINT + nextUrl);
         pagination.setCursor(url.queryParameter(CURSOR));
         pagination.setNextUrl(nextUrl);
       } else if (name.equals(TOTAL)) {

assistant/src/main/java/com/ibm/watson/developer_cloud/assistant/v1/model/util/PaginationTypeAdapter.java

@@ -13,24 +13,23 @@
  */
 package com.ibm.watson.developer_cloud.conversation.v1.model.util;
 
-import java.io.IOException;
-
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.ibm.watson.developer_cloud.conversation.v1.model.LogPagination;
-import com.ibm.watson.developer_cloud.util.RequestUtils;
-
 import okhttp3.HttpUrl;
 
+import java.io.IOException;
+
 /**
  * Type adapter to transform JSON into a {@link LogPagination} and vice versa.
  */
 public class LogPaginationTypeAdapter extends TypeAdapter<LogPagination> {
   private static final String MATCHED = "matched";
   private static final String NEXT_URL = "next_url";
   private static final String CURSOR = "cursor";
+  private static final String DEFAULT_ENDPOINT = "http://do.not.use";
 
   /*
    * (non-Javadoc)
@@ -61,7 +60,7 @@ public LogPagination read(JsonReader reader) throws IOException {
       String name = reader.nextName();
       if (name.equals(NEXT_URL)) {
         String nextUrl = reader.nextString();
-        HttpUrl url = HttpUrl.parse(RequestUtils.DEFAULT_ENDPOINT + nextUrl);
+        HttpUrl url = HttpUrl.parse(DEFAULT_ENDPOINT + nextUrl);
         pagination.setCursor(url.queryParameter(CURSOR));
         pagination.setNextUrl(nextUrl);
       } else if (name.equals(MATCHED)) {

config.properties.enc

@@ -13,17 +13,15 @@
  */
 package com.ibm.watson.developer_cloud.conversation.v1.model.util;
 
-import java.io.IOException;
-
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.ibm.watson.developer_cloud.conversation.v1.model.Pagination;
-import com.ibm.watson.developer_cloud.util.RequestUtils;
-
 import okhttp3.HttpUrl;
 
+import java.io.IOException;
+
 /**
  * Type adapter to transform JSON into a {@link Pagination} and vice versa.
  */
@@ -33,6 +31,7 @@ public class PaginationTypeAdapter extends TypeAdapter<Pagination> {
   private static final String NEXT_URL = "next_url";
   private static final String REFRESH_URL = "refresh_url";
   private static final String CURSOR = "cursor";
+  private static final String DEFAULT_ENDPOINT = "http://do.not.use";
 
   /*
    * (non-Javadoc)
@@ -67,7 +66,7 @@ public Pagination read(JsonReader reader) throws IOException {
         pagination.setRefreshUrl(reader.nextString());
       } else if (name.equals(NEXT_URL)) {
         String nextUrl = reader.nextString();
-        HttpUrl url = HttpUrl.parse(RequestUtils.DEFAULT_ENDPOINT + nextUrl);
+        HttpUrl url = HttpUrl.parse(DEFAULT_ENDPOINT + nextUrl);
         pagination.setCursor(url.queryParameter(CURSOR));
         pagination.setNextUrl(nextUrl);
       } else if (name.equals(TOTAL)) {

conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/Conversation.java

@@ -12,19 +12,17 @@
  */
 package com.ibm.watson.developer_cloud.http;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.gson.JsonObject;
-import com.ibm.watson.developer_cloud.util.RequestUtils;
 import com.ibm.watson.developer_cloud.util.Validator;
-
 import okhttp3.FormBody;
 import okhttp3.HttpUrl;
 import okhttp3.MediaType;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Convenience class for constructing HTTP/HTTPS requests.
  */
@@ -41,7 +39,7 @@ private enum HTTPMethod {
    *
    * @return this
    */
-  public static RequestBuilder delete(String url) {
+  public static RequestBuilder delete(HttpUrl url) {
     return new RequestBuilder(HTTPMethod.DELETE, url);
   }
 
@@ -52,7 +50,7 @@ public static RequestBuilder delete(String url) {
    *
    * @return this
    */
-  public static RequestBuilder get(String url) {
+  public static RequestBuilder get(HttpUrl url) {
     return new RequestBuilder(HTTPMethod.GET, url);
   }
 
@@ -64,7 +62,7 @@ public static RequestBuilder get(String url) {
    *
    * @return this
    */
-  public static RequestBuilder post(String url) {
+  public static RequestBuilder post(HttpUrl url) {
     return new RequestBuilder(HTTPMethod.POST, url);
   }
 
@@ -75,10 +73,44 @@ public static RequestBuilder post(String url) {
    *
    * @return this
    */
-  public static RequestBuilder put(String url) {
+  public static RequestBuilder put(HttpUrl url) {
     return new RequestBuilder(HTTPMethod.PUT, url);
   }
 
+  /**
+   * Creates a properly encoded HttpUrl object with no path parameters.
+   *
+   * @param endPoint the API end point
+   * @param pathSegments the path segments for a specific API call
+   * @return the HttpUrl object
+   */
+  public static HttpUrl constructHttpUrl(String endPoint, String[] pathSegments) {
+    HttpUrl.Builder httpUrlBuilder = HttpUrl.parse(endPoint).newBuilder();
+    for (String segment : pathSegments) {
+      httpUrlBuilder.addPathSegments(segment);
+    }
+    return httpUrlBuilder.build();
+  }
+
+  /**
+   * Creates a properly encoded HttpUrl object with path parameters.
+   *
+   * @param endPoint the API end point
+   * @param pathSegments the path segments for a specific API call
+   * @param pathParameters the path parameters for a specific API call
+   * @return the HttpUrl object
+   */
+  public static HttpUrl constructHttpUrl(String endPoint, String[] pathSegments, String[] pathParameters) {
+    HttpUrl.Builder httpUrlBuilder = HttpUrl.parse(endPoint).newBuilder();
+    for (int i = 0; i < pathSegments.length; i++) {
+      httpUrlBuilder.addPathSegments(pathSegments[i]);
+      if (i < pathParameters.length) {
+        httpUrlBuilder.addPathSegment(pathParameters[i]);
+      }
+    }
+    return httpUrlBuilder.build();
+  }
+
   private RequestBody body;
   private HttpUrl httpUrl;
   private final List<NameValue> formParams = new ArrayList<NameValue>();
@@ -92,17 +124,13 @@ public static RequestBuilder put(String url) {
    * @param method the method, PUT, POST, GET or DELETE
    * @param url the request URL
    */
-  private RequestBuilder(HTTPMethod method, String url) {
+  private RequestBuilder(HTTPMethod method, HttpUrl url) {
     this.method = method;
     if (url == null) {
       throw new IllegalArgumentException("url cannot be null");
     }
 
-    // Since HttpUrl requires requires a http/s full url, add a default endpoint
-    httpUrl = HttpUrl.parse(url);
-    if (httpUrl == null) {
-      httpUrl = HttpUrl.parse(RequestUtils.DEFAULT_ENDPOINT + url);
-    }
+    this.httpUrl = url;
   }
 
   /**
@@ -119,7 +147,7 @@ private RequestBuilder(HTTPMethod method, String url) {
    * @param params the parameters
    * @param name the parameter name
    * @param value the value to set, will be obtained via {@link String#valueOf(boolean)}. If null, only the parameter is
-   *        set. It can also be a collection or array, in which case all elements are added as query parameters
+   *          set. It can also be a collection or array, in which case all elements are added as query parameters
    *
    * @return this
    */
@@ -159,7 +187,6 @@ public Request build() {
     // URL
     builder.url(toUrl());
 
-
     if (method == HTTPMethod.GET) {
       Validator.isNull(body, "cannot send a RequestBody in a GET request");
     } else if (!formParams.isEmpty()) {
@@ -190,7 +217,6 @@ public Request build() {
 
   /*
    * (non-Javadoc)
-   *
    * @see java.lang.Object#toString()
    */
   @Override
@@ -299,5 +325,4 @@ public RequestBuilder header(Object... args) {
   public RequestBuilder query(Object... args) {
     return with(queryParams, args);
   }
-
 }