Merge pull request #1100 from watson-developer-cloud/release-8.2.0

Release 8.2.0

Author: lpatino10

.gitignore

@@ -31,4 +31,6 @@ model_result.mlmodel
 .openapi-generator/
 package-lock.json
 .pre-commit-config.yaml
-.secrets.baseline
+.secrets.baseline
+*.test-metadata.txt
+*.py

.releaserc

@@ -1,6 +1,5 @@
 {
   "branch": "master",
-  "tagFormat": "java-sdk-${version}",
   "debug": true,
   "plugins": [
     "@semantic-release/commit-analyzer",

README.md

@@ -3,7 +3,7 @@
 
 [![Build Status](https://travis-ci.org/watson-developer-cloud/java-sdk.svg?branch=master)](https://travis-ci.org/watson-developer-cloud/java-sdk)
 [![Slack](https://wdc-slack-inviter.mybluemix.net/badge.svg)](https://wdc-slack-inviter.mybluemix.net)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson/java-sdk/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson/java-sdk)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson/ibm-watson/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.ibm.watson/ibm-watson)
 [![CLA assistant](https://cla-assistant.io/readme/badge/watson-developer-cloud/java-sdk)](https://cla-assistant.io/watson-developer-cloud/java-sdk)
 
 Java client library to use the [Watson APIs][wdc].

assistant/build.gradle

@@ -27,7 +27,7 @@ task sourcesJar(type: Jar) {
 }
 
 repositories {
-    maven { url "http://repo.maven.apache.org/maven2" }
+    maven { url "https://repo.maven.apache.org/maven2" }
     maven { url "https://dl.bintray.com/ibm-cloud-sdks/ibm-cloud-sdk-repo" }
 }
 
@@ -60,7 +60,7 @@ checkstyle {
 dependencies {
     compile project(':common')
     testCompile project(':common').sourceSets.test.output
-    compile 'com.ibm.cloud:sdk-core:7.1.0'
+    compile 'com.ibm.cloud:sdk-core:8.1.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

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

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2019, 2020.
  *
  * 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
@@ -99,36 +99,61 @@
  */
 public class Assistant extends BaseService {
 
-  private static final String SERVICE_NAME = "assistant";
-  private static final String SERVICE_URL = "https://gateway.watsonplatform.net/assistant/api";
+  private static final String DEFAULT_SERVICE_NAME = "assistant";
+
+  private static final String DEFAULT_SERVICE_URL = "https://gateway.watsonplatform.net/assistant/api";
 
   private String versionDate;
 
   /**
-   * Constructs a new `Assistant` client.
+   * Constructs a new `Assistant` client using the DEFAULT_SERVICE_NAME.
    *
    * @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.
    */
   public Assistant(String versionDate) {
-    this(versionDate, ConfigBasedAuthenticatorFactory.getAuthenticator(SERVICE_NAME));
+    this(versionDate, DEFAULT_SERVICE_NAME, ConfigBasedAuthenticatorFactory.getAuthenticator(DEFAULT_SERVICE_NAME));
   }
 
   /**
-   * Constructs a new `Assistant` client with the specified Authenticator.
+   * Constructs a new `Assistant` client with the DEFAULT_SERVICE_NAME
+   * and the specified Authenticator.
    *
    * @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.
    * @param authenticator the Authenticator instance to be configured for this service
    */
   public Assistant(String versionDate, Authenticator authenticator) {
-    super(SERVICE_NAME, authenticator);
-    if ((getServiceUrl() == null) || getServiceUrl().isEmpty()) {
-      setServiceUrl(SERVICE_URL);
-    }
+    this(versionDate, DEFAULT_SERVICE_NAME, authenticator);
+  }
+
+  /**
+   * Constructs a new `Assistant` client with the specified serviceName.
+   *
+   * @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.
+   * @param serviceName The name of the service to configure.
+   */
+  public Assistant(String versionDate, String serviceName) {
+    this(versionDate, serviceName, ConfigBasedAuthenticatorFactory.getAuthenticator(serviceName));
+  }
+
+  /**
+   * Constructs a new `Assistant` client with the specified Authenticator
+   * and serviceName.
+   *
+   * @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.
+   * @param serviceName The name of the service to configure.
+   * @param authenticator the Authenticator instance to be configured for this service
+   */
+  public Assistant(String versionDate, String serviceName, Authenticator authenticator) {
+    super(serviceName, authenticator);
+    setServiceUrl(DEFAULT_SERVICE_URL);
     com.ibm.cloud.sdk.core.util.Validator.isTrue((versionDate != null) && !versionDate.isEmpty(),
         "version cannot be null.");
     this.versionDate = versionDate;
+    this.configureService(serviceName);
   }
 
   /**
@@ -2039,6 +2064,8 @@ public ServiceCall<LogCollection> listAllLogs(ListAllLogsOptions listAllLogsOpti
    * For more information about personal data and customer IDs, see [Information
    * security](https://cloud.ibm.com/docs/services/assistant?topic=assistant-information-security#information-security).
    *
+   * This operation is limited to 4 requests per minute. For more information, see **Rate limiting**.
+   *
    * @param deleteUserDataOptions the {@link DeleteUserDataOptions} containing the options for the call
    * @return a {@link ServiceCall} with a response type of Void
    */

assistant/src/main/java/com/ibm/watson/assistant/v1/model/CaptureGroup.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2018, 2020.
  *
  * 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
@@ -22,8 +22,8 @@
  */
 public class CaptureGroup extends GenericModel {
 
-  private String group;
-  private List<Long> location;
+  protected String group;
+  protected List<Long> location;
 
   /**
    * Builder.
@@ -101,7 +101,7 @@ public Builder location(List<Long> location) {
     }
   }
 
-  private CaptureGroup(Builder builder) {
+  protected CaptureGroup(Builder builder) {
     com.ibm.cloud.sdk.core.util.Validator.notNull(builder.group,
         "group cannot be null");
     group = builder.group;

assistant/src/main/java/com/ibm/watson/assistant/v1/model/Context.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2017, 2020.
  *
  * 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
@@ -20,12 +20,13 @@
  * State information for the conversation. To maintain state, include the context from the previous response.
  */
 public class Context extends DynamicModel<Object> {
+
   @SerializedName("conversation_id")
-  private String conversationId;
+  protected String conversationId;
   @SerializedName("system")
-  private SystemResponse system;
+  protected SystemResponse system;
   @SerializedName("metadata")
-  private MessageContextMetadata metadata;
+  protected MessageContextMetadata metadata;
 
   public Context() {
     super(new TypeToken<Object>() {

assistant/src/main/java/com/ibm/watson/assistant/v1/model/Counterexample.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2017, 2020.
  *
  * 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
@@ -21,9 +21,9 @@
  */
 public class Counterexample extends GenericModel {
 
-  private String text;
-  private Date created;
-  private Date updated;
+  protected String text;
+  protected Date created;
+  protected Date updated;
 
   /**
    * Builder.
@@ -97,7 +97,7 @@ public Builder updated(Date updated) {
     }
   }
 
-  private Counterexample(Builder builder) {
+  protected Counterexample(Builder builder) {
     com.ibm.cloud.sdk.core.util.Validator.notNull(builder.text,
         "text cannot be null");
     text = builder.text;

assistant/src/main/java/com/ibm/watson/assistant/v1/model/CounterexampleCollection.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2017, 2020.
  *
  * 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
@@ -21,8 +21,8 @@
  */
 public class CounterexampleCollection extends GenericModel {
 
-  private List<Counterexample> counterexamples;
-  private Pagination pagination;
+  protected List<Counterexample> counterexamples;
+  protected Pagination pagination;
 
   /**
    * Gets the counterexamples.

assistant/src/main/java/com/ibm/watson/assistant/v1/model/CreateCounterexampleOptions.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2017, 2020.
  *
  * 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
@@ -19,8 +19,8 @@
  */
 public class CreateCounterexampleOptions extends GenericModel {
 
-  private String workspaceId;
-  private String text;
+  protected String workspaceId;
+  protected String text;
 
   /**
    * Builder.
@@ -94,7 +94,7 @@ public Builder counterexample(Counterexample counterexample) {
     }
   }
 
-  private CreateCounterexampleOptions(Builder builder) {
+  protected CreateCounterexampleOptions(Builder builder) {
     com.ibm.cloud.sdk.core.util.Validator.notEmpty(builder.workspaceId,
         "workspaceId cannot be empty");
     com.ibm.cloud.sdk.core.util.Validator.notNull(builder.text,

assistant/src/main/java/com/ibm/watson/assistant/v1/model/CreateDialogNodeOptions.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2017, 2020.
  *
  * 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
@@ -101,26 +101,26 @@ public interface DigressOutSlots {
     String ALLOW_ALL = "allow_all";
   }
 
-  private String workspaceId;
-  private String dialogNode;
-  private String description;
-  private String conditions;
-  private String parent;
-  private String previousSibling;
-  private DialogNodeOutput output;
-  private Map<String, Object> context;
-  private Map<String, Object> metadata;
-  private DialogNodeNextStep nextStep;
-  private String title;
-  private String type;
-  private String eventName;
-  private String variable;
-  private List<DialogNodeAction> actions;
-  private String digressIn;
-  private String digressOut;
-  private String digressOutSlots;
-  private String userLabel;
-  private Boolean disambiguationOptOut;
+  protected String workspaceId;
+  protected String dialogNode;
+  protected String description;
+  protected String conditions;
+  protected String parent;
+  protected String previousSibling;
+  protected DialogNodeOutput output;
+  protected Map<String, Object> context;
+  protected Map<String, Object> metadata;
+  protected DialogNodeNextStep nextStep;
+  protected String title;
+  protected String type;
+  protected String eventName;
+  protected String variable;
+  protected List<DialogNodeAction> actions;
+  protected String digressIn;
+  protected String digressOut;
+  protected String digressOutSlots;
+  protected String userLabel;
+  protected Boolean disambiguationOptOut;
 
   /**
    * Builder.
@@ -463,7 +463,7 @@ public Builder dialogNode(DialogNode dialogNode) {
     }
   }
 
-  private CreateDialogNodeOptions(Builder builder) {
+  protected CreateDialogNodeOptions(Builder builder) {
     com.ibm.cloud.sdk.core.util.Validator.notEmpty(builder.workspaceId,
         "workspaceId cannot be empty");
     com.ibm.cloud.sdk.core.util.Validator.notNull(builder.dialogNode,

assistant/src/main/java/com/ibm/watson/assistant/v1/model/CreateEntity.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2017, 2020.
  *
  * 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
@@ -25,14 +25,14 @@
  */
 public class CreateEntity extends GenericModel {
 
-  private String entity;
-  private String description;
-  private Map<String, Object> metadata;
+  protected String entity;
+  protected String description;
+  protected Map<String, Object> metadata;
   @SerializedName("fuzzy_match")
-  private Boolean fuzzyMatch;
-  private Date created;
-  private Date updated;
-  private List<CreateValue> values;
+  protected Boolean fuzzyMatch;
+  protected Date created;
+  protected Date updated;
+  protected List<CreateValue> values;
 
   /**
    * Builder.
@@ -175,7 +175,7 @@ public Builder values(List<CreateValue> values) {
     }
   }
 
-  private CreateEntity(Builder builder) {
+  protected CreateEntity(Builder builder) {
     com.ibm.cloud.sdk.core.util.Validator.notNull(builder.entity,
         "entity cannot be null");
     entity = builder.entity;

assistant/src/main/java/com/ibm/watson/assistant/v1/model/CreateEntityOptions.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019.
+ * (C) Copyright IBM Corp. 2017, 2020.
  *
  * 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
@@ -23,12 +23,12 @@
  */
 public class CreateEntityOptions extends GenericModel {
 
-  private String workspaceId;
-  private String entity;
-  private String description;
-  private Map<String, Object> metadata;
-  private Boolean fuzzyMatch;
-  private List<CreateValue> values;
+  protected String workspaceId;
+  protected String entity;
+  protected String description;
+  protected Map<String, Object> metadata;
+  protected Boolean fuzzyMatch;
+  protected List<CreateValue> values;
 
   /**
    * Builder.
@@ -160,7 +160,7 @@ public Builder values(List<CreateValue> values) {
     }
   }
 
-  private CreateEntityOptions(Builder builder) {
+  protected CreateEntityOptions(Builder builder) {
     com.ibm.cloud.sdk.core.util.Validator.notEmpty(builder.workspaceId,
         "workspaceId cannot be empty");
     com.ibm.cloud.sdk.core.util.Validator.notNull(builder.entity,