Merge branch 'master' of https://github.com/watson-developer-cloud/java-sdk

Author: lpatino10

.config.properties.enc

@@ -30,7 +30,7 @@ before_install:
   - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g' ~/.m2/settings.xml
 
 script:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_3faf32fc672a_key -iv $encrypted_3faf32fc672a_iv -in .config.properties.enc -out core/src/test/resources/.config.properties -d || true'
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_b248e84a4806_key -iv $encrypted_b248e84a4806_iv -in config.properties.enc -out core/src/test/resources/config.properties -d || true'
   - ./gradlew install -x check
   - ./gradlew checkstyleMain
   - ./gradlew checkstyleTest

.travis.yml

@@ -84,6 +84,7 @@ public void testGetImageFromURL() {
   /**
    * Test get image with HTML.
    */
+  @Ignore
   @Test
   public void testGetImageWithHTML() {
     final ImageLink image = service.getImageLink(htmlExample).execute();

alchemy/src/test/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVisionIT.java

@@ -19,28 +19,31 @@
 import com.ibm.watson.developer_cloud.util.GsonSerializationHelper;
 
 /**
-* Context information for the message. Include the context from the previous response to maintain state for the
+ * Context information for the message. Include the context from the previous response to maintain state for the
  * conversation.
-*/
+ */
 public class Context extends DynamicModel {
-  private Type conversationIdType = new TypeToken<String>() { } .getType();
-  private Type systemType = new TypeToken<SystemResponse>() { } .getType();
+  private Type conversationIdType = new TypeToken<String>() {
+  }.getType();
+  private Type systemType = new TypeToken<SystemResponse>() {
+  }.getType();
 
   /**
    * Gets the conversationId.
    *
    * @return the conversationId
    */
   public String getConversationId() {
-      return GsonSerializationHelper.serializeDynamicModelProperty(this.get("conversationId"), conversationIdType);
+    return GsonSerializationHelper.serializeDynamicModelProperty(this.get("conversation_id"), conversationIdType);
   }
+
   /**
    * Gets the system.
    *
    * @return the system
    */
   public SystemResponse getSystem() {
-      return GsonSerializationHelper.serializeDynamicModelProperty(this.get("system"), systemType);
+    return GsonSerializationHelper.serializeDynamicModelProperty(this.get("system"), systemType);
   }
 
   /**
@@ -49,7 +52,7 @@ public SystemResponse getSystem() {
    * @param conversationId the new conversationId
    */
   public void setConversationId(final String conversationId) {
-    this.put("conversationId", conversationId);
+    this.put("conversation_id", conversationId);
   }
 
   /**
@@ -61,4 +64,3 @@ public void setSystem(final SystemResponse system) {
     this.put("system", system);
   }
 }
-