[#51] Add return type to signature field

neo4j-contrib · Apr 2, 2017 · 6195eda · 6195eda
1 parent 444a4cb
commit 6195eda
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/processor/src/main/java/net/biville/florent/sproccompiler/export/io/DsvFieldSerializers.java b/processor/src/main/java/net/biville/florent/sproccompiler/export/io/DsvFieldSerializers.java
@@ -105,7 +105,7 @@ public Either<DsvExportError,String> qualifiedName(ExecutableElement method )
 
         public Either<DsvExportError,String> signature(ExecutableElement method )
         {
-            return Either.right(String.format("%s(%s)", method.getSimpleName(), parameters(method)));
+            return Either.right(String.format("%s %s(%s)", returnType(method), method.getSimpleName(), parameters(method)));
         }
 
         public Either<DsvExportError,String> description( ExecutableElement method )
@@ -149,6 +149,10 @@ public Either<DsvExportError,String> deprecatedBy( ExecutableElement method )
             return Either.right( method.getAnnotation( Procedure.class ).deprecatedBy() );
         }
 
+        private String returnType(ExecutableElement method) {
+            return method.getReturnType().toString();
+        }
+
         private String callableName( ExecutableElement method )
         {
             Supplier<String> defaultName =

diff --git a/processor/src/test/java/net/biville/florent/sproccompiler/export/DsvProcessorTest.java b/processor/src/test/java/net/biville/florent/sproccompiler/export/DsvProcessorTest.java
@@ -69,10 +69,10 @@ public void dumps_procedure_definition_to_dsv_with_custom_delimiter_and_package_
         String generatedCsv = readContents(Paths.get(folder.getAbsolutePath(), namespace + ".csv"));
         assertThat(generatedCsv).isEqualTo(
                 "\"type\"|\"qualified name\"|\"signature\"|\"description\"|\"execution mode\"|\"location\"|\"deprecated by\"\n" +
-                        "\"procedure\"|\"" + namespace + ".doSomething\"|\"doSomething(int foo)\"|\"\"|\"PERFORMS_WRITE\"|\"" + namespace + ".SimpleProcedures\"|\"doSomething2\"\n" +
-                        "\"procedure\"|\"" + namespace + ".doSomething2\"|\"doSomething2(long bar)\"|\"Much better than the former version\"|\"SCHEMA\"|\"" + namespace + ".SimpleProcedures\"|\"\"\n" +
-                        "\"procedure\"|\"" + namespace + ".doSomething3\"|\"doSomething3(LongWrapper bar)\"|\"Much better with records\"|\"SCHEMA\"|\"" + namespace + ".SimpleProcedures\"|\"\"\n" +
-                        "\"function\"|\"" + namespace + ".sum\"|\"sum(int a,int b)\"|\"Performs super complex maths\"|\"\"|\"" + namespace + ".SimpleUserFunctions\"|\"\"");
+                        "\"procedure\"|\"" + namespace + ".doSomething\"|\"void doSomething(int foo)\"|\"\"|\"PERFORMS_WRITE\"|\"" + namespace + ".SimpleProcedures\"|\"doSomething2\"\n" +
+                        "\"procedure\"|\"" + namespace + ".doSomething2\"|\"void doSomething2(long bar)\"|\"Much better than the former version\"|\"SCHEMA\"|\"" + namespace + ".SimpleProcedures\"|\"\"\n" +
+                        "\"procedure\"|\"" + namespace + ".doSomething3\"|\"void doSomething3(LongWrapper bar)\"|\"Much better with records\"|\"SCHEMA\"|\"" + namespace + ".SimpleProcedures\"|\"\"\n" +
+                        "\"function\"|\"" + namespace + ".sum\"|\"long sum(int a,int b)\"|\"Performs super complex maths\"|\"\"|\"" + namespace + ".SimpleUserFunctions\"|\"\"");
     }
 
     @Test
@@ -91,10 +91,10 @@ public void dumps_procedure_definition_to_dsv_with_custom_delimiter_and_package_
         String generatedCsv = readContents(Paths.get(folder.getAbsolutePath(), namespace + ".csv"));
         assertThat(generatedCsv).isEqualTo(
                 "|\"type\"|\"qualified name\"|\"signature\"|\"description\"|\"execution mode\"|\"location\"|\"deprecated by\"\n" +
-                        "|\"procedure\"|\"" + namespace + ".doSomething\"|\"doSomething(int foo)\"|\"\"|\"PERFORMS_WRITE\"|\"" + namespace + ".SimpleProcedures\"|\"doSomething2\"\n" +
-                        "|\"procedure\"|\"" + namespace + ".doSomething2\"|\"doSomething2(long bar)\"|\"Much better than the former version\"|\"SCHEMA\"|\"" + namespace + ".SimpleProcedures\"|\"\"\n" +
-                        "|\"procedure\"|\"" + namespace + ".doSomething3\"|\"doSomething3(LongWrapper bar)\"|\"Much better with records\"|\"SCHEMA\"|\"" + namespace + ".SimpleProcedures\"|\"\"\n" +
-                        "|\"function\"|\"" + namespace + ".sum\"|\"sum(int a,int b)\"|\"Performs super complex maths\"|\"\"|\"" + namespace + ".SimpleUserFunctions\"|\"\"");
+                        "|\"procedure\"|\"" + namespace + ".doSomething\"|\"void doSomething(int foo)\"|\"\"|\"PERFORMS_WRITE\"|\"" + namespace + ".SimpleProcedures\"|\"doSomething2\"\n" +
+                        "|\"procedure\"|\"" + namespace + ".doSomething2\"|\"void doSomething2(long bar)\"|\"Much better than the former version\"|\"SCHEMA\"|\"" + namespace + ".SimpleProcedures\"|\"\"\n" +
+                        "|\"procedure\"|\"" + namespace + ".doSomething3\"|\"void doSomething3(LongWrapper bar)\"|\"Much better with records\"|\"SCHEMA\"|\"" + namespace + ".SimpleProcedures\"|\"\"\n" +
+                        "|\"function\"|\"" + namespace + ".sum\"|\"long sum(int a,int b)\"|\"Performs super complex maths\"|\"\"|\"" + namespace + ".SimpleUserFunctions\"|\"\"");
     }
 
     @Test