From 6b1797c453efa4d59afdc473836bef729dbee23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20K=C3=B6rber?= <github@shredzone.org>
Date: Sun, 20 Dec 2015 12:39:44 +0100
Subject: [PATCH] Remove account parameter where not used

---
 .../src/main/java/org/shredzone/acme4j/AcmeClient.java    | 8 ++------
 .../org/shredzone/acme4j/impl/AbstractAcmeClient.java     | 4 ++--
 .../org/shredzone/acme4j/impl/AbstractAcmeClientTest.java | 4 ++--
 .../src/main/java/org/shredzone/acme4j/ClientTest.java    | 2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/AcmeClient.java b/acme4j-client/src/main/java/org/shredzone/acme4j/AcmeClient.java
index cee5ad29..de349623 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/AcmeClient.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/AcmeClient.java
@@ -73,25 +73,21 @@ public interface AcmeClient {
     /**
      * Updates the {@link Challenge} instance. It contains the current state.
      *
-     * @param account
-     *            {@link Account} to be used for conversation
      * @param challenge
      *            {@link Challenge} to update
      */
-    void updateChallenge(Account account, Challenge challenge) throws AcmeException;
+    void updateChallenge(Challenge challenge) throws AcmeException;
 
     /**
      * Restore a {@link Challenge} instance if only the challenge URI is known. It
      * contains the current state.
      *
-     * @param account
-     *            {@link Account} to be used for conversation
      * @param challengeUri
      *            {@link URI} of the challenge to restore
      * @throws ClassCastException
      *             if the challenge does not match the desired type
      */
-    <T extends Challenge> T restoreChallenge(Account account, URI challengeUri) throws AcmeException;
+    <T extends Challenge> T restoreChallenge(URI challengeUri) throws AcmeException;
 
     /**
      * Request a certificate.
diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java b/acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java
index 26f939c4..a15179a7 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/impl/AbstractAcmeClient.java
@@ -212,7 +212,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
     }
 
     @Override
-    public void updateChallenge(Account account, Challenge challenge) throws AcmeException {
+    public void updateChallenge(Challenge challenge) throws AcmeException {
         LOG.debug("updateChallenge");
         try (Connection conn = createConnection()) {
             int rc = conn.sendRequest(challenge.getLocation());
@@ -226,7 +226,7 @@ public abstract class AbstractAcmeClient implements AcmeClient {
 
     @Override
     @SuppressWarnings("unchecked")
-    public <T extends Challenge> T restoreChallenge(Account account, URI challengeUri) throws AcmeException {
+    public <T extends Challenge> T restoreChallenge(URI challengeUri) throws AcmeException {
         LOG.debug("restoreChallenge");
         try (Connection conn = createConnection()) {
             int rc = conn.sendRequest(challengeUri);
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/impl/AbstractAcmeClientTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/impl/AbstractAcmeClientTest.java
index e36068a2..9a71a1dd 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/impl/AbstractAcmeClientTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/impl/AbstractAcmeClientTest.java
@@ -250,7 +250,7 @@ public class AbstractAcmeClientTest {
         Challenge challenge = new HttpChallenge();
         challenge.unmarshall(getJsonAsMap("triggerHttpChallengeResponse"));
 
-        client.updateChallenge(testAccount, challenge);
+        client.updateChallenge(challenge);
 
         assertThat(challenge.getStatus(), is(Status.VALID));
         assertThat(challenge.getLocation(), is(locationUri));
@@ -274,7 +274,7 @@ public class AbstractAcmeClientTest {
         TestableAbstractAcmeClient client = new TestableAbstractAcmeClient(connection);
         client.putTestChallenge(HttpChallenge.TYPE, new HttpChallenge());
 
-        Challenge challenge = client.restoreChallenge(testAccount, locationUri);
+        Challenge challenge = client.restoreChallenge(locationUri);
 
         assertThat(challenge.getStatus(), is(Status.VALID));
         assertThat(challenge.getLocation(), is(locationUri));
diff --git a/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java b/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java
index ff8c8670..72b44003 100644
--- a/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java
+++ b/acme4j-example/src/main/java/org/shredzone/acme4j/ClientTest.java
@@ -148,7 +148,7 @@ public class ClientTest {
                 } catch (InterruptedException ex) {
                     LOG.warn("interrupted", ex);
                 }
-                client.updateChallenge(account, challenge);
+                client.updateChallenge(challenge);
             }
             if (attempts == 0) {
                 LOG.error("Failed to pass the challenge... Giving up.");