Merge pull request #882 from watson-developer-cloud/codegen/personality-insights

[Personality Insights] Add newest generated code and update tests

Author: germanattanasio

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

@@ -77,8 +77,7 @@ public PersonalityInsights(String versionDate) {
       setEndPoint(URL);
     }
 
-    Validator.isTrue((versionDate != null) && !versionDate.isEmpty(),
-        "'version cannot be null.");
+    Validator.isTrue((versionDate != null) && !versionDate.isEmpty(), "version cannot be null.");
 
     this.versionDate = versionDate;
   }
@@ -157,8 +156,9 @@ public ServiceCall<String> getProfileAsCSV(ProfileOptions profileOptions, boolea
     }
 
     builder.header(HttpHeaders.ACCEPT, HttpMediaType.TEXT_CSV);
-    builder.query("headers", includeHeaders);
+    builder.query("csv_headers", includeHeaders);
 
     return createServiceCall(builder.build(), ResponseConverterUtils.getString());
   }
+
 }

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

@@ -70,40 +70,4 @@ public String getCategory() {
   public Double getPercentage() {
     return percentage;
   }
-
-  /**
-   * Sets the traitId.
-   *
-   * @param traitId the new traitId
-   */
-  public void setTraitId(final String traitId) {
-    this.traitId = traitId;
-  }
-
-  /**
-   * Sets the name.
-   *
-   * @param name the new name
-   */
-  public void setName(final String name) {
-    this.name = name;
-  }
-
-  /**
-   * Sets the category.
-   *
-   * @param category the new category
-   */
-  public void setCategory(final String category) {
-    this.category = category;
-  }
-
-  /**
-   * Sets the percentage.
-   *
-   * @param percentage the new percentage
-   */
-  public void setPercentage(final Double percentage) {
-    this.percentage = percentage;
-  }
 }

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

@@ -60,31 +60,4 @@ public String getName() {
   public Double getScore() {
     return score;
   }
-
-  /**
-   * Sets the consumptionPreferenceId.
-   *
-   * @param consumptionPreferenceId the new consumptionPreferenceId
-   */
-  public void setConsumptionPreferenceId(final String consumptionPreferenceId) {
-    this.consumptionPreferenceId = consumptionPreferenceId;
-  }
-
-  /**
-   * Sets the name.
-   *
-   * @param name the new name
-   */
-  public void setName(final String name) {
-    this.name = name;
-  }
-
-  /**
-   * Sets the score.
-   *
-   * @param score the new score
-   */
-  public void setScore(final Double score) {
-    this.score = score;
-  }
 }

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

@@ -61,31 +61,4 @@ public String getName() {
   public List<ConsumptionPreferences> getConsumptionPreferences() {
     return consumptionPreferences;
   }
-
-  /**
-   * Sets the consumptionPreferenceCategoryId.
-   *
-   * @param consumptionPreferenceCategoryId the new consumptionPreferenceCategoryId
-   */
-  public void setConsumptionPreferenceCategoryId(final String consumptionPreferenceCategoryId) {
-    this.consumptionPreferenceCategoryId = consumptionPreferenceCategoryId;
-  }
-
-  /**
-   * Sets the name.
-   *
-   * @param name the new name
-   */
-  public void setName(final String name) {
-    this.name = name;
-  }
-
-  /**
-   * Sets the consumptionPreferences.
-   *
-   * @param consumptionPreferences the new consumptionPreferences
-   */
-  public void setConsumptionPreferences(final List<ConsumptionPreferences> consumptionPreferences) {
-    this.consumptionPreferences = consumptionPreferences;
-  }
 }

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

