Added JSON schema compiler support for serialized types

tools/json_schema_compiler/model.py

Index: tools/json_schema_compiler/model.py
diff --git a/tools/json_schema_compiler/model.py b/tools/json_schema_compiler/model.py
index 5453e11c40a11a6abe9425d5df2a8e997ab726b5..6dd8ccf014812af26018acf20f7b21e4277ebf96 100644
--- a/tools/json_schema_compiler/model.py
+++ b/tools/json_schema_compiler/model.py
@@ -150,6 +150,8 @@ class Property(object):
   - |optional| a boolean representing whether the property is optional
   - |description| a description of the property (if provided)
   - |type_| the model.PropertyType of this property
+  - |serialized_type| the model.PropertyType that this property should be
+    serialized to. Will be None if it's missing from the JSON.
   - |ref_type| the type that the REF property is referencing. Can be used to
     map to its model.Type
   - |item_type| a model.Property representing the type of each element in an
@@ -175,6 +177,7 @@ class Property(object):
     self.from_json = from_json
     self.from_client = from_client
     self.instance_of = json.get('isInstanceOf', None)
+    self.serialized_type = None
     _AddProperties(self, json)
     if is_additional_properties:
       self.type_ = PropertyType.ADDITIONAL_PROPERTIES
@@ -216,6 +219,17 @@ class Property(object):
         self.type_ = PropertyType.BINARY
       else:
         raise ParseException(self, 'type ' + json_type + ' not recognized')
+
+      if 'serialized_type' in json:
+        json_serialized_type = json['serialized_type']
+        if json_serialized_type == 'integer':
+          self.serialized_type = PropertyType.INTEGER
+        elif json_serialized_type == 'int64':
+          self.serialized_type = PropertyType.INT64
+        else:

[not at google - send to devlin, 2012/07/26 04:51:42]

this might as well be the same code that parses 'type' into a PropertyType. Can
you pull that into a helper?

Let code that uses the model support what it can.

[mitchellwrosen, 2012/07/26 20:00:27]

Hmm. Correct me if I'm wrong but it may not make sense to consider the same set
of types valid for both type_ and compiled_type. What about gurl and int64?
Those could only exist on the c++ side. Furthermore, it may be awkward to pull
into a helper function because there is special handling in the case that
json_type is an array or an object.

What do you think?

[not at google - send to devlin, 2012/07/27 04:14:28]

Yes, that's true. Hmm.

For for the types that only make sense for compiled code, that can be left to
the generators to figure out; nothing bad will happen.

For the types where special stuff is done, we can easily pull that out into
here. Like,

def _JsonTypeToPropertyType(json_type):
  if json_type == 'string':
    return PropertyType.STRING
  if json_type == 'any':
    return PropertyType.ANY
  ...
  if json_type == 'int64'
    return PropertyType.INT_64
  raise NotImplementedError(...)

then here,

self.type_ = _JsonToPropertyType(json['type'])
if self.type_ is PropertyType.ARRAY:
  # normal array stuff
elif self.type_ = PropertyType.OBJECT:
  # normal object stuff

compiled_type = json.get('compiled_type', None)
if compiled_type:
  self.compiled_type = _JsonToPropertyType(compiled_type)

[mitchellwrosen, 2012/07/30 20:52:45]

Done.

+          # TODO(mwrosen): Support more types as necessary.
+          raise ParseException(self, 'type ' + json_serialized_type +
+              ' not recognized')
     elif 'choices' in json:
       if not json['choices'] or len(json['choices']) == 0:
         raise ParseException(self, 'Choices has no choices')
@@ -285,6 +299,7 @@ class PropertyType(object):
       return self.name
 
   INTEGER = _Info(True, "INTEGER")
+  INT64 = _Info(True, "INT64")

[not at google - send to devlin, 2012/07/26 04:51:42]

ooh maybe we can use this to serialize GURLs directly later!

[mitchellwrosen, 2012/07/26 20:00:27]

What do you mean?

[not at google - send to devlin, 2012/07/27 04:14:28]

I made this comment first. Just meant what I said about GURL earlier.

   DOUBLE = _Info(True, "DOUBLE")
   BOOLEAN = _Info(True, "BOOLEAN")
   STRING = _Info(True, "STRING")