Import of Cloud Functions JVM from Git-on-Borg.

  - c1328f640791a360d414deccb47f873a76dee171 Merge "Improve coverage of packageless and nested functio... by Éamonn McManus <[email protected]>
  - 52bae0b45618d9f3bd19b8f97acbcbb5690293ad Clean up the invoker-runner pom.xml. by Éamonn McManus <[email protected]>
  - 8c9223dc6ddba8e639f23f85dfe9e607c703fc33 Explicitly set source level in example. by Éamonn McManus <[email protected]>
  - f573a69eb1588502330c8775f0dd9a11364e556b Update example to reflect the new API. by Éamonn McManus <[email protected]>

PiperOrigin-RevId: 280075940

Author: eamonnmcmanus

invoker-core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java

@@ -33,10 +33,20 @@ private NewHttpFunctionExecutor(HttpFunction function) {
    */
   public static Optional<NewHttpFunctionExecutor> forTarget(String target) {
     Class<?> c;
-    try {
-      c = Class.forName(target);
-    } catch (ClassNotFoundException e) {
-      return Optional.empty();
+    while (true) {
+      try {
+        c = Class.forName(target);
+        break;
+      } catch (ClassNotFoundException e) {
+        // This might be a nested class like com.example.Foo.Bar. That will actually appear as
+        // com.example.Foo$Bar as far as Class.forName is concerned. So we try to replace every dot
+        // from the last to the first with a $ in the hope of finding a class we can load.
+        int lastDot = target.lastIndexOf('.');
+        if (lastDot < 0) {
+          return Optional.empty();
+        }
+        target = target.substring(0, lastDot) + '$' + target.substring(lastDot + 1);
+      }
     }
     if (!HttpFunction.class.isAssignableFrom(c)) {
       throw new RuntimeException(

invoker-core/src/test/java/PackagelessHelloWorld.java

@@ -0,0 +1,13 @@
+// A function in the default package.
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+
+public class PackagelessHelloWorld implements HttpFunction {
+  @Override
+  public void service(HttpRequest request, HttpResponse response) throws Exception {
+    response.setContentType("text/plain; charset=utf-8");
+    response.getWriter().write("hello, world\n");
+  }
+}

invoker-core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java

@@ -87,29 +87,33 @@ abstract static class Builder {
     }
   }
 
+  private static String fullTarget(String nameWithoutPackage) {
+    return "com.google.cloud.functions.invoker.testfunctions." + nameWithoutPackage;
+  }
+
   @Test
   public void helloWorld() throws Exception {
-    testHttpFunction("HelloWorld.helloWorld",
+    testHttpFunction(fullTarget("HelloWorld.helloWorld"),
         TestCase.builder().setExpectedResponseText("hello\n").build());
   }
 
   @Test
   public void newHelloWorld() throws Exception {
-    testHttpFunction("NewHelloWorld",
+    testHttpFunction(fullTarget("NewHelloWorld"),
         TestCase.builder().setExpectedResponseText("hello\n").build());
   }
 
   @Test
   public void echo() throws Exception {
     String testText = "hello\nworld\n";
-    testHttpFunction("Echo.echo",
+    testHttpFunction(fullTarget("Echo.echo"),
         TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build());
   }
 
   @Test
   public void newEcho() throws Exception {
     String testText = "hello\nworld\n";
-    testHttpFunction("NewEcho",
+    testHttpFunction(fullTarget("NewEcho"),
         TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build());
   }
 
@@ -119,7 +123,7 @@ public void echoUrl() throws Exception {
     TestCase[] testCases = Arrays.stream(testUrls)
         .map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
         .toArray(TestCase[]::new);
-    testHttpFunction("EchoUrl.echoUrl", testCases);
+    testHttpFunction(fullTarget("EchoUrl.echoUrl"), testCases);
   }
 
   @Test
@@ -128,22 +132,35 @@ public void newEchoUrl() throws Exception {
     TestCase[] testCases = Arrays.stream(testUrls)
         .map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
         .toArray(TestCase[]::new);
-    testHttpFunction("NewEchoUrl", testCases);
+    testHttpFunction(fullTarget("NewEchoUrl"), testCases);
   }
 
   @Test
   public void background() throws Exception {
-    backgroundTest("BackgroundSnoop.snoop");
+    backgroundTest(fullTarget("BackgroundSnoop.snoop"));
   }
 
   @Test
   public void newBackground() throws Exception {
-    backgroundTest("NewBackgroundSnoop");
+    backgroundTest(fullTarget("NewBackgroundSnoop"));
   }
 
   @Test
   public void newTypedBackground() throws Exception {
-    backgroundTest("NewTypedBackgroundSnoop");
+    backgroundTest(fullTarget("NewTypedBackgroundSnoop"));
+  }
+
+  @Test
+  public void nested() throws Exception {
+    String testText = "sic transit gloria mundi";
+    testHttpFunction(fullTarget("Nested.Echo"),
+        TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build());
+  }
+
+  @Test
+  public void packageless() throws Exception {
+    testHttpFunction("PackagelessHelloWorld",
+        TestCase.builder().setExpectedResponseText("hello, world\n").build());
   }
 
   // In these tests, we test a number of different functions that express the same functionality
@@ -218,7 +235,6 @@ public String toString() {
 
   private Process startServer(SignatureType signatureType, String target)
       throws IOException, InterruptedException {
-    String fullTarget = "com.google.cloud.functions.invoker.testfunctions." + target;
     File javaHome = new File(System.getProperty("java.home"));
     assertThat(javaHome.exists()).isTrue();
     File javaBin = new File(javaHome, "bin");
@@ -235,7 +251,7 @@ private Process startServer(SignatureType signatureType, String target)
     Map<String, String> environment = ImmutableMap.of("PORT", String.valueOf(serverPort),
         "K_SERVICE", "test-function",
         "FUNCTION_SIGNATURE_TYPE", signatureType.toString(),
-        "FUNCTION_TARGET", fullTarget);
+        "FUNCTION_TARGET", target);
     processBuilder.environment().putAll(environment);
     Process serverProcess = processBuilder.start();
     CountDownLatch ready = new CountDownLatch(1);

invoker-core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Nested.java

@@ -0,0 +1,18 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+import java.util.stream.Collectors;
+
+public class Nested {
+  public static class Echo implements HttpFunction {
+    @Override
+    public void service(HttpRequest request, HttpResponse response) throws Exception {
+      String body = request.getReader().lines().collect(Collectors.joining("\n"));
+      response.setContentType("text/plain");
+      response.getWriter().write(body);
+      response.getWriter().flush();
+    }
+  }
+}