From 4fe4c12c624b65ba8202ea84e8756db92fffa388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20K=C3=B6rber?= <github@shredzone.org>
Date: Wed, 19 Apr 2017 00:49:07 +0200
Subject: [PATCH] Use returned Registration object after creation

---
 .../java/org/shredzone/acme4j/Registration.java    | 14 +++-----------
 .../org/shredzone/acme4j/RegistrationBuilder.java  |  6 ++++--
 .../shredzone/acme4j/RegistrationBuilderTest.java  |  3 +--
 3 files changed, 8 insertions(+), 15 deletions(-)

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 420c6f1e..67be5e8d 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Registration.java
@@ -154,8 +154,7 @@ public class Registration extends AcmeResource {
             conn.sendSignedRequest(getLocation(), claims, getSession());
             conn.accept(HttpURLConnection.HTTP_CREATED, HttpURLConnection.HTTP_ACCEPTED);
 
-            JSON json = conn.readJsonResponse();
-            unmarshal(json, conn);
+            unmarshal(conn.readJsonResponse());
          }
     }
 
@@ -343,10 +342,8 @@ public class Registration extends AcmeResource {
      *
      * @param json
      *            JSON data
-     * @param conn
-     *            {@link Connection} with headers to be evaluated
      */
-    private void unmarshal(JSON json, Connection conn) {
+    protected void unmarshal(JSON json) {
         if (json.contains(KEY_TOS_AGREED)) {
             this.termsOfServiceAgreed = json.get(KEY_TOS_AGREED).asBoolean();
         }
@@ -365,11 +362,6 @@ public class Registration extends AcmeResource {
             this.status = Status.parse(json.get(KEY_STATUS).asString());
         }
 
-        URL location = conn.getLocation();
-        if (location != null) {
-            setLocation(location);
-        }
-
         loaded = true;
     }
 
@@ -442,7 +434,7 @@ public class Registration extends AcmeResource {
                 conn.accept(HttpURLConnection.HTTP_ACCEPTED);
 
                 JSON json = conn.readJsonResponse();
-                unmarshal(json, conn);
+                unmarshal(json);
             }
         }
     }
diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java b/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java
index c470496a..63e26b5f 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/RegistrationBuilder.java
@@ -103,11 +103,13 @@ public class RegistrationBuilder {
             }
 
             conn.sendJwkSignedRequest(session.resourceUrl(Resource.NEW_REG), claims, session);
-            conn.accept(HttpURLConnection.HTTP_CREATED);
+            conn.accept(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_CREATED);
 
             URL location = conn.getLocation();
 
-            return new Registration(session, location);
+            Registration reg = new Registration(session, location);
+            reg.unmarshal(conn.readJsonResponse());
+            return reg;
         }
     }
 
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 7452fad5..c7acda65 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/RegistrationBuilderTest.java
@@ -66,7 +66,7 @@ public class RegistrationBuilderTest {
                     assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_CREATED, HttpURLConnection.HTTP_ACCEPTED));
                     return HttpURLConnection.HTTP_ACCEPTED;
                 } else {
-                    assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_CREATED));
+                    assertThat(httpStatus, isIntArrayContainingInAnyOrder(HttpURLConnection.HTTP_OK, HttpURLConnection.HTTP_CREATED));
                     return HttpURLConnection.HTTP_CREATED;
                 }
             }
@@ -78,7 +78,6 @@ public class RegistrationBuilderTest {
 
             @Override
             public JSON readJsonResponse() {
-                assertThat(isUpdate, is(true));
                 return getJsonAsObject("newRegistrationResponse");
             }
         };