diff --git a/java/google/registry/request/RequestParameters.java b/java/google/registry/request/RequestParameters.java index e7cb7283b..49eaf8cf2 100644 --- a/java/google/registry/request/RequestParameters.java +++ b/java/google/registry/request/RequestParameters.java @@ -58,19 +58,6 @@ public final class RequestParameters { return result; } - /** - * Returns first GET or POST parameter associated with {@code name}. - * - * @throws BadRequestException if request parameter is absent (but not if empty) - */ - public static String extractRequiredMaybeEmptyParameter(HttpServletRequest req, String name) { - String result = req.getParameter(name); - if (result == null) { - throw new BadRequestException("Missing parameter: " + name); - } - return result; - } - /** Returns the first GET or POST parameter associated with {@code name}. */ public static Optional extractOptionalParameter(HttpServletRequest req, String name) { return Optional.fromNullable(emptyToNull(req.getParameter(name))); diff --git a/javatests/google/registry/request/RequestParametersTest.java b/javatests/google/registry/request/RequestParametersTest.java index 78536b267..030fca5d5 100644 --- a/javatests/google/registry/request/RequestParametersTest.java +++ b/javatests/google/registry/request/RequestParametersTest.java @@ -20,7 +20,6 @@ import static google.registry.request.RequestParameters.extractEnumParameter; import static google.registry.request.RequestParameters.extractOptionalDatetimeParameter; import static google.registry.request.RequestParameters.extractOptionalParameter; import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter; -import static google.registry.request.RequestParameters.extractRequiredMaybeEmptyParameter; import static google.registry.request.RequestParameters.extractRequiredParameter; import static org.mockito.Mockito.when; @@ -64,26 +63,6 @@ public class RequestParametersTest { extractRequiredParameter(req, "spin"); } - @Test - public void testExtractRequiredMaybeEmptyParameter_valuePresent_returnsValue() throws Exception { - when(req.getParameter("spin")).thenReturn("bog"); - assertThat(extractRequiredMaybeEmptyParameter(req, "spin")).isEqualTo("bog"); - } - - @Test - public void testExtractRequiredMaybeEmptyParameter_notPresent_throwsBadRequest() - throws Exception { - thrown.expect(BadRequestException.class, "spin"); - extractRequiredMaybeEmptyParameter(req, "spin"); - } - - @Test - public void testExtractRequiredMaybeEmptyParameter_empty_returnsValue() - throws Exception { - when(req.getParameter("spin")).thenReturn(""); - assertThat(extractRequiredMaybeEmptyParameter(req, "spin")).isEmpty(); - } - @Test public void testExtractOptionalParameter_valuePresent_returnsValue() throws Exception { when(req.getParameter("spin")).thenReturn("bog");