fix(generation): api def tag 'sdk-2020-08-20' with disco-v2 passage u…

…pdate gen tag '2.3.1'

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

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019, 2020.
+ * (C) Copyright IBM Corp. 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,7 +101,7 @@
  */
 public class Assistant extends BaseService {
 
-  private static final String DEFAULT_SERVICE_NAME = "assistant";
+  private static final String DEFAULT_SERVICE_NAME = "conversation";
 
   private static final String DEFAULT_SERVICE_URL =
       "https://api.us-south.assistant.watson.cloud.ibm.com";

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

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019, 2020.
+ * (C) Copyright IBM Corp. 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
@@ -47,7 +47,7 @@
  */
 public class Assistant extends BaseService {
 
-  private static final String DEFAULT_SERVICE_NAME = "assistant";
+  private static final String DEFAULT_SERVICE_NAME = "conversation";
 
   private static final String DEFAULT_SERVICE_URL =
       "https://api.us-south.assistant.watson.cloud.ibm.com";

assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageContextSkill.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019, 2020.
+ * (C) Copyright IBM Corp. 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,12 +25,12 @@ public class MessageContextSkill extends GenericModel {
   @SerializedName("user_defined")
   protected Map<String, Object> userDefined;
 
-  protected Map<String, Object> system;
+  protected MessageContextSkillSystem system;
 
   /** Builder. */
   public static class Builder {
     private Map<String, Object> userDefined;
-    private Map<String, Object> system;
+    private MessageContextSkillSystem system;
 
     private Builder(MessageContextSkill messageContextSkill) {
       this.userDefined = messageContextSkill.userDefined;
@@ -66,7 +66,7 @@ public Builder userDefined(Map<String, Object> userDefined) {
      * @param system the system
      * @return the MessageContextSkill builder
      */
-    public Builder system(Map<String, Object> system) {
+    public Builder system(MessageContextSkillSystem system) {
       this.system = system;
       return this;
     }
@@ -104,7 +104,7 @@ public Map<String, Object> userDefined() {
    *
    * @return the system
    */
-  public Map<String, Object> system() {
+  public MessageContextSkillSystem system() {
     return system;
   }
 }

discovery/src/main/java/com/ibm/watson/discovery/v1/model/CredentialDetails.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2018, 2020.
+ * (C) Copyright IBM Corp. 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
@@ -39,7 +39,7 @@ public interface CredentialType {
     /** saml. */
     String SAML = "saml";
     /** username_password. */
-    String USERNAME_PASSWORD = "username_password"; // pragma: whitelist secret
+    String USERNAME_PASSWORD = "username_password";
     /** noauth. */
     String NOAUTH = "noauth";
     /** basic. */
@@ -141,7 +141,7 @@ private Builder(CredentialDetails credentialDetails) {
       this.publicKeyId = credentialDetails.publicKeyId;
       this.privateKey = credentialDetails.privateKey;
       this.passphrase = credentialDetails.passphrase;
-      this.password = credentialDetails.password; // pragma: whitelist secret
+      this.password = credentialDetails.password;
       this.gatewayId = credentialDetails.gatewayId;
       this.sourceVersion = credentialDetails.sourceVersion;
       this.webApplicationUrl = credentialDetails.webApplicationUrl;
@@ -291,7 +291,7 @@ public Builder passphrase(String passphrase) {
      * @return the CredentialDetails builder
      */
     public Builder password(String password) {
-      this.password = password; // pragma: whitelist secret
+      this.password = password;
       return this;
     }
 
@@ -385,7 +385,7 @@ protected CredentialDetails(Builder builder) {
     publicKeyId = builder.publicKeyId;
     privateKey = builder.privateKey;
     passphrase = builder.passphrase;
-    password = builder.password; // pragma: whitelist secret
+    password = builder.password;
     gatewayId = builder.gatewayId;
     sourceVersion = builder.sourceVersion;
     webApplicationUrl = builder.webApplicationUrl;