From 9ce34841e6519d3a52d8b7044e2b503a020d0e33 Mon Sep 17 00:00:00 2001 From: Stephen Sawchuk Date: Tue, 3 Feb 2015 09:51:20 -0500 Subject: [PATCH] remove related, unused methods --- lib/datastore/entity.js | 56 ---------------------------------------- test/datastore/entity.js | 8 ------ 2 files changed, 64 deletions(-) diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js index ed58da03b682..adfe11869878 100644 --- a/lib/datastore/entity.js +++ b/lib/datastore/entity.js @@ -21,18 +21,6 @@ 'use strict'; -/** @type {object} */ -var entityMeta = {}; - -/** @const {regexp} Regular expression to verify a field name. */ -var FIELD_NAME_REGEX = /^[A-Za-z]*$/; - -/** @const {regexp} Regular expression to verify a Kind. */ -var KIND_REGEX = /^[A-Za-z]*$/; - -/** @const {regexp} Regular Expression to verify a namespace. */ -var NAMESPACE_REGEX = /^[A-Za-z]*$/; - /** @const {object} Map for query operation -> operation protocol value. */ var OP_TO_OPERATOR = { '=': 'EQUAL', @@ -43,16 +31,6 @@ var OP_TO_OPERATOR = { 'HAS_ANCESTOR': 'HAS_ANCESTOR' }; -/** @const {array} A list of native objects. */ -var PRIMITIVE_KINDS = [ - Object, - Boolean, - Number, - String, - Date, - Buffer -]; - /** @const {object} Conversion map for query sign -> order protocol value. */ var SIGN_TO_ORDER = { '-': 'DESCENDING', @@ -592,40 +570,6 @@ function queryToQueryProto(q) { module.exports.queryToQueryProto = queryToQueryProto; -/** - * Validate a field. - * - * @throws Throws an Error if the field doesn't validate. - * - * @param {string} name - Field name. - * @param {object} field - Field metadata object. - * @param {string} field.key - Field key. - * @param {*} field.kind - Field Kind. - * - * @example - * validateField('title', { - * kind: String - * }); - * // undefined (no errors thrown.) - */ -function validateField(name, field) { - if (!FIELD_NAME_REGEX.test(name)) { - throw new Error('Field name should match ' + FIELD_NAME_REGEX); - } - if (!field.kind) { - throw new Error('Provide a kind for field ' + name); - } - if (typeof field.kind !== 'object' && - PRIMITIVE_KINDS.indexOf(field.kind) === -1) { - throw new Error('Unknown kind for field ' + name); - } - if (typeof field.kind === 'object') { - Object.keys(field.key).forEach(function(key) { - validateField(key, field.key[key]); - }); - } -} - /** * Does a value exist? * diff --git a/test/datastore/entity.js b/test/datastore/entity.js index 1187278c75bb..88fecfabd66d 100644 --- a/test/datastore/entity.js +++ b/test/datastore/entity.js @@ -23,14 +23,6 @@ var entity = require('../../lib/datastore/entity.js'); var datastore = require('../../lib/datastore'); var ByteBuffer = require('bytebuffer'); -var blogPostMetadata = { - title: { kind: String, indexed: true }, - tags: { kind: String, multi: true, indexed: true }, - publishedAt: { kind: Date }, - author: { kind: Object, indexed: true }, - isDraft: { kind: Boolean, indexed: true } -}; - var entityProto = { 'property': [{ 'name': 'linkedTo',