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

Author: germanattanasio

.gitignore

@@ -14,3 +14,4 @@ src/test/resources/config.properties
 bin/
 
 src/test/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeechIntegrationTest.java
+*.iml

README.md

@@ -55,13 +55,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.0</version>
+	<version>1.1.1</version>
 </dependency>
 ```
 ##### Gradle
 
 ```gradle
-'com.ibm.watson.developer_cloud:java-wrapper:1.1.0'
+'com.ibm.watson.developer_cloud:java-wrapper:1.1.1'
 ```
 
 ## Usage

config.properties.example

@@ -0,0 +1,36 @@
+# This file must be completed and copied to src/test/resources/config.properties.
+
+# AlchemyAPI key
+alchemy.alchemy=
+concept_expansion.password=
+concept_expansion.url=
+concept_expansion.username=
+dialog.dialog_id=
+dialog.password=
+dialog.url=
+dialog.username=
+language_translation.model_id=
+language_translation.password=
+language_translation.url=
+language_translation.username=
+message_resonance.password=
+message_resonance.url=
+message_resonance.username=
+mock.server.host=localhost
+mock.server.port=12345
+natural_language_classifier.classifier_id=
+question_and_answer.password=
+question_and_answer.url=
+question_and_answer.username=
+relationship_extraction.password=
+relationship_extraction.url=
+relationship_extraction.username=
+retrieve_and_rank.password=
+retrieve_and_rank.url=
+retrieve_and_rank.username=
+tradeoff_analytics.password=
+tradeoff_analytics.url=
+tradeoff_analytics.username=
+visual_recognition.password=
+visual_recognition.url=
+visual_recognition.username=

src/test/java/com/ibm/watson/developer_cloud/MultiThreadTest.java

@@ -86,10 +86,10 @@ public void setUp() throws Exception {
 		super.setUp();
 		service = new LanguageTranslation();
 		service.setUsernameAndPassword(
-				prop.getProperty("language_translation.username"),
-				prop.getProperty("language_translation.password")
+				getValidProperty("language_translation.username"),
+				getValidProperty("language_translation.password")
 				);
-		service.setEndPoint(prop.getProperty("language_translation.url"));
+		service.setEndPoint(getValidProperty("language_translation.url"));
 	}
 
 	/**

src/test/java/com/ibm/watson/developer_cloud/WatsonServiceTest.java

@@ -71,6 +71,29 @@ public static String getStringFromInputStream(InputStream is) {
 	/** The prop. */
 	protected Properties prop = new Properties();
 
+	public String getExistingProperty(String property) {
+		String value = prop.getProperty(property);
+		if(value == null) throw new MissingPropertyException(property);
+		return value;
+	}
+	public String getValidProperty(String property) {
+		String value = getExistingProperty(property);
+		if("".equals(value)) throw new EmptyPropertyException(property);
+		return value;
+	}
+
+	private class MissingPropertyException extends IllegalStateException {
+		MissingPropertyException(String property) {
+			super("A property expected to exist does not exist: " + property);
+		}
+	}
+
+	private class EmptyPropertyException extends IllegalStateException {
+		EmptyPropertyException(String property) {
+			super("Property " + property + " is empty. It's probably unset.");
+		}
+	}
+
 	/**
 	 * Sets the up.
 	 *

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

@@ -46,7 +46,7 @@ public class AlchemyDataNewsTest extends WatsonServiceTest {
     public void setUp() throws Exception {
         super.setUp();
         service = new AlchemyDataNews();
-        service.setApiKey(prop.getProperty("alchemy.alchemy"));
+        service.setApiKey(getValidProperty("alchemy.alchemy"));
 
     }
 

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

@@ -59,7 +59,7 @@ public class AlchemyLanguageTest extends WatsonServiceTest {
 	public void setUp() throws Exception {
 		super.setUp();
 		service = new AlchemyLanguage();
-		service.setApiKey(prop.getProperty("alchemy.alchemy"));
+		service.setApiKey(getValidProperty("alchemy.alchemy"));
 		htmlExample = getStringFromInputStream(new FileInputStream("src/test/resources/example.html"));
 
 	}

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

@@ -52,7 +52,7 @@ public class AlchemyVisionTest extends WatsonServiceTest {
 	public void setUp() throws Exception {
 		super.setUp();
 		service = new AlchemyVision();
-		service.setApiKey(prop.getProperty("alchemy.alchemy"));
+		service.setApiKey(getValidProperty("alchemy.alchemy"));
 		htmlExample = getStringFromInputStream(new FileInputStream("src/test/resources/example.html"));
 	}
 

src/test/java/com/ibm/watson/developer_cloud/concept_expansion/v1/ConceptExpansionTest.java

@@ -44,10 +44,10 @@ public void setUp() throws Exception {
 		super.setUp();
 		service = new ConceptExpansion();
 		service.setUsernameAndPassword(
-				prop.getProperty("concept_expansion.username"),
-				prop.getProperty("concept_expansion.password")
+				getValidProperty("concept_expansion.username"),
+				getValidProperty("concept_expansion.password")
 				);
-		service.setEndPoint(prop.getProperty("concept_expansion.url"));
+		service.setEndPoint(getValidProperty("concept_expansion.url"));
 	}
 
 	/**

src/test/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsightsTest.java

@@ -313,9 +313,9 @@ public void testListDocuments() {
 	public void setUp() throws Exception {
 		super.setUp();
 		service = new ConceptInsights();
-		service.setUsernameAndPassword(prop.getProperty("concept_insights.username"),
-				prop.getProperty("concept_insights.password"));
-		service.setEndPoint(prop.getProperty("concept_insights.url"));
+		service.setUsernameAndPassword(getValidProperty("concept_insights.username"),
+				getValidProperty("concept_insights.password"));
+		service.setEndPoint(getValidProperty("concept_insights.url"));
 	}
 
 	/**