Merge branch 'develop'

Conflicts:
	README.md

Author: djhvscf

.classpath

@@ -2,9 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Users/Dennis Hernandez/Documents/GitHub/mockaroo.api/dependencies/commons-io-1.3.2.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Dennis Hernandez/Documents/GitHub/mockaroo.api/dependencies/json-20140107.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Dennis Hernandez/Documents/GitHub/mockaroo.api/dependencies/jxl.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Dennis Hernandez/Documents/GitHub/mockaroo.api/dependencies/mysql-connector-java-5.1.31.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Dennis/Documents/GitHub/mockaroo.api/dependencies/commons-io-1.3.2.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Dennis/Documents/GitHub/mockaroo.api/dependencies/json-20140107.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Dennis/Documents/GitHub/mockaroo.api/dependencies/jxl.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Dennis/Documents/GitHub/mockaroo.api/dependencies/mysql-connector-java-5.1.31.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -1,4 +1,3 @@
 *.project
 .classpath
-*.classpath
-.settings/
+.settings/

README.md

@@ -1,7 +1,7 @@
 Mockaroo API
 ================
 
-Mockaroo API is an API that let us generate random data and insert into our data base. That's it.<br />
+Mockaroo API is an API that let us generate random data and insert into our data bases, create .xml, .xls, .json files. That's it.<br />
 This API is based in JSON Objects.
 
 Author Homepage:      http://djhv92.wix.com/dennishernandez<br />
@@ -32,12 +32,15 @@ How to use it?
 		
 		mockarooApi.Insert(data, dataAccess, "tableName", columnsTable);//Insert into a data base
 		
-		MockarooFile test = new MockarooExcel("c:/temp/","test","testing","en", "EN");
-	    test.write(data); //Generate a Excel file
+		MockarooFile excel = new MockarooExcel("c:/temp/","test","testing","en", "EN");
+	    excel.write(data); //Generate a Excel file
 	    
 	    MockarooFile json = new MockarooJSON("c:/temp/", "test");
 	    json.write(data); //Generate a .json file
-
+	    
+	    MockarooFile xml = new MockarooXML("c:/temp/", "test", "lala");
+		xml.write(data);
+	    
 Dependencies
 =============
 Not yet.
@@ -53,3 +56,7 @@ Version: 0.1.0 - 18/July/2014
 Download mockarooapi.jar
 =======================
 https://github.com/djhvscf/mockaroo.api/releases/download/v0.1.0/mockarooapi.jar
+<<<<<<< HEAD
+=======
+
+>>>>>>> develop

bin/.gitignore

@@ -1,2 +1 @@
-/testMockarooApi
 /com

bin/com/mockaroo/api/MockarooApi.class

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.sql.SQLException;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -11,9 +10,8 @@
 import com.mockaroo.api.classes.MockarooUrl;
 import com.mockaroo.api.exceptions.MockarooExceptionJSONArray;
 import com.mockaroo.api.exceptions.MockarooExceptionPing;
-import com.mockaroo.api.helpers.MockarooApiHelper;
 import com.mockaroo.api.helpers.MockarooPingHelper;
