Merge pull request #12 from webcc/v0.3

V0.3 Rewrite of API for CriteriaQueries + improvements
webcc · Oct 2, 2015 · 3941c60 · 3941c60
2 parents 838fc63 + 98dc563
commit 3941c60
Show file tree

Hide file tree

Showing 12 changed files with 388 additions and 376 deletions.
diff --git a/index.js b/index.js
@@ -1,10 +1,8 @@
 "use strict";
 module.exports = {
     MetaModel: require("./lib/MetaModel"),
-    Criterion: require("./lib/Criterion"),
-    CriterionType: require("./lib/CriterionType"),
     JPAConfiguration: require("./lib/JPAConfiguration"),
-    QueryBuilder: require("./lib/QueryBuilder"),
+    CriteriaBuilder: require("./lib/CriteriaBuilder"),
     PersistenceUtils: require("./lib/PersistenceUtils"),
     Persistence: require("./lib/Persistence"),
     EntityManager: require("./lib/EntityManager"),

diff --git a/lib/Criterion.js b/lib/Criterion.js
diff --git a/lib/CriterionType.js b/lib/CriterionType.js
diff --git a/lib/DefaultRowInterceptor.js b/lib/DefaultRowInterceptor.js
@@ -1,4 +1,5 @@
 "use strict";
+let typly = require("typly").instance();
 let err = require("./errors");
 let PersistenceUtils = require("./PersistenceUtils");
 let TimeUuid = require('cassandra-driver').types.TimeUuid;
@@ -10,21 +11,21 @@ module.exports = class DefaultRowInterceptor {
         this.fieldTypes.set("timeuuid", DefaultRowInterceptor.toUuid);
         this.fieldTypes.set("text", DefaultRowInterceptor.toText);
         this.fieldTypes.set("varchar", DefaultRowInterceptor.toText);
-        this.fieldTypes.set("map<text,bigint>", DefaultRowInterceptor.toMapText);
         this.fieldTypes.set("list<text>", DefaultRowInterceptor.toListText);
         this.fieldTypes.set("list<timeuuid>", DefaultRowInterceptor.toListTimeUuid);
         this.validate();
     }
 
     toRow(type, propertyValue, entityClass)
     {
+        typly.assertString(type);
+        typly.assertObject(entityClass);
         type = type.replace(/\s+/g, '').toLowerCase();
         let row = null;
         if (propertyValue === null)
         {
             return null;
         }
-        // if(typeof type === "undefined" || type === null )
         if (this.fieldTypes.has(type))
         {
             let func = this.fieldTypes.get(type);
@@ -41,27 +42,6 @@ module.exports = class DefaultRowInterceptor {
         return row;
     }
 
-    static toMapText(propertyValue, entityClass)
-    {
-        let row = new Map();
-        if (propertyValue instanceof Map === false)
-        {
-            throw new TypeError("Expecting Map type");
-        }
-        propertyValue.forEach((value, key, map) =>
-        {
-            if (typeof value === "object" && value instanceof entityClass)
-            {
-                row.set(key, JSON.stringify(value));
-            }
-            else
-            {
-                row.set(key, value);
-            }
-        });
-        return row;
-    }
-
     static toListTimeUuid(propertyValue, entityClass)
     {
         if (Array.isArray(propertyValue))
@@ -75,11 +55,11 @@ module.exports = class DefaultRowInterceptor {
         }
     }
 
-    static toListText(propertyValue, entityClass)
+    static toListText(propertyValue)
     {
+        let properties = [];
         if (Array.isArray(propertyValue))
         {
-            let properties = [];
             propertyValue.forEach((pro) =>
             {
                 if (typeof pro === "object")
@@ -91,8 +71,8 @@ module.exports = class DefaultRowInterceptor {
                     properties.push(pro);
                 }
             });
-            return properties;
         }
+        return properties;
     }
 
     static toUuid(propertyValue)
@@ -122,5 +102,4 @@ module.exports = class DefaultRowInterceptor {
             }
         });
     }
-};
-
+};
diff --git a/lib/Entity.js b/lib/Entity.js
@@ -45,15 +45,12 @@ module.exports = class Entity {
                 {
                     obj[newKey] = property;
                 }
-                else if (property instanceof Map)
+                else if(property instanceof Map)
                 {
                     let arr = [];
                     for (let pair of property)
                     {
-                        let o = {
-                            key: pair[0],
-                            value: pair[1]
-                        };
+                        let o = [pair[0], pair[1]];
                         arr.push(o);
                     }
                     obj[newKey] = arr;