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

Added Visual Insights and tests cases for Concept Insights

Author: germanattanasio

config.properties.enc

@@ -105,8 +105,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -168,6 +168,14 @@
 		<profile>
 			<id>release</id>
 			<build>
+				<resources>
+					<resource>
+						<directory>src/main/resources</directory>
+						<includes>
+							<include>**/*.json</include>
+						</includes>
+					</resource>
+				</resources>
 				<plugins>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>

pom.xml

@@ -16,29 +16,17 @@
 
 package com.ibm.watson.developer_cloud.alchemy.v1;
 
-import java.io.IOException;
-import java.util.Map;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpRequestBase;
-
-import com.ibm.watson.developer_cloud.alchemy.v1.model.CombinedResults;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentAuthors;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentSentiment;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentText;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.DocumentTitle;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.Entities;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.Feeds;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.Keywords;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.Language;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.Microformats;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.SAORelations;
-import com.ibm.watson.developer_cloud.alchemy.v1.model.Taxonomies;
+import com.ibm.watson.developer_cloud.alchemy.v1.model.*;
+import com.ibm.watson.developer_cloud.alchemy.v1.util.AlchemyEndPoints;
+import com.ibm.watson.developer_cloud.alchemy.v1.util.AlchemyEndPoints.AlchemyAPI;
 import com.ibm.watson.developer_cloud.service.AlchemyService;
 import com.ibm.watson.developer_cloud.service.Request;
-import com.ibm.watson.developer_cloud.util.AlchemyEndPoints;
-import com.ibm.watson.developer_cloud.util.AlchemyEndPoints.AlchemyAPI;
 import com.ibm.watson.developer_cloud.util.ResponseUtil;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpRequestBase;
+
+import java.io.IOException;
+import java.util.Map;
 
 /**
  * The Alchemy Language service uses offers 12 text analysis services, each of which uses

src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyLanguage.java

@@ -28,8 +28,8 @@
 import com.ibm.watson.developer_cloud.alchemy.v1.model.ImageLink;
 import com.ibm.watson.developer_cloud.service.AlchemyService;
 import com.ibm.watson.developer_cloud.service.Request;
-import com.ibm.watson.developer_cloud.util.AlchemyEndPoints;
-import com.ibm.watson.developer_cloud.util.AlchemyEndPoints.AlchemyAPI;
+import com.ibm.watson.developer_cloud.alchemy.v1.util.AlchemyEndPoints;
+import com.ibm.watson.developer_cloud.alchemy.v1.util.AlchemyEndPoints.AlchemyAPI;
 import com.ibm.watson.developer_cloud.util.MediaType;
 import com.ibm.watson.developer_cloud.util.ResponseUtil;
 

src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/AlchemyVision.java

@@ -13,15 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ibm.watson.developer_cloud.util;
+
+package com.ibm.watson.developer_cloud.alchemy.v1.util;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 
-import java.io.FileNotFoundException;
-import java.io.FileReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -38,7 +40,8 @@ public class AlchemyEndPoints {
 	private static final Logger log = Logger.getLogger(AlchemyEndPoints.class.getName());
 
 	/**  The file where alchemy endpoints are described. */
-	private static final String filePath = "src/main/resources/alchemy_endpoints.json";
+	private static final String filePath = "/alchemy_endpoints.json";
+
 
 	/** The alchemy operations. */
 	private static Map<String, Map<String, String>> operations;
