Keep Authorization and Certificate

Before this patch, Order generated and bound new Authorization and
Certificate objects everytime the respective getters were invoked. Each
of these instances keeps a separate copy of the server state, which causes
unnecessary traffic.

With this patch, the list of Authorizations and the Certificates are now
loaded lazily and kept in a cache, so the same instance is returned
everytime the getter is invoked.

acme4j-client/src/main/java/org/shredzone/acme4j/AcmeJsonResource.java

@@ -80,6 +80,7 @@ public abstract class AcmeJsonResource extends AcmeResource {
      *            New {@link JSON} data, must not be {@code null}.
      */
     protected void setJSON(JSON data) {
+        invalidate();
         this.data = Objects.requireNonNull(data, "data");
     }
 
@@ -97,6 +98,9 @@ public abstract class AcmeJsonResource extends AcmeResource {
     /**
      * Invalidates the state of this resource. Enforces an {@link #update()} when
      * {@link #getJSON()} is invoked.
+     * <p>
+     * Subclasses can override this method to purge internal caches that are based on the
+     * JSON structure. Remember to invoke {@code super.invalidate()}!
      */
     protected void invalidate() {
         data = null;

acme4j-client/src/main/java/org/shredzone/acme4j/Order.java

@@ -21,6 +21,7 @@ import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
 import org.shredzone.acme4j.exception.AcmeException;
 import org.shredzone.acme4j.exception.AcmeNotSupportedException;
 import org.shredzone.acme4j.toolbox.JSON;
@@ -36,6 +37,10 @@ public class Order extends AcmeJsonResource {
     private static final long serialVersionUID = 5435808648658292177L;
     private static final Logger LOG = LoggerFactory.getLogger(Order.class);
 
+    private transient @Nullable Certificate certificate = null;
+    private transient @Nullable Certificate autoRenewalCertificate = null;
+    private transient @Nullable List<Authorization> authorizations = null;
+
     protected Order(Login login, URL location) {
         super(login, location);
     }
@@ -97,13 +102,16 @@ public class Order extends AcmeJsonResource {
      * specific order.
      */
     public List<Authorization> getAuthorizations() {
-        var login = getLogin();
+        if (authorizations == null) {
-        return getJSON().get("authorizations")
+            var login = getLogin();
+            authorizations = getJSON().get("authorizations")
                     .asArray()
                     .stream()
                     .map(Value::asURL)
                     .map(login::bindAuthorization)
                     .collect(toUnmodifiableList());
+        }
+        return authorizations;
     }
 
     /**
@@ -123,10 +131,13 @@ public class Order extends AcmeJsonResource {
      *         for the status to become {@link Status#VALID}.
      */
     public Certificate getCertificate() {
-        return getJSON().get("certificate")
+        if (certificate == null) {
-                .map(Value::asURL)
+            certificate = getJSON().get("certificate")
-                .map(getLogin()::bindCertificate)
+                    .map(Value::asURL)
-                .orElseThrow(() -> new IllegalStateException("Order is not completed"));
+                    .map(getLogin()::bindCertificate)
+                    .orElseThrow(() -> new IllegalStateException("Order is not completed"));
+        }
+        return certificate;
     }
 
     /**
@@ -139,11 +150,14 @@ public class Order extends AcmeJsonResource {
      *         order has been {@link Status#CANCELED}.
      */
     public Certificate getAutoRenewalCertificate() {
-        return getJSON().get("star-certificate")
+        if (autoRenewalCertificate == null) {
-                .optional()
+            autoRenewalCertificate = getJSON().get("star-certificate")
-                .map(Value::asURL)
+                    .optional()
-                .map(getLogin()::bindCertificate)
+                    .map(Value::asURL)
-                .orElseThrow(() -> new IllegalStateException("Order is in an invalid state"));
+                    .map(getLogin()::bindCertificate)
+                    .orElseThrow(() -> new IllegalStateException("Order is in an invalid state"));
+        }
+        return autoRenewalCertificate;
     }
 
     /**
@@ -279,4 +293,11 @@ public class Order extends AcmeJsonResource {
         }
     }
 
+    @Override
+    protected void invalidate() {
+        super.invalidate();
+        certificate = null;
+        autoRenewalCertificate = null;
+        authorizations = null;
+    }
 }