@@ -156,85 +156,4 @@ public List<ConsumptionPreferencesCategory> getConsumptionPreferences() {
   public List<Warning> getWarnings() {
     return warnings;
   }
-
-  /**
-   * Sets the processedLanguage.
-   *
-   * @param processedLanguage the new processedLanguage
-   */
-  public void setProcessedLanguage(final String processedLanguage) {
-    this.processedLanguage = processedLanguage;
-  }
-
-  /**
-   * Sets the wordCount.
-   *
-   * @param wordCount the new wordCount
-   */
-  public void setWordCount(final long wordCount) {
-    this.wordCount = wordCount;
-  }
-
-  /**
-   * Sets the wordCountMessage.
-   *
-   * @param wordCountMessage the new wordCountMessage
-   */
-  public void setWordCountMessage(final String wordCountMessage) {
-    this.wordCountMessage = wordCountMessage;
-  }
-
-  /**
-   * Sets the personality.
-   *
-   * @param personality the new personality
-   */
-  public void setPersonality(final List<Trait> personality) {
-    this.personality = personality;
-  }
-
-  /**
-   * Sets the values.
-   *
-   * @param values the new values
-   */
-  public void setValues(final List<Trait> values) {
-    this.values = values;
-  }
-
-  /**
-   * Sets the needs.
-   *
-   * @param needs the new needs
-   */
-  public void setNeeds(final List<Trait> needs) {
-    this.needs = needs;
-  }
-
-  /**
-   * Sets the behavior.
-   *
-   * @param behavior the new behavior
-   */
-  public void setBehavior(final List<Behavior> behavior) {
-    this.behavior = behavior;
-  }
-
-  /**
-   * Sets the consumptionPreferences.
-   *
-   * @param consumptionPreferences the new consumptionPreferences
-   */
-  public void setConsumptionPreferences(final List<ConsumptionPreferencesCategory> consumptionPreferences) {
-    this.consumptionPreferences = consumptionPreferences;
-  }
-
-  /**
-   * Sets the warnings.
-   *
-   * @param warnings the new warnings
-   */
-  public void setWarnings(final List<Warning> warnings) {
-    this.warnings = warnings;
-  }
 }

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

@@ -135,67 +135,4 @@ public Boolean isSignificant() {
   public List<Trait> getChildren() {
     return children;
   }
-
-  /**
-   * Sets the traitId.
-   *
-   * @param traitId the new traitId
-   */
-  public void setTraitId(final String traitId) {
-    this.traitId = traitId;
-  }
-
-  /**
-   * Sets the name.
-   *
-   * @param name the new name
-   */
-  public void setName(final String name) {
-    this.name = name;
-  }
-
-  /**
-   * Sets the category.
-   *
-   * @param category the new category
-   */
-  public void setCategory(final String category) {
-    this.category = category;
-  }
-
-  /**
-   * Sets the percentile.
-   *
-   * @param percentile the new percentile
-   */
-  public void setPercentile(final Double percentile) {
-    this.percentile = percentile;
-  }
-
-  /**
-   * Sets the rawScore.
-   *
-   * @param rawScore the new rawScore
-   */
-  public void setRawScore(final Double rawScore) {
-    this.rawScore = rawScore;
-  }
-
-  /**
-   * Sets the significant.
-   *
-   * @param significant the new significant
-   */
-  public void setSignificant(final Boolean significant) {
-    this.significant = significant;
-  }
-
-  /**
-   * Sets the children.
-   *
-   * @param children the new children
-   */
-  public void setChildren(final List<Trait> children) {
-    this.children = children;
-  }
 }

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

@@ -67,22 +67,4 @@ public String getWarningId() {
   public String getMessage() {
     return message;
   }
-
-  /**
-   * Sets the warningId.
-   *
-   * @param warningId the new warningId
-   */
-  public void setWarningId(final String warningId) {
-    this.warningId = warningId;
-  }
-
-  /**
-   * Sets the message.
-   *
-   * @param message the new message
-   */
-  public void setMessage(final String message) {
-    this.message = message;
-  }
 }

personality-insights/src/test/java/com/ibm/watson/developer_cloud/personality_insights/v3/PersonalityInsightsIT.java

@@ -112,6 +112,40 @@ public void getProfileWithText() throws Exception {
     Assert.assertNotNull(profile.getPersonality());
   }
 
+  /**
+   * Gets the profile with text as a CSV string without headers.
+   *
+   * @throws Exception the exception
+   */
+  @Test
+  public void getProfileWithTextAsCSVNoHeaders() throws Exception {
+    File file = new File(RESOURCE + "en.txt");
+    String englishText = getStringFromInputStream(new FileInputStream(file));
+
+    ProfileOptions options = new ProfileOptions.Builder().text(englishText).build();
+    String profileString = service.getProfileAsCSV(options, false).execute();
+
+    Assert.assertNotNull(profileString);
+    Assert.assertTrue(profileString.split("\n").length == 1);
+  }
+
+  /**
+   * Gets the profile with text as a CSV string with headers.
+   *
+   * @throws Exception the exception
+   */
+  @Test
+  public void getProfileWithTextAsCSVWithHeaders() throws Exception {
+    File file = new File(RESOURCE + "en.txt");
+    String englishText = getStringFromInputStream(new FileInputStream(file));
+
+    ProfileOptions options = new ProfileOptions.Builder().text(englishText).build();
+    String profileString = service.getProfileAsCSV(options, true).execute();
+
+    Assert.assertNotNull(profileString);
+    Assert.assertTrue(profileString.split("\n").length == 2);
+  }
+
   /**
    * Assert profile.
    *