replace getProfile function with a generic one that includes include_raw, content-language and accept-language for Personality Insights

Author: germanattanasio

examples/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsightsExample.java

@@ -15,6 +15,9 @@
  */
 package com.ibm.watson.developer_cloud.personality_insights.v2;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.ibm.watson.developer_cloud.personality_insights.v2.model.Profile;
 
 public class PersonalityInsightsExample {
@@ -37,7 +40,10 @@ public static void main(String[] args) {
 				+ "the street, and methodically knocking people's hats off-then, "
 				+ "I account it high time to get to sea as soon as I can.";
 
-		Profile profile = service.getProfile(myProfile);
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("text",myProfile);
+
+		Profile profile = service.getProfile(params);
 		System.out.println(profile);
 	}
 }

src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsights.java

@@ -16,9 +16,10 @@
 package com.ibm.watson.developer_cloud.personality_insights.v2;
 
 import java.io.IOException;
+import java.util.Map;
+import java.util.logging.Logger;
 
 import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.protocol.HTTP;
 
 import com.ibm.watson.developer_cloud.personality_insights.v2.model.Content;
@@ -40,7 +41,10 @@
  *      Personality Insights</a>
  */
 public class PersonalityInsights extends WatsonService {
-
+	
+	/** The Constant log. */
+	private static final Logger log = Logger.getLogger(PersonalityInsights.class.getName());
+	
 	/** The url. */
 	private static String URL = "https://gateway.watsonplatform.net/personality-insights/api";
 
@@ -52,57 +56,43 @@ public PersonalityInsights() {
 	}
 
 	/**
-	 * Accepts a {@link Content} object and analyzes the text. The response is
-	 * {@link Profile} with a tree of characteristics that include personality,
-	 * needs, and values. If you include either created or updated timestamps,
-	 * the response also includes a summary of the author's writing habits with
-	 * respect to time of day.
+	 * Accepts text or a {@link Content} object and responds with a {@link Profile}
+	 * with a tree of characteristics that include personality, needs, and values.
+	 * If you include either created or updated timestamps, the response also includes
+	 * a summary of the author's writing habits with respect to time of day.
 	 * 
-	 * @param content
-	 *            the content
-	 * @return the profile
-	 * @see Content
+	 * @param params
+	 *            The parameters to generate the profile. Either text or content need
+	 *            to be specified
+	 * @return The personality profile
 	 */
-	public Profile getProfile(Content content) {
-		if (content == null)
-			throw new IllegalArgumentException("content can not be null");
-
-		if (content.getContentItems() == null || content.getContentItems().isEmpty())
-			throw new IllegalArgumentException("content needs to have contentItems.");
-
-		String contentJson = getGson().toJson(content);
-		HttpRequestBase request = Request.Post("/v2/profile")
-				.withContent(contentJson, MediaType.APPLICATION_JSON).build();
-
-		try {
-			HttpResponse response = execute(request);
-			String profileJson = ResponseUtil.getString(response);
-			Profile profile = getGson().fromJson(profileJson, Profile.class);
-			return profile;
-		} catch (IOException e) {
-			throw new RuntimeException(e);
+	public Profile getProfile(Map<String, Object> params) {
+		if (!params.containsKey("text") && !params.containsKey("content"))
+			throw new IllegalArgumentException("text or content need to be specified");
+		else if (params.containsKey("text") && params.containsKey("content"))
+			log.warning("text and content were specified, only text will be used");
+			
+		
+		Request request = Request.Post("/v2/profile");
+		
+		if (params.containsKey("text")) {
+			request.withContent(params.get("text").toString(), HTTP.PLAIN_TEXT_TYPE);
+		} else {
+			String contentJson = getGson().toJson(params.get("content"));
+			request.withContent(contentJson, MediaType.APPLICATION_JSON);
 		}
-	}
+		
+		if (params.containsKey("includeRaw"))
+			request.withQuery("include_raw", params.get("includeRaw"));
+		
+		if (params.containsKey("language"))
+			request.withHeader("Content-Language", params.get("language"));
 
-	/**
-	 * Accepts text and responds with a {@link Profile} with a tree of
-	 * characteristics that include personality, needs, and values. If you
-	 * include either created or updated timestamps, the response also includes
-	 * a summary of the author's writing habits with respect to time of day.
-	 * 
-	 * @param text
-	 *            the text to analyze
-	 * @return the personality profile
-	 * @see Content
-	 */
-	public Profile getProfile(String text) {
-		if (text == null)
-			throw new IllegalArgumentException("text can not be null");
+		if (params.containsKey("acceptLanguage"))
+			request.withHeader("Accept-Language", params.get("acceptLanguage"));
 
-		HttpRequestBase request = Request.Post("/v2/profile")
-				.withContent(text, HTTP.PLAIN_TEXT_TYPE).build();
+		HttpResponse response = execute(request.build());
 
-		HttpResponse response = execute(request);
 		try {
 			String profileJson = ResponseUtil.getString(response);
 			Profile profile = getGson().fromJson(profileJson, Profile.class);
@@ -111,7 +101,7 @@ public Profile getProfile(String text) {
 			throw new RuntimeException(e);
 		}
 	}
-
+	
 	/*
 	 * (non-Javadoc)
 	 * 

src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/model/Profile.java

@@ -33,12 +33,36 @@ public class Profile {
 	private Trait tree;
 
 	/** The word_count. */
-	private int word_count;
+	@SerializedName("word_count")
+	private int wordCount;
 
 	/** The word count message. */
 	@SerializedName("word_count_message")
 	private String wordCountMessage;
 
+	/** The word count message. */
+	@SerializedName("processed_lang")
+	private String processedLanguage;
+	
+	
+	/**
+	 * Gets the processed language.
+	 *
+	 * @return the processed language
+	 */
+	public String getProcessedLanguage() {
+		return processedLanguage;
+	}
+
+	/**
+	 * Sets the processed language.
+	 *
+	 * @param processedLanguage the new processed language
+	 */
+	public void setProcessedLanguage(String processedLanguage) {
+		this.processedLanguage = processedLanguage;
+	}
+
 	/**
 	 * Gets A message indicating the number of words found and where that value
 	 * falls in the range of required/suggested number of words.
@@ -93,8 +117,8 @@ public Trait getTree() {
 	 *
 	 * @return the number of words
 	 */
-	public int getWord_count() {
-		return word_count;
+	public int getWordCount() {
+		return wordCount;
 	}
 
 	/**
@@ -130,10 +154,10 @@ public void setTree(Trait tree) {
 	/**
 	 * Sets the number of words found in the input.
 	 *
-	 * @param word_count            the number of words
+	 * @param wordCount            the number of words
 	 */
-	public void setWord_count(int word_count) {
-		this.word_count = word_count;
+	public void setWordCount(int wordCount) {
+		this.wordCount = wordCount;
 	}
 
 	/*

src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/model/Trait.java

@@ -25,48 +25,32 @@
  */
 public class Trait {
 
+	/** The category. */
+	private String category;
+	
+	/** The children. */
+	private List<Trait> children;
+	
 	/** The id. */
 	private String id;
 
 	/** The name. */
 	private String name;
 
-	/** The category. */
-	private String category;
-	
 	/** The percentage. */
 	private double percentage;
+
+	/** The raw sampling error. */
+	@SerializedName("raw_sampling_error")
+	private Double rawSamplingError;
+	
+	/** The raw score. */
+	@SerializedName("raw_score")
+	private Double rawScore;
 
 	/** The sampling error. */
 	@SerializedName("sampling_error")
 	private double samplingError;
-	
-	/** The children. */
-	private List<Trait> children;
-
-	/**
-	 * Indicates the sampling error of the percentage, based on the
-	 * number of words in the input. The number defines a 95% confidence
-	 * interval around the percentage. For example, the sampling error is
-	 * 4% and percentage is 61%. It is 95% likely that the actual percentage
-	 * value is between 57% and 65% if more words are given.
-	 * 
-	 * @return the sampling error
-	 */
-	public double getSamplingError() {
-		return samplingError;
-	}
-
-	/**
-	 * Sets the sampling error of the percentage based on the
-	 * number of words in the input.
-	 * 
-	 * @param samplingError error
-	 *            the new sampling error
-	 */
-	public void setSamplingError(double samplingError) {
-		this.samplingError = samplingError;
-	}
 
 	/**
 	 * Gets the personality model category.
@@ -116,6 +100,37 @@ public double getPercentage() {
 		return percentage;
 	}
 
+	/**
+	 * Gets the raw sampling error.
+	 *
+	 * @return the raw sampling error
+	 */
+	public double getRawSamplingError() {
+		return rawSamplingError;
+	}
+
+	/**
+	 * Gets the raw score.
+	 *
+	 * @return the raw score
+	 */
+	public double getRawScore() {
+		return rawScore;
+	}
+
+	/**
+	 * Indicates the sampling error of the percentage, based on the
+	 * number of words in the input. The number defines a 95% confidence
+	 * interval around the percentage. For example, the sampling error is
+	 * 4% and percentage is 61%. It is 95% likely that the actual percentage
+	 * value is between 57% and 65% if more words are given.
+	 * 
+	 * @return the sampling error
+	 */
+	public double getSamplingError() {
+		return samplingError;
+	}
+
 	/**
 	 * Sets personality model category.
 	 * e.g: "values", "needs" or "personality"
@@ -167,6 +182,35 @@ public void setPercentage(double percentage) {
 		this.percentage = percentage;
 	}
 
+	/**
+	 * Sets the raw sampling error.
+	 *
+	 * @param rawSamplingError the new raw sampling error
+	 */
+	public void setRawSamplingError(double rawSamplingError) {
+		this.rawSamplingError = rawSamplingError;
+	}
+
+	/**
+	 * Sets the raw score.
+	 *
+	 * @param rawScore the new raw score
+	 */
+	public void setRawScore(double rawScore) {
+		this.rawScore = rawScore;
+	}
+
+	/**
+	 * Sets the sampling error of the percentage based on the
+	 * number of words in the input.
+	 * 
+	 * @param samplingError error
+	 *            the new sampling error
+	 */
+	public void setSamplingError(double samplingError) {
+		this.samplingError = samplingError;
+	}
+
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */