Merge pull request #6 from tcruzibt/master

Maven architecture fix

RealtimeStorageJava.iml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="gson-2.3.1" level="application" />
+    <orderEntry type="library" name="jackson-annotations-2.2.3" level="application" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.2.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.2.3" level="project" />
+    <orderEntry type="library" name="Maven: co.realtime:messaging:2.1.20" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.2.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
+  </component>
+</module>

library/pom.xml → pom.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <groupId>co.realtime</groupId>
     <artifactId>storage</artifactId>
     <version>1.0.20</version>
     <packaging>jar</packaging>
     <name>Storage</name>
     <description>Realtime Cloud Storage SDK for Java</description>
-    <modelVersion>4.0.0</modelVersion>
     <url> https://github.com/realtime-framework/RealtimeStorage-Java</url>
     <licenses>
         <license>
@@ -82,6 +83,11 @@
         </plugins>
     </build>
     <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
@@ -113,4 +119,5 @@
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
     </distributionManagement>
+
 </project>

library/src/co/realtime/storage/StorageRef.java → src/main/java/co/realtime/storage/StorageRef.java

@@ -171,7 +171,7 @@ public StorageRef(String applicationKey, String privateKey, String authenticatio
 	 * 		The application key
 	 * @param privateKey
 	 * 		The private key
-	 * @throws co.realtime.storage.ext.StorageException
+	 * @throws StorageException
 	 */
 	public StorageRef(String applicationKey, String privateKey) throws StorageException {
 		this(applicationKey, privateKey, null);

library/src/co/realtime/storage/TableRef.java → src/main/java/co/realtime/storage/TableRef.java

@@ -63,7 +63,7 @@ public class TableRef {
 	 * 		The callback to call if an exception occurred
 	 * @return Table reference
 	 * 
-	 * @deprecated use {@link create( co.realtime.storage.entities.Key key, StorageProvisionType provisionType, StorageProvisionLoad provisionLoad, co.realtime.storage.ext.OnTableCreation onTableCreation, co.realtime.storage.ext.OnError onError)} instead.
+	 * @deprecated use {@link create( Key key, StorageProvisionType provisionType, StorageProvisionLoad provisionLoad, OnTableCreation onTableCreation, OnError onError)} instead.
 	 */
 	@Deprecated
 	public TableRef create(String primaryKeyName, StorageDataType primaryKeyDataType, StorageProvisionType provisionType,
@@ -94,7 +94,7 @@ public TableRef create(String primaryKeyName, StorageDataType primaryKeyDataType
 	 * 		The callback to call if an exception occurred
 	 * @return Table reference
 	 * 
-	 * @deprecated use {@link create( co.realtime.storage.entities.Key key, StorageProvisionType provisionType, StorageProvisionLoad provisionLoad, co.realtime.storage.ext.OnTableCreation onTableCreation, co.realtime.storage.ext.OnError onError)} instead.
+	 * @deprecated use {@link create( Key key, StorageProvisionType provisionType, StorageProvisionLoad provisionLoad, OnTableCreation onTableCreation, OnError onError)} instead.
 	 */
 	@Deprecated
 	public TableRef create(String primaryKeyName, StorageDataType primaryKeyDataType, String secondaryKeyName, 
@@ -158,7 +158,7 @@ public TableRef create(Key key, Throughput throughput, OnTableCreation onTableCr
 	 * @param onError
 	 * 		Response if client side validation failed or if an error was returned from the server.
 	 * @return Table reference
-	 * @throws co.realtime.storage.ext.StorageException
+	 * @throws StorageException
 	 */
 	public TableRef create(Key key, StorageProvisionType provisionType, StorageProvisionLoad provisionLoad, OnTableCreation onTableCreation, OnError onError) throws StorageException {
 		if(provisionLoad == StorageProvisionLoad.CUSTOM || provisionType == StorageProvisionType.CUSTOM) {

library/src/co/realtime/storage/security/TablePolicy.java → src/main/java/co/realtime/storage/security/TablePolicy.java

@@ -110,7 +110,7 @@ public void setAccessRules(Access access, EnumSet<Rule> rules) {
 	/**
 	 * Sets the access rules.
 	 * 
-	 * @param access The access rules applied to the table.
+	 * @param accessRules The access rules applied to the table.
 	 */
 	public void setAccessRules(HashMap<Access, EnumSet<Rule>> accessRules) {
 		this.accessRules = accessRules;

library/library.iml → storage.iml

@@ -4,12 +4,13 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="lib" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.2.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.2.3" level="project" />