Mojo: validate nullability in Java serialization.

mojo/public/tools/bindings/generators/mojom_java_generator.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Generates java source files from a mojom.Module."""
 
 import argparse
 import ast
 import os
 import re
@@ skipping 147 matching lines @@
     if mojom.IsNullableKind(kind):
         flags_to_set.append(ARRAY_NULLABLE)
     if mojom.IsNullableKind(kind.kind):
         flags_to_set.append(ELEMENT_NULLABLE)
 
     if not flags_to_set:
         flags_to_set = [NOTHING_NULLABLE]
     return " | ".join(flags_to_set)
 
 
-@contextfilter
-def DecodeMethod(context, kind, offset, bit):
-  def _DecodeMethodName(kind):
-    if mojom.IsAnyArrayKind(kind):
-      return _DecodeMethodName(kind.kind) + 's'
-    if mojom.IsEnumKind(kind):
-      return _DecodeMethodName(mojom.INT32)
-    if mojom.IsInterfaceRequestKind(kind):
-      return "readInterfaceRequest"
-    if mojom.IsInterfaceKind(kind):
-      return "readServiceInterface"
-    return _spec_to_decode_method[kind.spec]
-  methodName = _DecodeMethodName(kind)
-  params = [ str(offset) ]
+def AppendEncodeDecodeParams(params, context, kind, bit):
+  """ Appends standard parameters shared between encode and decode calls. """
   if (kind == mojom.BOOL):
     params.append(str(bit))
   if mojom.IsReferenceKind(kind):
     if mojom.IsAnyArrayKind(kind):
       params.append(GetArrayNullabilityFlags(kind))
     else:
       params.append(GetJavaTrueFalse(mojom.IsNullableKind(kind)))
   if mojom.IsAnyArrayKind(kind):
     if mojom.IsFixedArrayKind(kind):
       params.append(str(kind.length))
     else:
       params.append(
         "org.chromium.mojo.bindings.BindingsHelper.UNSPECIFIED_ARRAY_LENGTH");
   if mojom.IsInterfaceKind(kind):
     params.append('%s.MANAGER' % GetJavaType(context, kind))
   if mojom.IsAnyArrayKind(kind) and mojom.IsInterfaceKind(kind.kind):
     params.append('%s.MANAGER' % GetJavaType(context, kind.kind))
+  return params

[qsr, 2014/09/03 07:56:28]

This is modifying its argument, you might not want to return something, because
otherwise user might think that the first argument is not modified.

Or if you indeed prefer to return something, then make a copy of the array at
the beginning. 

[ppi, 2014/09/03 08:53:46]

Done.

+
+
+@contextfilter
+def DecodeMethod(context, kind, offset, bit):
+  def _DecodeMethodName(kind):
+    if mojom.IsAnyArrayKind(kind):
+      return _DecodeMethodName(kind.kind) + 's'
+    if mojom.IsEnumKind(kind):
+      return _DecodeMethodName(mojom.INT32)
+    if mojom.IsInterfaceRequestKind(kind):
+      return "readInterfaceRequest"
+    if mojom.IsInterfaceKind(kind):
+      return "readServiceInterface"
+    return _spec_to_decode_method[kind.spec]
+  methodName = _DecodeMethodName(kind)
+  params = AppendEncodeDecodeParams([ str(offset) ], context, kind, bit)
   return '%s(%s)' % (methodName, ', '.join(params))
 
 @contextfilter
 def EncodeMethod(context, kind, variable, offset, bit):
-  params = [ variable, str(offset) ]
-  if (kind == mojom.BOOL):
-    params.append(str(bit))
-  if mojom.IsAnyArrayKind(kind):
-    if mojom.IsFixedArrayKind(kind):
-      params.append(str(kind.length))
-    else:
-      params.append(
-        "org.chromium.mojo.bindings.BindingsHelper.UNSPECIFIED_ARRAY_LENGTH");
-  if mojom.IsInterfaceKind(kind):
-    params.append('%s.MANAGER' % GetJavaType(context, kind))
-  if mojom.IsAnyArrayKind(kind) and mojom.IsInterfaceKind(kind.kind):
-    params.append('%s.MANAGER' % GetJavaType(context, kind.kind))
+  params = AppendEncodeDecodeParams(
+      [ variable, str(offset) ], context, kind, bit)
   return 'encode(%s)' % ', '.join(params)
 
 def GetPackage(module):
   if 'JavaPackage' in module.attributes:
     return ParseStringAttribute(module.attributes['JavaPackage'])
   # Default package.
   return "org.chromium.mojom." + module.namespace
 
 def GetNameForKind(context, kind):
   def _GetNameHierachy(kind):
@@ skipping 235 matching lines @@
   def GetJinjaParameters(self):
     return {
       'lstrip_blocks': True,
       'trim_blocks': True,
     }
 
   def GetGlobals(self):
     return {
       'module': self.module,
     }