AnonymousClass -> AnonymousFunction, use ClassType.Function

Author: RikkiGibson

src/JavaBlock.cs

@@ -71,9 +71,9 @@ public void ReturnAnonymousClass(string anonymousClassDeclaration, Action<JavaCl
             contents.ReturnAnonymousClass(anonymousClassDeclaration, anonymousClassBlock);
         }
 
-        public void AnonymousClass(string anonymousClassDeclaration, Action<JavaClass> anonymousClassBlock)
+        public void AnonymousFunction(string parameterType, string parameterName, string returnType, Action<JavaBlock> methodBlock)
         {
-            contents.AnonymousClass(anonymousClassDeclaration, anonymousClassBlock);
+            contents.AnonymousFunction(parameterType, parameterName, returnType, methodBlock);
         }
 
         public JavaIfBlock If(string condition, Action<JavaBlock> ifAction)

src/JavaCodeGenerator.cs

@@ -4289,10 +4289,7 @@ restAPIMethodReturnBodyClientType is ListType restAPIMethodReturnBodyClientListT
                             function.Indent(() =>
                             {
                                 function.Text(".map(");
-                                function.AnonymousClass($"new Function<{returnValueTypeArgumentType}, {mapperReturnType}>()", anonymousClass =>
-                                {
-                                    anonymousClass.PublicMethod($"{mapperReturnType} apply(RestResponse<?, ?> res)", method => method.Return("res.body()"));
-                                });
+                                function.AnonymousFunction(returnValueTypeArgumentType.ToString(), "res", mapperReturnType.ToString(), method => method.Return("res.body()"));
                                 function.Line(");");
                             });
                         });
@@ -4355,10 +4352,7 @@ restAPIMethodReturnBodyClientType is ListType restAPIMethodReturnBodyClientListT
                             {
                                 function.Text(".map(");
 
-                                function.AnonymousClass($"new Function<{returnValueTypeArgumentType}, {mapperReturnType}>()", anonymousClass =>
-                                {
-                                    anonymousClass.PublicMethod($"{mapperReturnType} apply(RestResponse<?, {mapperReturnType}> res)", method => method.Return("res.body()"));
-                                });
+                                function.AnonymousFunction(returnValueTypeArgumentType.ToString(), "res", mapperReturnType.ToString(), method => method.Return("res.body()"));
                                 function.Line(")");
                                 function.Line(".toObservable();");
                             });
@@ -4566,23 +4560,15 @@ restAPIMethodReturnBodyClientType is ListType restAPIMethodReturnBodyClientListT
                                 if (restAPIMethodReturnBodyClientType != PrimitiveType.Void)
                                 {
                                     function.Text($".flatMapMaybe(");
-                                    function.AnonymousClass($"new Function<{returnValueTypeArgumentClientType}, {mapperReturnType}>()", anonymousClassBlock =>
-                                    {
-                                        anonymousClassBlock.PublicMethod(
-                                            $"{mapperReturnType} apply({returnValueTypeArgumentClientType} res)",
+                                    function.AnonymousFunction(returnValueTypeArgumentClientType.ToString(), "res", mapperReturnType.ToString(),
                                             method => method.Return($"res.body() == null ? Maybe.<{restAPIMethodReturnBodyClientType.AsNullable()}>empty() : Maybe.just(res.body())"));
-                                    });
                                     function.Line(");");
                                 }
                                 else if (isFluentDelete)
                                 {
                                     function.Text($".flatMapMaybe(");
-                                    function.AnonymousClass($"new Function<{returnValueTypeArgumentClientType}, {GenericType.Maybe(ClassType.Void)}>()", anonymousClassBlock =>
-                                    {
-                                        anonymousClassBlock.PublicMethod(
-                                            $"{GenericType.Maybe(ClassType.Void)} apply({returnValueTypeArgumentClientType} res)",
+                                    function.AnonymousFunction(returnValueTypeArgumentClientType.ToString(), "res", GenericType.Maybe(ClassType.Void).ToString(),
                                             method => method.Return("Maybe.empty()"));
-                                    });
                                     function.Line(");");
                                 }
                                 else

src/JavaFileContents.cs

@@ -324,15 +324,15 @@ public void ReturnAnonymousClass(string anonymousClassDeclaration, Action<JavaCl
             Line("};");
         }
 
-        public void AnonymousClass(string anonymousClassDeclaration, Action<JavaClass> anonymousClassBlock)
+        public void AnonymousFunction(string parameterType, string parameterName, string returnType, Action<JavaBlock> methodBlock)
         {
-            Line($"{anonymousClassDeclaration} {{");
+            Line($"new Function<{parameterType}, {returnType}>() {{");
             Indent(() =>
             {
                 JavaClass javaClass = new JavaClass(this);
-                anonymousClassBlock(javaClass);
+                javaClass.PublicMethod($"{returnType} apply({parameterType} {parameterName})", methodBlock);
             });
-            Line("}");
+            Text("}");
         }
 
         public void Annotation(params string[] annotations)

src/Model/RestAPIMethod.cs

@@ -154,7 +154,7 @@ public void AddImportsTo(ISet<string> imports, bool includeImplementationImports
 
             if (includeImplementationImports)
             {
-                imports.Add("io.reactivex.functions.Function");
+                ClassType.Function.AddImportsTo(imports, includeImplementationImports);
 
                 if (IsResumable)
                 {