-import com.mockaroo.api.interfaces.IUrl;
+import com.mockaroo.api.interfaces.IMockarooUrl;
 
 /**
  * Class base to MockarooApi
@@ -23,14 +21,11 @@
  */
 public class MockarooApi {
 
-	private final IUrl url;
+	private final IMockarooUrl url;
 	private String key;
 	private String contentType;
 	private int countRegister;
 	private final MockarooCreateJSONObject creater;
-	private MockarooApiHelper mockarooApiHelper;
-	private static final String messageExceptionInsertError = "An error ocurred inserting the data";
-	private static final String INSERT_INTO = "INSERT INTO ";
 
 	/**
 	 * Constructor
@@ -47,7 +42,6 @@ public MockarooApi(String key, String contentType) throws MockarooExceptionPing
 		this.setCountRegister(-1);
 		url = MockarooUrl.getInstance(key, contentType);
 		creater = new MockarooCreateJSONObject();
-		mockarooApiHelper = new MockarooApiHelper();
 	}
 
 	/**
@@ -66,7 +60,6 @@ public MockarooApi(String key, String contentType, int countRegister) throws Moc
 		this.setCountRegister(countRegister);
 		url = MockarooUrl.getInstance(key, contentType);
 		creater = new MockarooCreateJSONObject();
-		mockarooApiHelper = new MockarooApiHelper();
 	}
 
 	/**
@@ -103,9 +96,9 @@ private void setKey(String key) {
 
 	/**
 	 * Get the url
-	 * @return {@link IUrl}
+	 * @return {@link IMockarooUrl}
 	 */
-	public IUrl getUrl() {
+	public IMockarooUrl getUrl() {
 		return url;
 	}
 
@@ -157,23 +150,4 @@ public JSONArray getJSONArray(HttpURLConnection conn, JSONArray columns) throws
 	{
 		return MockarooJSON.getJSONArray(conn, columns, this.getCountRegister());
 	}
-	
-	/**
-	 * Insert into the database specified
-	 * @param jsonObject JSONObject with the information
-	 * @param dataAccess Object Data Access layer
-	 * @param tableName Table to insert
-	 * @param values Values of the table
-	 * @throws ClassNotFoundException
-	 * @throws SQLException
-	 */
-	public void Insert(JSONObject jsonObject, MockarooDataAccess dataAccess, String tableName, String[] values) throws ClassNotFoundException, SQLException
-	{
-		String insertQuery = INSERT_INTO + tableName + mockarooApiHelper.generateValues(values) + 
-								mockarooApiHelper.generateValuesInsert(jsonObject);
-		if(!dataAccess.Insert(insertQuery))
-		{
-			throw new SQLException(messageExceptionInsertError);
-		}
-	}
 }

bin/com/mockaroo/api/MockarooDataAccess.class

@@ -3,30 +3,50 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.sql.Statement;
+
+import org.json.JSONObject;
+
+import com.mockaroo.api.exceptions.MockarooExceptionValue;
+import com.mockaroo.api.helpers.MockarooDataAccessHelper;
+import com.mockaroo.api.helpers.MockarooValidatorHelper;
+import com.mockaroo.api.interfaces.IMockarooDataAccessHelper;
+import com.mockaroo.api.interfaces.IMockarooValidatorHelper;
 
 /**
  * Data access layer
  * @author Dennis Hernández Vargas
- * @version 0.1.0
- * @since 16/July/2014
+ * @version 0.1.1
+ * @since 19/July/2014
  */
 public class MockarooDataAccess {
 
 	private String driverClassName;
     private String url;
     private String username; 
     private String password;
+    private IMockarooValidatorHelper validator = MockarooValidatorHelper.getInstance();
+    private IMockarooDataAccessHelper mockarooDataAccessHelper;
+	public static final String messageExceptionDriver = "The driver class name can't be empty";
+	public static final String messageExceptionUrl = "The url server can't be empty";
+	public static final String messageExceptionUsername = "The password can't be empty";
+	public static final String messageExceptionPassword = "The password can't be empty";
 
     /**
      * Default constructor
      * @param driverClassName Driver class name
      * @param url Server url
      * @param username User name
      * @param password User password
+     * @throws MockarooExceptionValue 
      */
-    public MockarooDataAccess(String driverClassName, String url, String username, String password)
+    public MockarooDataAccess(String driverClassName, String url, String username, String password) throws MockarooExceptionValue
     {
+    	validator.validateString(driverClassName, messageExceptionDriver);
+    	validator.validateString(url, messageExceptionUrl);
+    	validator.validateString(username, messageExceptionUsername);
+    	validator.validateString(password, messageExceptionPassword);
+    	
+    	mockarooDataAccessHelper = MockarooDataAccessHelper.getInstance();
     	this.setDriverClassName(driverClassName);
     	this.setUrl(url);
     	this.setUsername(username);
@@ -116,10 +136,8 @@ private void setPassword(String password) {
      * @throws ClassNotFoundException
      * @throws SQLException
      */
-	protected boolean Insert(String sql) throws ClassNotFoundException, SQLException
+	protected void Insert(String tableName, JSONObject jsonObject, String[] values) throws ClassNotFoundException, SQLException
 	{
-		Statement statement;
-		statement = this.getConnection().createStatement();
-		return !statement.execute(sql);
+		mockarooDataAccessHelper.Insert(tableName, jsonObject, values, this.getConnection());
 	}
 }

bin/com/mockaroo/api/MockarooJSON.class

@@ -8,8 +8,11 @@
 import jxl.write.WriteException;
 
 import com.mockaroo.api.classes.MockarooFile;
+import com.mockaroo.api.exceptions.MockarooExceptionValue;
 import com.mockaroo.api.helpers.MockarooExcelHelper;
+import com.mockaroo.api.helpers.MockarooValidatorHelper;
 import com.mockaroo.api.interfaces.IMockarooExcelHelper;
+import com.mockaroo.api.interfaces.IMockarooValidatorHelper;
 
 /**
  * Class to create a Excel file
@@ -27,6 +30,13 @@ public class MockarooExcel extends MockarooFile {
 	private String language;
 	private String country;
 	private static final String EXTENSION = ".xls";
+	private IMockarooValidatorHelper validator = MockarooValidatorHelper.getInstance();
+	public String messageExceptionPath = "The path can't be empty";
+	public String messageExceptionInputFileName = "The input file namee can't be empty";
+	public String messageExceptionSheetName = "The sheet name can't be empty";
+	public String messageExceptionLanguage = "The language can't be empty";
+	public String messageExceptionCountry = "The country can't be empty";
+	
 
 	/**
 	 * Constructor
@@ -36,10 +46,17 @@ public class MockarooExcel extends MockarooFile {
 	 * @param language Language
 	 * @param country Country
 	 * @throws WriteException 
+	 * @throws MockarooExceptionValue 
 	 */
 	public MockarooExcel(String path, String inputFileName, String sheetName, String language, String country)
-			throws WriteException
+			throws WriteException, MockarooExceptionValue
 	{
+		validator.validateString(path, messageExceptionPath);
+		validator.validateString(inputFileName, messageExceptionInputFileName);
+		validator.validateString(sheetName, messageExceptionSheetName);
+		validator.validateString(language, messageExceptionLanguage);
+		validator.validateString(country, messageExceptionCountry);
+		
 		mockarooExcel = MockarooExcelHelper.getInstance();
 		this.setPath(path);
 		this.setInputFileName(inputFileName + EXTENSION);
@@ -55,10 +72,15 @@ public MockarooExcel(String path, String inputFileName, String sheetName, String
 	 * @param inputFileName Excel file name
 	 * @param sheetName Excel sheet name
 	 * @throws WriteException 
+	 * @throws MockarooExceptionValue 
 	 */
 	public MockarooExcel(String path, String inputFileName, String sheetName) 
-			throws WriteException
+			throws WriteException, MockarooExceptionValue
 	{
+		validator.validateString(path, messageExceptionPath);
+		validator.validateString(inputFileName, messageExceptionInputFileName);
+		validator.validateString(sheetName, messageExceptionSheetName);
+		
 		mockarooExcel = MockarooExcelHelper.getInstance();
 		this.setPath(path);
 		this.setInputFileName(inputFileName);

bin/com/mockaroo/api/classes/MockarooUrl.class

@@ -12,7 +12,11 @@
 
 import com.mockaroo.api.classes.MockarooFile;
 import com.mockaroo.api.exceptions.MockarooExceptionJSONArray;
+import com.mockaroo.api.exceptions.MockarooExceptionValue;
 import com.mockaroo.api.helpers.MockarooJSONHelper;
+import com.mockaroo.api.helpers.MockarooValidatorHelper;
+import com.mockaroo.api.interfaces.IMockarooJSONHelper;
+import com.mockaroo.api.interfaces.IMockarooValidatorHelper;
 
 /**
  * Class base to Mockaroo JSON
@@ -23,29 +27,28 @@
 public class MockarooJSON extends MockarooFile {
 
 	private static final String messageExceptionJSONArray = "The count parameter can't be less than 0 or equal";
-	private MockarooJSONHelper jsonHelper;
+	private IMockarooJSONHelper jsonHelper;
 	private String fileName;
 	private static final String EXTENSION = ".json";
+	private IMockarooValidatorHelper validator = MockarooValidatorHelper.getInstance();
+	private static final String messageExceptionPath = "The path can't be empty";
+	private static final String messageExceptionFileName = "The file name can't be empty";
 
 	/**
 	 * Constructor
 	 * @param path Where save the file .json
 	 * @param fileName File name
+	 * @throws MockarooExceptionValue 
 	 */
-	public MockarooJSON(String path, String fileName)
+	public MockarooJSON(String path, String fileName) throws MockarooExceptionValue
 	{
-		this.setJsonHelper(new MockarooJSONHelper());
+		validator.validateString(path, messageExceptionPath);
+		validator.validateString(fileName, messageExceptionFileName);
+		
+		jsonHelper = MockarooJSONHelper .getInstance();
 		this.setFileName(path + fileName + EXTENSION);
 	}
 
-	/**
-	 * Get the json helper to write a .json
-	 * @return the jsonHelper
-	 */
-	private MockarooJSONHelper getJsonHelper() {
-		return jsonHelper;
-	}
-
 	/**
 	 * Get the file name
 	 * @return the fileName
@@ -54,14 +57,6 @@ private String getFileName() {
 		return fileName;
 	}
 
-	/**
-	 * Set the json helper
-	 * @param jsonHelper the jsonHelper to set
-	 */
-	private void setJsonHelper(MockarooJSONHelper jsonHelper) {
-		this.jsonHelper = jsonHelper;
-	}
-
 	/**
 	 * Set the file name
 	 * @param fileName the fileName to set
@@ -111,6 +106,6 @@ public static JSONArray getJSONArray(HttpURLConnection conn, JSONArray columns,
 	@Override
 	public void write(JSONObject jsonObject) throws IOException, WriteException 
 	{
-		this.getJsonHelper().write(this.getFileName(), jsonObject);
+		jsonHelper.write(this.getFileName(), jsonObject);
 	}
 }