chore(Personality Insights): Apply manual changes

Author: lpatino10

personality-insights/src/main/java/com/ibm/watson/developer_cloud/personality_insights/v3/PersonalityInsights.java

@@ -12,6 +12,8 @@
  */
 package com.ibm.watson.developer_cloud.personality_insights.v3;
 
+import com.ibm.watson.developer_cloud.http.HttpHeaders;
+import com.ibm.watson.developer_cloud.http.HttpMediaType;
 import com.ibm.watson.developer_cloud.http.RequestBuilder;
 import com.ibm.watson.developer_cloud.http.ServiceCall;
 import com.ibm.watson.developer_cloud.personality_insights.v3.model.Profile;
@@ -135,9 +137,6 @@ public ServiceCall<Profile> profile(ProfileOptions profileOptions) {
     if (profileOptions.rawScores() != null) {
       builder.query("raw_scores", String.valueOf(profileOptions.rawScores()));
     }
-    if (profileOptions.csvHeaders() != null) {
-      builder.query("csv_headers", String.valueOf(profileOptions.csvHeaders()));
-    }
     if (profileOptions.consumptionPreferences() != null) {
       builder.query("consumption_preferences", String.valueOf(profileOptions.consumptionPreferences()));
     }
@@ -171,9 +170,10 @@ public ServiceCall<Profile> profile(ProfileOptions profileOptions) {
    * profile](https://console.bluemix.net/docs/services/personality-insights/output-csv.html).
    *
    * @param profileOptions the {@link ProfileOptions} containing the options for the call
+   * @param includeHeaders the boolean saying whether or not to include headers in the response
    * @return a {@link ServiceCall} with a response type of {@link InputStream}
    */
-  public ServiceCall<InputStream> profileAsCsv(ProfileOptions profileOptions) {
+  public ServiceCall<InputStream> profileAsCsv(ProfileOptions profileOptions, boolean includeHeaders) {
     Validator.notNull(profileOptions, "profileOptions cannot be null");
     String[] pathSegments = { "v3/profile" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
@@ -188,9 +188,6 @@ public ServiceCall<InputStream> profileAsCsv(ProfileOptions profileOptions) {
     if (profileOptions.rawScores() != null) {
       builder.query("raw_scores", String.valueOf(profileOptions.rawScores()));
     }
-    if (profileOptions.csvHeaders() != null) {
-      builder.query("csv_headers", String.valueOf(profileOptions.csvHeaders()));
-    }
     if (profileOptions.consumptionPreferences() != null) {
       builder.query("consumption_preferences", String.valueOf(profileOptions.consumptionPreferences()));
     }
@@ -199,6 +196,10 @@ public ServiceCall<InputStream> profileAsCsv(ProfileOptions profileOptions) {
     } else {
       builder.bodyContent(profileOptions.body(), profileOptions.contentType());
     }
+
+    builder.header(HttpHeaders.ACCEPT, HttpMediaType.TEXT_CSV);
+    builder.query("csv_headers", includeHeaders);
+
     return createServiceCall(builder.build(), ResponseConverterUtils.getInputStream());
   }
 

personality-insights/src/main/java/com/ibm/watson/developer_cloud/personality_insights/v3/model/ProfileOptions.java

@@ -93,7 +93,6 @@ public interface AcceptLanguage {
   private String contentLanguage;
   private String acceptLanguage;
   private Boolean rawScores;
-  private Boolean csvHeaders;
   private Boolean consumptionPreferences;
 
   /**
@@ -106,7 +105,6 @@ public static class Builder {
     private String contentLanguage;
     private String acceptLanguage;
     private Boolean rawScores;
-    private Boolean csvHeaders;
     private Boolean consumptionPreferences;
 
     private Builder(ProfileOptions profileOptions) {
@@ -116,7 +114,6 @@ private Builder(ProfileOptions profileOptions) {
       contentLanguage = profileOptions.contentLanguage;
       acceptLanguage = profileOptions.acceptLanguage;
       rawScores = profileOptions.rawScores;
-      csvHeaders = profileOptions.csvHeaders;
       consumptionPreferences = profileOptions.consumptionPreferences;
     }
 
@@ -168,17 +165,6 @@ public Builder rawScores(Boolean rawScores) {
       return this;
     }
 
-    /**
-     * Set the csvHeaders.
-     *
-     * @param csvHeaders the csvHeaders
-     * @return the ProfileOptions builder
-     */
-    public Builder csvHeaders(Boolean csvHeaders) {
-      this.csvHeaders = csvHeaders;
-      return this;
-    }
-
     /**
      * Set the consumptionPreferences.
      *
@@ -235,7 +221,6 @@ private ProfileOptions(Builder builder) {
     contentLanguage = builder.contentLanguage;
     acceptLanguage = builder.acceptLanguage;
     rawScores = builder.rawScores;
-    csvHeaders = builder.csvHeaders;
     consumptionPreferences = builder.consumptionPreferences;
   }
 
@@ -330,18 +315,6 @@ public Boolean rawScores() {
     return rawScores;
   }
 
-  /**
-   * Gets the csvHeaders.
-   *
-   * Indicates whether column labels are returned with a CSV response. By default, no column labels are returned.
-   * Applies only when the **Accept** parameter is set to `text/csv`.
-   *
-   * @return the csvHeaders
-   */
-  public Boolean csvHeaders() {
-    return csvHeaders;
-  }
-
   /**
    * Gets the consumptionPreferences.
    *