Merge branch 'dev' of github.com:watson-developer-cloud/java-sdk into dev

Author: germanattanasio

CONTRIBUTING.md

@@ -17,7 +17,9 @@ If you want to contribute to the repository, here's a quick guide:
     * Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
     * Check for unnecessary whitespace with git diff --check before committing.
   3. Make the test pass
-  4. Commit your changes
+  4. Commit your changes  
+      Commit messages should start with the service name and end with the issue number if exists  
+      `[concept-insights] Added functionality to list the graphs #135`
   5. Push to your fork and submit a pull request to the **dev** branch
 
 # Developer's Certificate of Origin 1.1

examples/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversionCustomConfigExample.java

@@ -0,0 +1,59 @@
+/**
+ * Copyright 2015 IBM Corp. All Rights Reserved.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.ibm.watson.developer_cloud.document_conversion.v1;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.ibm.watson.developer_cloud.document_conversion.v1.model.Answers;
+import com.ibm.watson.developer_cloud.http.HttpMediaType;
+
+import java.io.File;
+
+public class DocumentConversionCustomConfigExample {
+    public static void main(String[] args) {
+        final String versionDate = "2015-12-14";
+        DocumentConversion service = new DocumentConversion(versionDate);
+        service.setUsernameAndPassword("<username>", "<password>");
+
+        final File html = new File("src/test/resources/document_conversion/html-with-extra-content-input.htm");
+
+        // Run a conversion with no configuration specified. The Document Conversion service will use
+        // its default configuration when no configuration is specified. For this example, the
+        // Document Conversion service will section a HTML document by h1, h2, h3, h4, h5, and h6 tags.
+        // Those sections will be returned as Answers
+        System.out.println("Convert html document to Answer Units using default configuration");
+        final Answers htmlToAnswersWithDefaultConfig =
+                service.convertDocumentToAnswer(html, HttpMediaType.TEXT_HTML);
+        System.out.println(htmlToAnswersWithDefaultConfig);
+
+        System.out.println("==================================================");
+
+        // Run a conversion with a custom configuration. The next example shows how to convert this same
+        // document with a custom configuration. Instead of sectioning by the default settings (h1, h2,
+        // h3, h4, h5, and h6), the following example shows how to section a HTML document by only the
+        // h1 tag. This will result in Answers that are sectioned by h1 tags.
+        String configAsString = "{\n" +
+                "    \"answer_units\": {\n" +
+                "        \"selector_tags\": [\"h1\"]\n" +
+                "    }\n" +
+                "}";
+        JsonParser jsonParser = new JsonParser();
+        JsonObject customConfig = jsonParser.parse(configAsString).getAsJsonObject();
+
+        System.out.println("Convert html document to Answer Units using custom configuration");
+        final Answers htmlToAnswersWithCustomConfig =
+                service.convertDocumentToAnswer(html, HttpMediaType.TEXT_HTML, customConfig);
+        System.out.println(htmlToAnswersWithCustomConfig);
+    }
+}

src/main/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversion.java

@@ -64,7 +64,7 @@ public class DocumentConversion extends WatsonService {
 
   /** The default URL for the service. */
   private static final String URL =
-      "https://gateway.watsonplatform.net/document-conversion-experimental/api";
+      "https://gateway.watsonplatform.net/document-conversion/api";
 
   private static final JsonObject EMPTY_CONFIG = new JsonParser().parse("{}").getAsJsonObject();