@@ -51,58 +54,58 @@ public class AlchemyEndPoints {
 	 * The AlchemyOperations.
 	 */
 	public enum AlchemyAPI {
-		
+
 		/** The entities. */
 		entities,
-		
+
 		/** The keywords. */
 		keywords,
-		
+
 		/** The concepts. */
 		concepts,
-		
+
 		/** The sentiment. */
 		sentiment,
-		
+
 		/** The sentiment_targeted. */
 		sentiment_targeted,
-		
+
 		/** The relations. */
 		relations,
-		
+
 		/** The language. */
 		language,
-		
+
 		/** The text. */
 		text,
-		
+
 		/** The text_raw. */
 		text_raw,
-		
+
 		/** The authors. */
 		authors,
-		
+
 		/** The feeds. */
 		feeds,
-		
+
 		/** The microformats. */
 		microformats,
-		
+
 		/** The title. */
 		title,
-		
+
 		/** The taxonomy. */
 		taxonomy,
-		
+
 		/** The combined. */
 		combined,
-		
+
 		/** The image_link. */
 		image_link,
-		
+
 		/** The image_keywords. */
 		image_keywords,
-		
+
 		/** The image_recognition. */
 		image_recognition
 	}
@@ -115,7 +118,13 @@ private static void loadEndPointsFromJsonFile() {
 		operations = new HashMap<String, Map<String, String>>();
 		JsonParser parser = new JsonParser();
 		try {
-			Object obj = parser.parse(new FileReader(filePath));
+			Reader fileReader = null;
+
+			InputStream is = AlchemyEndPoints.class.getResourceAsStream(filePath);
+			if (null != is) {
+				fileReader = new InputStreamReader(is);
+			}
+			Object obj = parser.parse(fileReader);
 			JsonObject jsonObject = (JsonObject) obj;
 			for (AlchemyAPI object : AlchemyAPI.values()) {
 				if (jsonObject.get(object.name()) == null)
@@ -131,8 +140,8 @@ private static void loadEndPointsFromJsonFile() {
 			}
 		} catch (JsonParseException e) {
 			log.log(Level.SEVERE, "Could not parse json file: " + filePath, e);
-		} catch (FileNotFoundException e) {
-			log.log(Level.SEVERE, "File not found: " + filePath, e);
+		} catch (NullPointerException e){
+			log.log(Level.SEVERE, "Not able to locate the end points json file: " + filePath, e);
 		}
 	}
 
@@ -150,7 +159,7 @@ public static String getPath(AlchemyAPI operation, String inputType) {
 		else {
 			String error = "Operation: "+ operation + ", inputType: "+inputType+" not found";
 			log.log(Level.SEVERE,error);
-            throw new IllegalArgumentException(error);
+			throw new IllegalArgumentException(error);
 		}
 	}
 

…veloper_cloud/util/AlchemyEndPoints.java …ud/alchemy/v1/util/AlchemyEndPoints.javasrc/main/java/com/ibm/watson/developer_cloud/util/AlchemyEndPoints.java renamed to src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/util/AlchemyEndPoints.java src/main/java/com/ibm/watson/developer_cloud/util/AlchemyEndPoints.java renamed to src/main/java/com/ibm/watson/developer_cloud/alchemy/v1/util/AlchemyEndPoints.java

@@ -52,7 +52,12 @@ public class ConceptInsights extends WatsonService {
      * The Constant ACCOUNT_ID. (value is "account_id")
      */
     public static final String ACCOUNT_ID = "account_id";
-
+    
+    /**
+     * The Constant CONCEPT_ID. (value is "concept_id")
+     */
+    public static final String CONCEPT_ID = "concept_id";
+    
     /**
      * The ACCOUNTS_PATH. (value is "/v2/accounts")
      */

src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsights.java

@@ -17,18 +17,11 @@
 
 import java.io.File;
 import java.io.InputStream;
-import java.lang.reflect.Type;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
 import com.ibm.watson.developer_cloud.document_conversion.v1.DocumentConversion;
 import com.ibm.watson.developer_cloud.util.MediaType;
 

src/main/java/com/ibm/watson/developer_cloud/document_conversion/v1/helpers/ConversionUtils.java

@@ -24,7 +24,7 @@
 public class GsonSingleton {
 
 	/** The Constant DATE_FORMAT_UTC. */
-	private static final String DATE_FORMAT_UTC = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+	private static final String DATE_FORMAT_UTC = "yyyy-MM-dd'T'HH:mm:ss.SSSX";
 	/** The gson. */
 	private static Gson gson;