From 300c9dd06c522b5358acd9ffde9e63e3ca6b1daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20K=C3=B6rber?= Date: Wed, 3 May 2017 13:39:59 +0200 Subject: [PATCH] Remove all uses of HTTP_ACCEPTED --- .../org/shredzone/acme4j/Authorization.java | 4 ++-- .../org/shredzone/acme4j/Registration.java | 4 ++-- .../shredzone/acme4j/challenge/Challenge.java | 6 ++--- .../acme4j/connector/DefaultConnection.java | 12 +++------- .../shredzone/acme4j/AuthorizationTest.java | 16 +++++-------- .../acme4j/RegistrationBuilderTest.java | 4 ++-- .../shredzone/acme4j/RegistrationTest.java | 11 ++++----- .../acme4j/challenge/ChallengeTest.java | 23 ++++++++----------- .../connector/DefaultConnectionTest.java | 15 ++++-------- 9 files changed, 37 insertions(+), 58 deletions(-) diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java index caa2a999..29f19772 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java @@ -141,7 +141,7 @@ public class Authorization extends AcmeResource { LOG.debug("update"); try (Connection conn = getSession().provider().connect()) { conn.sendRequest(getLocation(), getSession()); - conn.accept(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED); + conn.accept(HttpURLConnection.HTTP_OK); unmarshalAuthorization(conn.readJsonResponse()); @@ -159,7 +159,7 @@ public class Authorization extends AcmeResource { claims.put("status", "deactivated"); conn.sendSignedRequest(getLocation(), claims, getSession()); - conn.accept(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED); + conn.accept(HttpURLConnection.HTTP_OK); } } diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java index 4f214407..14869b4d 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java @@ -134,7 +134,7 @@ public class Registration extends AcmeResource { JSONBuilder claims = new JSONBuilder(); conn.sendSignedRequest(getLocation(), claims, getSession()); - conn.accept(HttpURLConnection.HTTP_CREATED, HttpURLConnection.HTTP_ACCEPTED); + conn.accept(HttpURLConnection.HTTP_OK); unmarshal(conn.readJsonResponse()); } @@ -399,7 +399,7 @@ public class Registration extends AcmeResource { } conn.sendSignedRequest(getLocation(), claims, getSession()); - conn.accept(HttpURLConnection.HTTP_ACCEPTED); + conn.accept(HttpURLConnection.HTTP_OK); JSON json = conn.readJsonResponse(); unmarshal(json); diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java index 4916227d..433674f7 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/challenge/Challenge.java @@ -77,7 +77,7 @@ public class Challenge extends AcmeResource { LOG.debug("bind"); try (Connection conn = session.provider().connect()) { conn.sendRequest(location, session); - conn.accept(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED); + conn.accept(HttpURLConnection.HTTP_OK); JSON json = conn.readJsonResponse(); if (!(json.contains("type"))) { @@ -183,7 +183,7 @@ public class Challenge extends AcmeResource { respond(claims); conn.sendSignedRequest(getLocation(), claims, getSession()); - conn.accept(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED); + conn.accept(HttpURLConnection.HTTP_OK); unmarshall(conn.readJsonResponse()); } @@ -203,7 +203,7 @@ public class Challenge extends AcmeResource { LOG.debug("update"); try (Connection conn = getSession().provider().connect()) { conn.sendRequest(getLocation(), getSession()); - conn.accept(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED); + conn.accept(HttpURLConnection.HTTP_OK); unmarshall(conn.readJsonResponse()); diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java index b6b84dfb..66e536ff 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/connector/DefaultConnection.java @@ -297,15 +297,9 @@ public class DefaultConnection implements Connection { public void handleRetryAfter(String message) throws AcmeException { assertConnectionIsOpen(); - try { - if (conn.getResponseCode() == HttpURLConnection.HTTP_ACCEPTED) { - Optional retryAfter = getRetryAfterHeader(); - if (retryAfter.isPresent()) { - throw new AcmeRetryAfterException(message, retryAfter.get()); - } - } - } catch (IOException ex) { - throw new AcmeNetworkException(ex); + Optional retryAfter = getRetryAfterHeader(); + if (retryAfter.isPresent()) { + throw new AcmeRetryAfterException(message, retryAfter.get()); } } diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java index 1250d237..c3cb0322 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java @@ -97,8 +97,7 @@ public class AuthorizationTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); return HttpURLConnection.HTTP_OK; } @@ -151,8 +150,7 @@ public class AuthorizationTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); return HttpURLConnection.HTTP_OK; } @@ -204,9 +202,8 @@ public class AuthorizationTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } @Override @@ -263,9 +260,8 @@ public class AuthorizationTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } }; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java index a6c912b5..b65c651d 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java @@ -67,8 +67,8 @@ public class RegistrationBuilderTest { @Override public int accept(int... httpStatus) throws AcmeException { if (isUpdate) { - assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_CREATED, HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } else { assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_CREATED)); return HttpURLConnection.HTTP_CREATED; diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java index f36fabc8..c90b10a1 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationTest.java @@ -72,7 +72,7 @@ public class RegistrationTest { assertThat(claims.toString(), sameJSONAs(getJSON("updateRegistration").toString())); assertThat(session, is(notNullValue())); jsonResponse = getJSON("updateRegistrationResponse"); - response = HttpURLConnection.HTTP_ACCEPTED; + response = HttpURLConnection.HTTP_OK; } @Override @@ -153,9 +153,8 @@ public class RegistrationTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_CREATED, HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } @Override @@ -518,8 +517,8 @@ public class RegistrationTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } @Override diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java index fdb826d4..306d69bd 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/challenge/ChallengeTest.java @@ -66,9 +66,8 @@ public class ChallengeTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } @Override @@ -156,9 +155,8 @@ public class ChallengeTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } @Override @@ -193,8 +191,7 @@ public class ChallengeTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); return HttpURLConnection.HTTP_OK; } @@ -237,9 +234,8 @@ public class ChallengeTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } @Override @@ -305,9 +301,8 @@ public class ChallengeTest { @Override public int accept(int... httpStatus) throws AcmeException { - assertThat(httpStatus, isIntArrayContainingInAnyOrder( - HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED)); - return HttpURLConnection.HTTP_ACCEPTED; + assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK)); + return HttpURLConnection.HTTP_OK; } @Override diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java index eaa04fe6..a4b417f5 100644 --- a/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java +++ b/acme4j-client/src/test/java/org/shredzone/acme4j/connector/DefaultConnectionTest.java @@ -316,7 +316,7 @@ public class DefaultConnectionTest { Instant retryDate = Instant.now().plus(Duration.ofHours(10)); String retryMsg = "absolute date"; - when(mockUrlConnection.getResponseCode()).thenReturn(HttpURLConnection.HTTP_ACCEPTED); + when(mockUrlConnection.getResponseCode()).thenReturn(HttpURLConnection.HTTP_OK); when(mockUrlConnection.getHeaderField("Retry-After")).thenReturn(retryDate.toString()); when(mockUrlConnection.getHeaderFieldDate("Retry-After", 0L)).thenReturn(retryDate.toEpochMilli()); @@ -329,7 +329,6 @@ public class DefaultConnectionTest { assertThat(ex.getMessage(), is(retryMsg)); } - verify(mockUrlConnection, atLeastOnce()).getResponseCode(); verify(mockUrlConnection, atLeastOnce()).getHeaderField("Retry-After"); } @@ -343,7 +342,7 @@ public class DefaultConnectionTest { String retryMsg = "relative time"; when(mockUrlConnection.getResponseCode()) - .thenReturn(HttpURLConnection.HTTP_ACCEPTED); + .thenReturn(HttpURLConnection.HTTP_OK); when(mockUrlConnection.getHeaderField("Retry-After")) .thenReturn(String.valueOf(delta)); when(mockUrlConnection.getHeaderFieldDate( @@ -360,7 +359,6 @@ public class DefaultConnectionTest { assertThat(ex.getMessage(), is(retryMsg)); } - verify(mockUrlConnection, atLeastOnce()).getResponseCode(); verify(mockUrlConnection, atLeastOnce()).getHeaderField("Retry-After"); } @@ -370,7 +368,7 @@ public class DefaultConnectionTest { @Test public void testHandleRetryAfterHeaderNull() throws AcmeException, IOException { when(mockUrlConnection.getResponseCode()) - .thenReturn(HttpURLConnection.HTTP_ACCEPTED); + .thenReturn(HttpURLConnection.HTTP_OK); when(mockUrlConnection.getHeaderField("Retry-After")) .thenReturn(null); @@ -381,12 +379,11 @@ public class DefaultConnectionTest { fail("an AcmeRetryAfterException was thrown"); } - verify(mockUrlConnection, atLeastOnce()).getResponseCode(); verify(mockUrlConnection, atLeastOnce()).getHeaderField("Retry-After"); } /** - * Test if no HTTP_ACCEPTED status is correctly handled. + * Test if missing retry-after header is correctly handled. */ @Test public void testHandleRetryAfterNotAccepted() throws AcmeException, IOException { @@ -398,8 +395,6 @@ public class DefaultConnectionTest { } catch (AcmeRetryAfterException ex) { fail("an AcmeRetryAfterException was thrown"); } - - verify(mockUrlConnection, atLeastOnce()).getResponseCode(); } /** @@ -411,7 +406,7 @@ public class DefaultConnectionTest { try (DefaultConnection conn = new DefaultConnection(mockHttpConnection)) { conn.conn = mockUrlConnection; - int rc = conn.accept(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_ACCEPTED); + int rc = conn.accept(HttpURLConnection.HTTP_OK); assertThat(rc, is(HttpURLConnection.HTTP_OK)); }