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

Release v6.0.0

Author: lpatino10

.gitignore

@@ -19,3 +19,4 @@ docs
 .swagger-codegen-ignore
 .vscode/
 conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationTest.java
+.swagger-codegen/VERSION

README.md

@@ -155,7 +155,7 @@ service.setUsernameAndPassword("<username>", "<password>");
 
 ### API Key
 
-_Note: This version of instantiation only works with Visual Recognition, as it's the only service that uses an API key rather than a username and password._
+_Important: Instantiation with API key works only with Visual Recognition service instances created before May 23, 2018. Visual Recognition instances created after May 22 use IAM._
 
 ```java
 // in the constructor
@@ -180,7 +180,7 @@ When authenticating with IAM, you have the option of passing in:
 // in the constructor, letting the SDK manage the IAM token
 IamOptions options = new IamOptions.Builder()
   .apiKey("<iam_api_key>")
-  .url("<iam_url>") // optional - the default value is https://iam.ng.bluemix.net/identity/token
+  .url("<iam_url>") // optional - the default value is https://iam.bluemix.net/identity/token
   .build();
 Discovery service = new Discovery("2017-11-07", options);
 ```

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

@@ -132,9 +132,11 @@ public Assistant(String versionDate, String username, String password) {
   }
 
   /**
-   * Instantiates a new `Assistant` with IAM. Note that if the access token is specified in the iamOptions,
-   * you accept responsibility for managing the access token yourself. You must set a new access token before this one
-   * expires. Failing to do so will result in authentication errors after this token expires.
+   * Instantiates a new `Assistant` with IAM. Note that if the access token is specified in the
+   * iamOptions, you accept responsibility for managing the access token yourself. You must set a new access token
+   * before this
+   * one expires or after receiving a 401 error from the service. Failing to do so will result in authentication errors
+   * after this token expires.
    *
    * @param versionDate The version date (yyyy-MM-dd) of the REST API to use. Specifying this value will keep your API
    *          calls from failing when the service introduces breaking changes.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 IBM Corp. All Rights Reserved.
+ * Copyright 2018 IBM Corp. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,49 +12,24 @@
  */
 package com.ibm.watson.developer_cloud.assistant.v1.model;
 
-import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
-import com.ibm.watson.developer_cloud.assistant.v1.model.util.LogPaginationTypeAdapter;
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
  * The pagination data for the returned objects.
  */
-@JsonAdapter(LogPaginationTypeAdapter.class)
 public class LogPagination extends GenericModel {
 
   @SerializedName("next_url")
   private String nextUrl;
   private Long matched;
-
-  /**
-   * A token identifying the last value from the previous page of results.
-   */
-  private String cursor;
-
-  /**
-   * Gets the cursor.
-   * A token identifying the last value from the previous page of results.
-   *
-   * @return the cursor
-   */
-  public String getCursor() {
-    return cursor;
-  }
-
-  /**
-   * Sets the cursor.
-   *
-   * @param cursor the new cursor
-   */
-  public void setCursor(String cursor) {
-    this.cursor = cursor;
-  }
+  @SerializedName("next_cursor")
+  private String nextCursor;
 
   /**
    * Gets the nextUrl.
    *
-   * The URL that will return the next page of results.
+   * The URL that will return the next page of results, if any.
    *
    * @return the nextUrl
    */
@@ -74,20 +49,13 @@ public Long getMatched() {
   }
 
   /**
-   * Sets the nextUrl.
+   * Gets the nextCursor.
    *
-   * @param nextUrl the new nextUrl
-   */
-  public void setNextUrl(final String nextUrl) {
-    this.nextUrl = nextUrl;
-  }
-
-  /**
-   * Sets the matched.
+   * A token identifying the next page of results.
    *
-   * @param matched the new matched
+   * @return the nextCursor
    */
-  public void setMatched(final long matched) {
-    this.matched = matched;
+  public String getNextCursor() {
+    return nextCursor;
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 IBM Corp. All Rights Reserved.
+ * Copyright 2018 IBM Corp. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,15 +12,12 @@
  */
 package com.ibm.watson.developer_cloud.assistant.v1.model;
 
-import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
-import com.ibm.watson.developer_cloud.assistant.v1.model.util.PaginationTypeAdapter;
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
  * The pagination data for the returned objects.
  */
-@JsonAdapter(PaginationTypeAdapter.class)
 public class Pagination extends GenericModel {
 
   @SerializedName("refresh_url")
@@ -29,30 +26,10 @@ public class Pagination extends GenericModel {
   private String nextUrl;
   private Long total;
   private Long matched;
-
-  /**
-   * A token identifying the last value from the previous page of results.
-   */
-  private String cursor;
-
-  /**
-   * Gets the cursor.
-   * A token identifying the last value from the previous page of results.
-   *
-   * @return the cursor
-   */
-  public String getCursor() {
-    return cursor;
-  }
-
-  /**
-   * Sets the cursor.
-   *
-   * @param cursor the new cursor
-   */
-  public void setCursor(String cursor) {
-    this.cursor = cursor;
-  }
+  @SerializedName("refresh_cursor")
+  private String refreshCursor;
+  @SerializedName("next_cursor")
+  private String nextCursor;
 
   /**
    * Gets the refreshUrl.
@@ -99,38 +76,24 @@ public Long getMatched() {
   }
 
   /**
-   * Sets the refreshUrl.
+   * Gets the refreshCursor.
    *
-   * @param refreshUrl the new refreshUrl
-   */
-  public void setRefreshUrl(final String refreshUrl) {
-    this.refreshUrl = refreshUrl;
-  }
-
-  /**
-   * Sets the nextUrl.
+   * A token identifying the current page of results.
    *
-   * @param nextUrl the new nextUrl
+   * @return the refreshCursor
    */
-  public void setNextUrl(final String nextUrl) {
-    this.nextUrl = nextUrl;
+  public String getRefreshCursor() {
+    return refreshCursor;
   }
 
   /**
-   * Sets the total.
+   * Gets the nextCursor.
    *
-   * @param total the new total
-   */
-  public void setTotal(final long total) {
-    this.total = total;
-  }
-
-  /**
-   * Sets the matched.
+   * A token identifying the next page of results.
    *
-   * @param matched the new matched
+   * @return the nextCursor
    */
-  public void setMatched(final long matched) {
-    this.matched = matched;
+  public String getNextCursor() {
+    return nextCursor;
   }
 }