fix: typed declaration works correctly with http trigger (#212)

* Configure typed function conformance test

* fix: typed function signature should be compatible with 'http' signature type

* apply google-java-format fixes

Author: garethgeorge

.github/workflows/conformance.yaml

@@ -51,39 +51,52 @@ jobs:
     - name: Build invoker with Maven
       run: (cd invoker/ && mvn install)
 
+    - name: Build invoker Maven Plugin
+      run: (cd function-maven-plugin/ && mvn install)
+
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
       with:
-        version: 'v1.6.0'
+        version: 'v1.8.2'
         functionType: 'http'
         useBuildpacks: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction'"
         startDelay: 10
 
+    - name: Run Typed conformance tests
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
+      with:
+        version: 'v1.8.2'
+        functionType: 'http'
+        declarativeType: 'typed'
+        useBuildpacks: false
+        cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.TypedConformanceFunction'"
+        startDelay: 10
+
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
       with:
-        version: 'v1.6.0'
+        version: 'v1.8.2'
         functionType: 'legacyevent'
         useBuildpacks: false
         validateMapping: true
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.BackgroundEventConformanceFunction'"
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
       with:
-        version: 'v1.6.0'
+        version: 'v1.8.2'
         functionType: 'cloudevent'
         useBuildpacks: false
         validateMapping: true
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction'"
         startDelay: 10
 
     - name: Run HTTP concurrency conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
       with:
-        version: 'v1.6.0'
+        version: 'v1.8.2'
         functionType: 'http'
         useBuildpacks: false
         validateConcurrency: true

invoker/conformance/pom.xml

@@ -28,6 +28,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -52,7 +53,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.10.1</version>
+          <version>0.11.1-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>

invoker/conformance/src/main/java/com/google/cloud/functions/conformance/TypedConformanceFunction.java

@@ -0,0 +1,26 @@
+package com.google.cloud.functions.conformance;
+
+import com.google.cloud.functions.TypedFunction;
+import com.google.gson.annotations.SerializedName;
+
+public class TypedConformanceFunction
+    implements TypedFunction<ConformanceRequest, ConformanceResponse> {
+  @Override
+  public ConformanceResponse apply(ConformanceRequest req) throws Exception {
+    return new ConformanceResponse(req);
+  }
+}
+
+class ConformanceRequest {
+  @SerializedName("message")
+  public String message;
+}
+
+class ConformanceResponse {
+  @SerializedName("payload")
+  public ConformanceRequest payload = null;
+
+  ConformanceResponse(ConformanceRequest payload) {
+    this.payload = payload;
+  }
+}

invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java

@@ -299,7 +299,11 @@ private void startServer(boolean join) throws Exception {
     } else {
       switch (functionSignatureType) {
         case "http":
-          servlet = HttpFunctionExecutor.forClass(functionClass);
+          if (TypedFunction.class.isAssignableFrom(functionClass)) {
+            servlet = TypedFunctionExecutor.forClass(functionClass);
+          } else {
+            servlet = HttpFunctionExecutor.forClass(functionClass);
+          }
           break;
         case "event":
         case "cloudevent":