Merge pull request #116 from watson-developer-cloud/dev

v2.0.0

Author: germanattanasio

.gitattributes

@@ -0,0 +1,37 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+*.css           text
+*.df            text
+*.htm           text
+*.html          text
+*.java          text
+*.js            text
+*.json          text
+*.jsp           text
+*.jspf          text
+*.properties    text
+*.sh            text
+*.svg           text
+*.tld           text
+*.txt           text
+*.xml           text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.class         binary
+*.dll           binary
+*.ear           binary
+*.gif           binary
+*.ico           binary
+*.jar           binary
+*.jpg           binary
+*.jpeg          binary
+*.png           binary
+*.so            binary
+*.war           binary

.travis.yml

@@ -6,11 +6,11 @@ script:
 jdk:
 - oraclejdk8
 - oraclejdk7
-- openjdk6
-
 cache:
   directories:
   - $HOME/.m2/repository
 before_install:
 - openssl aes-256-cbc -K $encrypted_a973fe4f8e79_key -iv $encrypted_a973fe4f8e79_iv
   -in config.properties.enc -out src/test/resources/config.properties -d
+after_success:
+- codecov

CONTRIBUTING.md

@@ -8,7 +8,7 @@ please ask a question on [dW Answers][dw] or [Stack Overflow][stackoverflow].
 If you encounter an issue with the Java SDK, you are welcome to submit a [bug report](https://github.com/watson-developer-cloud/java-sdk/issues).
 Before that, please search for similar issues. It's possible somebody has encountered this issue already.
 
-## Pull Requests
+# Pull Requests
 
 If you want to contribute to the repository, here's a quick guide:
   1. Fork the repository
@@ -20,6 +20,33 @@ If you want to contribute to the repository, here's a quick guide:
   4. Commit your changes
   5. Push to your fork and submit a pull request to the **dev** branch
 
+# Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+   have the right to submit it under the open source license
+   indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+   of my knowledge, is covered under an appropriate open source
+   license and I have the right under that license to submit that
+   work with modifications, whether created in whole or in part
+   by me, under the same open source license (unless I am
+   permitted to submit under a different license), as indicated
+   in the file; or
+
+(c) The contribution was provided directly to me by some other
+   person who certified (a), (b) or (c) and I have not modified
+   it.
+
+(d) I understand and agree that this project and the contribution
+   are public and that a record of the contribution (including all
+   personal information I submit with it, including my sign-off) is
+   maintained indefinitely and may be redistributed consistent with
+   this project or the open source license(s) involved.
+
+
 ## Additional Resources
 + [General GitHub documentation](https://help.github.com/)
 + [GitHub pull request documentation](https://help.github.com/send-pull-requests/)

README.md

@@ -19,17 +19,14 @@ APIs and SDKs that use cognitive computing to solve complex problems.
     * [Alchemy Language](#alchemy-language)
     * [Alchemy Vision](#alchemy-vision)
     * [Alchemy Data News](#alchemy-data-news)
-    * [Concept Expansion](#concept-expansion)
     * [Concept Insights](#concept-insights)
     * [Dialog](#dialog)
     * [Document Conversion](#document-conversion)
     * [Language Identification](#language-identification)
     * [Language Translation](#language-translation)
     * [Machine Translation](#machine-translation)
-    * [Message Resonance](#message-resonance)
     * [Natural Language Classifier](#natural-language-classifier)
     * [Personality Insights](#personality-insights)
-    * [Question and Answer](#question-and-answer)
     * [Relationship Extraction](#relationship-extraction)
     * [Speech to Text](#speech-to-text)
     * [Text to Speech](#text-to-speech)
@@ -55,13 +52,13 @@ Now, you are ready to see some [examples](https://github.com/watson-developer-cl
 <dependency>
 	<groupId>com.ibm.watson.developer_cloud</groupId>
 	<artifactId>java-wrapper</artifactId>
-	<version>1.1.1</version>
+	<version>2.0.0</version>
 </dependency>
 ```
 ##### Gradle
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-wrapper:1.1.1'
+'com.ibm.watson.developer_cloud:java-wrapper:2.0.0'
 ```
 
 ## Usage
@@ -146,32 +143,6 @@ VolumeResult result = service.getVolume("now-7d", "now", "12h");
 System.out.println(result);
 ```
 
-### Concept Expansion
-Map euphemisms or colloquial terms to more commonly understood phrases using
-the [Concept Expansion][concept_expansion] service.
-Example: Create a job, wait for it to finish, and then retrieve results.
-
-```java
-ConceptExpansion service = new ConceptExpansion();
-service.setUsernameAndPassword("<username>", "<password>");
-
-String[] seeds = new String[]{"motrin", "tylenol", "aspirin"};
-String label = "medicine";
-service.setDataset(ConceptExpansionDataset.MT_SAMPLES);
-Job job = service.createJob(label, seeds);
-
-while (service.getJobStatus(job) == Job.Status.AWAITING_WORK
-		|| service.getJobStatus(job) == Job.Status.IN_FLIGHT) {
-	try {
-		Thread.sleep(4000);
-	} catch (InterruptedException e) {
-		e.printStackTrace();
-	}
-}
-
-System.out.println(service.getJobResult(job));
-```
-
 ### Concept Insights
 Use the Concept Insights service to identify words in the text that
 correspond to concepts in a Wikipedia graph.
@@ -223,19 +194,6 @@ TranslationResult translationResult = service.translate("hello", "en", "es");
 System.out.println(translationResult);
 ```
 
-### Message Resonance
-Send a word and Watson responds with the resonance scoring for the word, allowing you to enhance the effectiveness of your language for the intended audience.  
-Example: Get resonance information for individual words in a sentence from the [Message Resonance][message_resonance] service.
-
-```java
-MessageResonance service = new MessageResonance();
-service.setUsernameAndPassword("<username>", "<password>");
-
-service.setDataset(MessageResonanceDataset.BIG_DATA);
-Message message = service.getResonance("IBM Watson Developer Cloud");
-System.out.println(message);
-```
-
 ### Natural Language Classifier
 Use [Natural Language Classifier](http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/nl-classifier/) service to create a classifier instance by providing a set of representative strings and a set of one or more correct classes for each as training. Then use the trained classifier to classify your new question for best matching answers or to retrieve next actions for your application.
 
@@ -284,18 +242,6 @@ System.out.println(profile);
 authentication errors, remember that the Personality Insights service is not
 a free service.
 
-### Question and Answer
-Ask a healthcare-related question of the [Question and Answer][question_and_answer] service.
-
-```java
-QuestionAndAnswer service = new QuestionAndAnswer();
-service.setUsernameAndPassword("<username>", "<password>");
-
-service.setDataset(QuestionAndAnswerDataset.HEALTHCARE);
-WatsonAnswer watsonAnswers = service.ask("What is HIV?");
-
-System.out.println(watsonAnswers);
-```
 
 ### Relationship Extraction
 Analyze an English news article and get the relationships between sentence
@@ -320,7 +266,7 @@ service.setUsernameAndPassword("<username>", "<password>");
 
 File audio = new File("src/test/resources/sample1.wav");
 
-SpeechResults transcript = service.recognize(audio, "audio/l16; rate=44100");
+SpeechResults transcript = service.recognize(audio, HttpMediaType.AUDIO_WAV);
 System.out.println(transcript);
 ```
 
@@ -443,11 +389,9 @@ System.out.println(recognizedImage);
 ```
 
 ## Android
+he library supports Android 2.3 and above. For Java, the minimum requirement is 1.7.  
+It depends on [OkHttp][] and [gson][].
 
-The library works well on Android. It depends on
-[Apache HttpClient][] (including the [HttpMime][] module) and [json-java][].
-Android SDK already comes with these two libraries so you don't need to include
-them when using the library there.
 
 ## Running in Bluemix
 When running in Bluemix, the library will automatically get the credentials from `VCAP_SERVICES`.
@@ -467,7 +411,7 @@ Gradle:
 
   ```sh
   $ cd java-sdk
-  $ gradle jar  # build jar file (build/libs/watson-developer-cloud-1.1.1.jar)
+  $ gradle jar  # build jar file (build/libs/watson-developer-cloud-2.0.0.jar)
   $ gradle test # run tests
   ```
 
@@ -507,13 +451,9 @@ available in [LICENSE](LICENSE).
 ## Contributing
 See [CONTRIBUTING.md](CONTRIBUTING.md).
 
-
-[question_and_answer]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/qaapi/
-[message_resonance]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/mrapi/
 [personality_insights]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/personality-insights/
 [language_identification]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/lidapi/
 [machine_translation]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/mtapi/
-[concept_expansion]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/glimpseapi/
 [document_conversion]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/document-conversion/
 [relationship_extraction]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/sireapi/
 [language_translation]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/language-translation/
@@ -532,11 +472,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
 [alchemy_data_news]: http://www.alchemyapi.com/products/alchemydata-news
 
 [wdc]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/
-[vcap_environment]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/getting_started/index.html#EnvVars
 [bluemix]: https://console.ng.bluemix.net
 [Gradle]: http://www.gradle.org/
-[Apache HttpClient]: http://hc.apache.org/httpcomponents-client-ga/
-[HttpMime]: http://hc.apache.org/httpcomponents-client-ga/httpmime
-[json-java]: http://json.org/java/
+[OkHttp]: http://square.github.io/okhttp/
+[gson]: https://github.com/google/gson
 [apache_maven]: http://maven.apache.org/
 [releases]: https://github.com/watson-developer-cloud/java-sdk/releases

build.gradle

@@ -6,18 +6,16 @@ sourceCompatibility = 1.6
 targetCompatibility = 1.6
 group = 'com.ibm.watson.developercloud'
 archivesBaseName = 'watson-developer-cloud'
-version = '1.1.0'
+version = '2.0.0'
 
 description = 'Client library to use the IBM Watson Services and AlchemyAPI'
 
 repositories {
     mavenCentral()
 }
 dependencies {
-    compile group: 'org.apache.httpcomponents', name: 'httpmime', version:'4.0.3'
+    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'2.5.0'
     compile group: 'com.google.code.gson', name: 'gson', version:'2.3.1'
-    compile group: 'org.apache.httpcomponents', name: 'httpclient', version:'4.0.3'
-    compile group: 'org.apache.commons', name: 'commons-csv', version:'1.2'
     compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.3.2'
     testCompile group: 'org.mockito', name: 'mockito-core', version:'1.10.19'
     testCompile group: 'org.mock-server', name: 'mockserver-netty', version:'3.9.17'

config.properties.enc

@@ -2,9 +2,7 @@
 
 # AlchemyAPI key
 alchemy.alchemy=
-concept_expansion.password=
-concept_expansion.url=
-concept_expansion.username=
+
 dialog.dialog_id=
 dialog.password=
 dialog.url=

config.properties.example

@@ -0,0 +1,55 @@
+/**
+ * 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.alchemy_data_news.v1;
+
+
+import java.io.FileNotFoundException;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.ibm.watson.developer_cloud.alchemy.v1.AlchemyDataNews;
+import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentsResult;
+
+
+/**
+ * Getting 7 documents between Friday 28th August 2015 and Friday 4th September 2015 using the
+ * {@link AlchemyDataNews} API.
+ * 
+ */
+public class GetNewsDocumentExample {
+
+  public static void main(String[] args) throws URISyntaxException, FileNotFoundException {
+    final AlchemyDataNews service = new AlchemyDataNews();
+    service.setApiKey("<api_key>");
+
+    final Map<String, Object> params = new HashMap<String, Object>();
+
+    final String[] fields =
+        new String[] {"enriched.url.title", "enriched.url.url", "enriched.url.author",
+            "enriched.url.publicationDate", "enriched.url.enrichedTitle.entities",
+            "enriched.url.enrichedTitle.docSentiment"};
+    params.put(AlchemyDataNews.RETURN, StringUtils.join(fields, ","));
+    params.put(AlchemyDataNews.START, "1440720000");
+    params.put(AlchemyDataNews.END, "1441407600");
+    params.put(AlchemyDataNews.COUNT, 7);
+
+    final DocumentsResult result = service.getNewsDocuments(params);
+
+    System.out.println(result);
+  }
+
+}