From 1c33727e201d3cc377b578da4c58d2ade89f7662 Mon Sep 17 00:00:00 2001 From: mcilwain Date: Mon, 17 Sep 2018 12:35:12 -0700 Subject: [PATCH] Get rid of Providers class inject_common isn't going to be open-sourced anytime soon, so replace it with a lambda, which wasn't an option when this was originally written we were still on Java 7 back then. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=213318557 --- .../registry/request/RequestHandlerTest.java | 23 ++++++++------- .../google/registry/testing/Providers.java | 29 ------------------- 2 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 javatests/google/registry/testing/Providers.java diff --git a/javatests/google/registry/request/RequestHandlerTest.java b/javatests/google/registry/request/RequestHandlerTest.java index a48bdf230..9a3bdb0aa 100644 --- a/javatests/google/registry/request/RequestHandlerTest.java +++ b/javatests/google/registry/request/RequestHandlerTest.java @@ -34,7 +34,6 @@ import google.registry.request.auth.AuthResult; import google.registry.request.auth.RequestAuthenticator; import google.registry.request.auth.UserAuthInfo; import google.registry.testing.AppEngineRule; -import google.registry.testing.Providers; import google.registry.testing.UserInfo; import java.io.PrintWriter; import java.io.StringWriter; @@ -211,16 +210,18 @@ public final class RequestHandlerTest { @Before public void before() throws Exception { // Initialize here, not inline, so that we pick up the mocked UserService. - handler = RequestHandler.createForTest( - Component.class, - Providers.of(new Builder() { - @Override - public Component build() { - // Use a fake Builder that returns the single component instance that uses the mocks. - return component; - } - }), - requestAuthenticator); + handler = + RequestHandler.createForTest( + Component.class, + () -> + new Builder() { + @Override + public Component build() { + // Use a fake Builder that returns the single component instance using the mocks + return component; + } + }, + requestAuthenticator); when(rsp.getWriter()).thenReturn(new PrintWriter(httpOutput)); } diff --git a/javatests/google/registry/testing/Providers.java b/javatests/google/registry/testing/Providers.java deleted file mode 100644 index cc6fc488b..000000000 --- a/javatests/google/registry/testing/Providers.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2017 The Nomulus Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package google.registry.testing; - -import javax.inject.Provider; - -/** Helper functions for {@link Provider}. */ -public final class Providers { - - /** - * Returns a {@link Provider} that supplies a constant value. - * - */ - public static Provider of(final T instance) { - return () -> instance; - } -}