Revert of mojo: generate Proxies and Stubs for java bindings.

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

Index: mojo/public/tools/bindings/generators/mojom_java_generator.py
diff --git a/mojo/public/tools/bindings/generators/mojom_java_generator.py b/mojo/public/tools/bindings/generators/mojom_java_generator.py
index 9855eee08753d6cf0e02093118b1954a8b6c2db4..829582115b84c606517639aeb2c03f221f4f5ac1 100644
--- a/mojo/public/tools/bindings/generators/mojom_java_generator.py
+++ b/mojo/public/tools/bindings/generators/mojom_java_generator.py
@@ -153,9 +153,9 @@
   if (kind == mojom.BOOL):
     additionalParams = ', %d' % bit
   if mojom.IsInterfaceKind(kind):
-    additionalParams = ', %s.MANAGER' % GetJavaType(context, kind)
+    additionalParams = ', %s.BUILDER' % GetJavaType(context, kind)
   if mojom.IsAnyArrayKind(kind) and mojom.IsInterfaceKind(kind.kind):
-    additionalParams = ', %s.MANAGER' % GetJavaType(context, kind.kind)
+    additionalParams = ', %s.BUILDER' % GetJavaType(context, kind.kind)
   return '%s(%s%s)' % (methodName, offset, additionalParams)
 
 @contextfilter
@@ -164,9 +164,9 @@
   if (kind == mojom.BOOL):
     additionalParams = ', %d' % bit
   if mojom.IsInterfaceKind(kind):
-    additionalParams = ', %s.MANAGER' % GetJavaType(context, kind)
+    additionalParams = ', %s.BUILDER' % GetJavaType(context, kind)
   if mojom.IsAnyArrayKind(kind) and mojom.IsInterfaceKind(kind.kind):
-    additionalParams = ', %s.MANAGER' % GetJavaType(context, kind.kind)
+    additionalParams = ', %s.BUILDER' % GetJavaType(context, kind.kind)
   return 'encode(%s, %s%s)' % (variable, offset, additionalParams)
 
 def GetPackage(module):
@@ -268,14 +268,6 @@
   sub_kind = kind.kind
   return mojom.IsObjectKind(sub_kind)
 
-def GetResponseStructFromMethod(method):
-  return generator.GetDataHeader(
-      False, generator.GetResponseStructFromMethod(method))
-
-def GetStructFromMethod(method):
-  return generator.GetDataHeader(
-      False, generator.GetStructFromMethod(method))
-
 def GetConstantsMainEntityName(module):
   if 'JavaConstantsClassName' in module.attributes:
     return ParseStringAttribute(module.attributes['JavaConstantsClassName'])
@@ -284,21 +276,6 @@
   return (UpperCamelCase(module.path.split('/')[-1].rsplit('.', 1)[0]) +
           'Constants')
 
-def GetMethodOrdinalName(method):
-  return ConstantStyle(method.name) + "_ORDINAL"
-
-def HasMethodWithResponse(interface):
-  for method in interface.methods:
-    if method.response_parameters:
-      return True
-  return False
-
-def HasMethodWithoutResponse(interface):
-  for method in interface.methods:
-    if not method.response_parameters:
-      return True
-  return False
-
 class Generator(generator.Generator):
 
   java_filters = {
@@ -308,17 +285,12 @@
     "decode_method": DecodeMethod,
     "expression_to_text": ExpressionToText,
     "encode_method": EncodeMethod,
-    "has_method_with_response": HasMethodWithResponse,
-    "has_method_without_response": HasMethodWithoutResponse,
     "is_handle": mojom.IsNonInterfaceHandleKind,
     "is_pointer_array_kind": IsPointerArrayKind,
     "is_struct_kind": mojom.IsStructKind,
     "java_type": GetJavaType,
-    "method_ordinal_name": GetMethodOrdinalName,
     "name": GetNameForElement,
     "new_array": NewArray,
-    "response_struct_from_method": GetResponseStructFromMethod,
-    "struct_from_method": GetStructFromMethod,
     "struct_size": lambda ps: ps.GetTotalSize() + _HEADER_SIZE,
   }
 
@@ -328,7 +300,20 @@
       "package": GetPackage(self.module),
     }
 
-  def GetJinjaExportsForInterface(self, interface):
+  @UseJinja("java_templates/enum.java.tmpl", filters=java_filters)
+  def GenerateEnumSource(self, enum):
+    exports = self.GetJinjaExports()
+    exports.update({"enum": enum})
+    return exports
+
+  @UseJinja("java_templates/struct.java.tmpl", filters=java_filters)
+  def GenerateStructSource(self, struct):
+    exports = self.GetJinjaExports()
+    exports.update({"struct": struct})
+    return exports
+
+  @UseJinja("java_templates/interface.java.tmpl", filters=java_filters)
+  def GenerateInterfaceSource(self, interface):
     exports = self.GetJinjaExports()
     exports.update({"interface": interface})
     if interface.client:
@@ -336,26 +321,6 @@
         if client.name == interface.client:
           exports.update({"client": client})
     return exports
-
-  @UseJinja("java_templates/enum.java.tmpl", filters=java_filters)
-  def GenerateEnumSource(self, enum):
-    exports = self.GetJinjaExports()
-    exports.update({"enum": enum})
-    return exports
-
-  @UseJinja("java_templates/struct.java.tmpl", filters=java_filters)
-  def GenerateStructSource(self, struct):
-    exports = self.GetJinjaExports()
-    exports.update({"struct": struct})
-    return exports
-
-  @UseJinja("java_templates/interface.java.tmpl", filters=java_filters)
-  def GenerateInterfaceSource(self, interface):
-    return self.GetJinjaExportsForInterface(interface)
-
-  @UseJinja("java_templates/interface_internal.java.tmpl", filters=java_filters)
-  def GenerateInterfaceInternalSource(self, interface):
-    return self.GetJinjaExportsForInterface(interface)
 
   @UseJinja("java_templates/constants.java.tmpl", filters=java_filters)
   def GenerateConstantsSource(self, module):
@@ -389,8 +354,6 @@
     for interface in self.module.interfaces:
       self.Write(self.GenerateInterfaceSource(interface),
                  "%s.java" % GetNameForElement(interface))
-      self.Write(self.GenerateInterfaceInternalSource(interface),
-                 "%s_Internal.java" % GetNameForElement(interface))
 
     if self.module.constants:
       self.Write(self.GenerateConstantsSource(self.module),