Rename NewFoo to Foo. (#54)

* Switch invoker to API version 1.0.2.

* Rename NewFoo to Foo.

Previously we had `BackgroundFunction` and `NewBackgroundFunction`, where the former was the original design where functions were methods that needed to have a particular signature and the latter was the newer design where functions are classes that implement a given interface. We retired `BackgroundFunction` etc a while ago, so we can rename `NewBackgroundFunction` to just `BackgroundFunction`.

* Add a couple of missed cases.

Author: eamonnmcmanus

…voker/NewBackgroundFunctionExecutor.java …/invoker/BackgroundFunctionExecutor.javainvoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java renamed to invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java renamed to invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java

@@ -46,23 +46,23 @@
 import javax.servlet.http.HttpServletResponse;
 
 /** Executes the user's background function. */
-public final class NewBackgroundFunctionExecutor extends HttpServlet {
+public final class BackgroundFunctionExecutor extends HttpServlet {
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
   private final FunctionExecutor<?> functionExecutor;
 
-  private NewBackgroundFunctionExecutor(FunctionExecutor<?> functionExecutor) {
+  private BackgroundFunctionExecutor(FunctionExecutor<?> functionExecutor) {
     this.functionExecutor = functionExecutor;
   }
 
   /**
-   * Makes a {@link NewHttpFunctionExecutor} for the given class.
+   * Makes a {@link HttpFunctionExecutor} for the given class.
    *
    * @throws RuntimeException if either the class does not implement one of
    *    {@link BackgroundFunction} or {@link RawBackgroundFunction},
    *    or we are unable to construct an instance using its no-arg constructor.
    */
-  public static NewBackgroundFunctionExecutor forClass(Class<?> functionClass) {
+  public static BackgroundFunctionExecutor forClass(Class<?> functionClass) {
     if (!BackgroundFunction.class.isAssignableFrom(functionClass)
         && !RawBackgroundFunction.class.isAssignableFrom(functionClass)) {
       throw new RuntimeException(
@@ -95,7 +95,7 @@ public static NewBackgroundFunctionExecutor forClass(Class<?> functionClass) {
       }
       executor = new TypedFunctionExecutor<>(maybeTargetType.get(), backgroundFunction);
     }
-    return new NewBackgroundFunctionExecutor(executor);
+    return new BackgroundFunctionExecutor(executor);
   }
 
   /**

…ons/invoker/NewHttpFunctionExecutor.java …ctions/invoker/HttpFunctionExecutor.javainvoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java renamed to invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java renamed to invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java

@@ -25,22 +25,22 @@
 import javax.servlet.http.HttpServletResponse;
 
 /** Executes the user's method. */
-public class NewHttpFunctionExecutor extends HttpServlet {
+public class HttpFunctionExecutor extends HttpServlet {
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
   private final HttpFunction function;
 
-  private NewHttpFunctionExecutor(HttpFunction function) {
+  private HttpFunctionExecutor(HttpFunction function) {
     this.function = function;
   }
 
   /**
-   * Makes a {@link NewHttpFunctionExecutor} for the given class.
+   * Makes a {@link HttpFunctionExecutor} for the given class.
    *
    * @throws RuntimeException if either the given class does not implement {@link HttpFunction}
    *    or we are unable to construct an instance using its no-arg constructor.
    */
-  public static NewHttpFunctionExecutor forClass(Class<?> functionClass) {
+  public static HttpFunctionExecutor forClass(Class<?> functionClass) {
     if (!HttpFunction.class.isAssignableFrom(functionClass)) {
       throw new RuntimeException(
           "Class " + functionClass.getName() + " does not implement "
@@ -49,7 +49,7 @@ public static NewHttpFunctionExecutor forClass(Class<?> functionClass) {
     Class<? extends HttpFunction> httpFunctionClass = functionClass.asSubclass(HttpFunction.class);
     try {
       HttpFunction httpFunction = httpFunctionClass.getConstructor().newInstance();
-      return new NewHttpFunctionExecutor(httpFunction);
+      return new HttpFunctionExecutor(httpFunction);
     } catch (ReflectiveOperationException e) {
       throw new RuntimeException(
           "Could not construct an instance of " + functionClass.getName() + ": " + e, e);

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

@@ -22,8 +22,8 @@
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.HttpFunction;
 import com.google.cloud.functions.RawBackgroundFunction;
-import com.google.cloud.functions.invoker.NewBackgroundFunctionExecutor;
-import com.google.cloud.functions.invoker.NewHttpFunctionExecutor;
+import com.google.cloud.functions.invoker.BackgroundFunctionExecutor;
+import com.google.cloud.functions.invoker.HttpFunctionExecutor;
 import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
 import java.io.File;
 import java.io.IOException;
@@ -240,9 +240,9 @@ public void startServer() throws Exception {
 
     HttpServlet servlet;
     if ("http".equals(functionSignatureType)) {
-        servlet = NewHttpFunctionExecutor.forClass(functionClass);
+        servlet = HttpFunctionExecutor.forClass(functionClass);
     } else if ("event".equals(functionSignatureType)) {
-        servlet = NewBackgroundFunctionExecutor.forClass(functionClass);
+        servlet = BackgroundFunctionExecutor.forClass(functionClass);
     } else if (functionSignatureType == null) {
         servlet = servletForDeducedSignatureType(functionClass);
     } else {
@@ -284,11 +284,11 @@ private Class<?> loadFunctionClass() throws ClassNotFoundException {
 
   private HttpServlet servletForDeducedSignatureType(Class<?> functionClass) {
     if (HttpFunction.class.isAssignableFrom(functionClass)) {
-      return NewHttpFunctionExecutor.forClass(functionClass);
+      return HttpFunctionExecutor.forClass(functionClass);
     }
     if (BackgroundFunction.class.isAssignableFrom(functionClass)
         || RawBackgroundFunction.class.isAssignableFrom(functionClass)) {
-      return NewBackgroundFunctionExecutor.forClass(functionClass);
+      return BackgroundFunctionExecutor.forClass(functionClass);
     }
     String error = String.format(
         "Could not determine function signature type from target %s. Either this should be"

…r/NewBackgroundFunctionExecutorTest.java …oker/BackgroundFunctionExecutorTest.javainvoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java

@@ -1,6 +1,6 @@
 package com.google.cloud.functions.invoker;
 
-import static com.google.cloud.functions.invoker.NewBackgroundFunctionExecutor.backgroundFunctionTypeArgument;
+import static com.google.cloud.functions.invoker.BackgroundFunctionExecutor.backgroundFunctionTypeArgument;
 import static com.google.common.truth.Truth8.assertThat;
 
 import com.google.cloud.functions.BackgroundFunction;
@@ -11,7 +11,7 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class NewBackgroundFunctionExecutorTest {
+public class BackgroundFunctionExecutorTest {
   private static class PubSubMessage {
     String data;
     Map<String, String> attributes;

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

@@ -242,19 +242,19 @@ private static String fullTarget(String nameWithoutPackage) {
           .build();
 
   @Test
-  public void newHelloWorld() throws Exception {
-    testHttpFunction(fullTarget("NewHelloWorld"),
+  public void helloWorld() throws Exception {
+    testHttpFunction(fullTarget("HelloWorld"),
         ImmutableList.of(
             TestCase.builder().setExpectedResponseText("hello\n").build(),
             FAVICON_TEST_CASE,
             ROBOTS_TXT_TEST_CASE));
   }
 
   @Test
-  public void newEcho() throws Exception {
+  public void echo() throws Exception {
     String testText = "hello\nworld\n";
     testHttpFunction(
-        fullTarget("NewEcho"),
+        fullTarget("Echo"),
         ImmutableList.of(
             TestCase.builder()
                 .setRequestText(testText)
@@ -270,12 +270,12 @@ public void newEcho() throws Exception {
   }
 
   @Test
-  public void newEchoUrl() throws Exception {
+  public void echoUrl() throws Exception {
     String[] testUrls = {"/", "/foo/bar", "/?foo=bar&baz=buh", "/foo?bar=baz"};
     List<TestCase> testCases = Arrays.stream(testUrls)
         .map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
         .collect(toList());
-    testHttpFunction(fullTarget("NewEchoUrl"), testCases);
+    testHttpFunction(fullTarget("EchoUrl"), testCases);
   }
 
   @Test
@@ -314,16 +314,16 @@ public void stackDriverLogging() throws Exception {
   }
 
   @Test
-  public void newBackground() throws Exception {
-    newBackgroundTest("NewBackgroundSnoop");
+  public void background() throws Exception {
+    backgroundTest("BackgroundSnoop");
   }
 
   @Test
-  public void newTypedBackground() throws Exception {
-    newBackgroundTest("NewTypedBackgroundSnoop");
+  public void typedBackground() throws Exception {
+    backgroundTest("TypedBackgroundSnoop");
   }
 
-  private void newBackgroundTest(String target) throws Exception {
+  private void backgroundTest(String target) throws Exception {
     File snoopFile = snoopFile();
     String gcfRequestText = sampleLegacyEvent(snoopFile);
     JsonObject expectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);

…er/testfunctions/NewBackgroundSnoop.java …voker/testfunctions/BackgroundSnoop.javainvoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java

@@ -16,7 +16,7 @@
  * identical to the JSON payload that the Functions Framework received from the client in the test.
  * This will need to be rewritten when we switch to CloudEvents.
  */
-public class NewBackgroundSnoop implements RawBackgroundFunction {
+public class BackgroundSnoop implements RawBackgroundFunction {
   @Override
   public void accept(String json, Context context) {
     Gson gson = new Gson();

…tions/invoker/testfunctions/NewEcho.java …unctions/invoker/testfunctions/Echo.javainvoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java

@@ -7,7 +7,7 @@
 import java.io.OutputStream;
 import java.util.stream.Collectors;
 
-public class NewEcho implements HttpFunction {
+public class Echo implements HttpFunction {
   @Override
   public void service(HttpRequest request, HttpResponse response) throws Exception {
     boolean binary = "application/octet-stream".equals(request.getContentType().orElse(null));

…ns/invoker/testfunctions/NewEchoUrl.java …tions/invoker/testfunctions/EchoUrl.javainvoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java

@@ -4,7 +4,7 @@
 import com.google.cloud.functions.HttpRequest;
 import com.google.cloud.functions.HttpResponse;
 
-public class NewEchoUrl implements HttpFunction {
+public class EchoUrl implements HttpFunction {
   @Override
   public void service(HttpRequest request, HttpResponse response) throws Exception {
     StringBuilder url = new StringBuilder(request.getPath());

…invoker/testfunctions/NewHelloWorld.java …ns/invoker/testfunctions/HelloWorld.javainvoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java

@@ -4,7 +4,7 @@
 import com.google.cloud.functions.HttpRequest;
 import com.google.cloud.functions.HttpResponse;
 
-public class NewHelloWorld implements HttpFunction {
+public class HelloWorld implements HttpFunction {
   @Override
   public void service(HttpRequest request, HttpResponse response) throws Exception {
     response.getWriter().write("hello\n");

…stfunctions/NewTypedBackgroundSnoop.java …/testfunctions/TypedBackgroundSnoop.javainvoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java renamed to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java

@@ -16,8 +16,8 @@
  * identical to the JSON payload that the Functions Framework received from the client in the test.
  * This will need to be rewritten when we switch to CloudEvents.
  */
-public class NewTypedBackgroundSnoop
-    implements BackgroundFunction<NewTypedBackgroundSnoop.Payload> {
+public class TypedBackgroundSnoop
+    implements BackgroundFunction<TypedBackgroundSnoop.Payload> {
   public static class Payload {
     public int a;
     public int b;