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 09492e95..ca15d2ab 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java
@@ -46,20 +46,6 @@ public class Authorization extends AcmeJsonResource {
super(login, location);
}
- /**
- * Gets the domain name to be authorized.
- *
- * For wildcard domain orders, the domain itself (without wildcard prefix) is returned
- * here. To find out if this {@link Authorization} is related to a wildcard domain
- * order, check the {@link #isWildcard()} method.
- *
- * @deprecated Use {@link #getIdentifier()}.
- */
- @Deprecated
- public String getDomain() {
- return getIdentifier().getDomain();
- }
-
/**
* Gets the {@link Identifier} to be authorized.
*
diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Order.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Order.java
index a242b6db..d75d99e5 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/Order.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Order.java
@@ -70,20 +70,6 @@ public class Order extends AcmeJsonResource {
return getJSON().get("expires").map(Value::asInstant).orElse(null);
}
- /**
- * Gets the list of domain names to be ordered.
- *
- * @deprecated Use {@link #getIdentifiers()}. This method only returns DNS type
- * identifiers for compatibility reasons.
- */
- @Deprecated
- public List getDomains() {
- return getIdentifiers().stream()
- .filter(i -> Identifier.TYPE_DNS.equals(i.getType()))
- .map(Identifier::getDomain)
- .collect(toList());
- }
-
/**
* Gets the list of {@link Identifier} to be ordered.
*
diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Problem.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Problem.java
index 4744b20d..8daa5e74 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/Problem.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Problem.java
@@ -112,18 +112,6 @@ public class Problem implements Serializable {
.orElse(null);
}
- /**
- * Returns the domain this problem relates to. May be {@code null}.
- *
- * @deprecated Use {@link #getIdentifier()}.
- */
- @Deprecated
- @CheckForNull
- public String getDomain() {
- Identifier identifier = getIdentifier();
- return identifier != null ? identifier.getDomain() : null;
- }
-
/**
* Returns the {@link Identifier} this problem relates to. May be {@code null}.
*
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java
index 0eb6bdf7..14a290a4 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AccountTest.java
@@ -169,7 +169,6 @@ public class AccountTest {
* Test that a domain can be pre-authorized.
*/
@Test
- @SuppressWarnings("deprecation")
public void testPreAuthorizeDomain() throws Exception {
TestableConnectionProvider provider = new TestableConnectionProvider() {
@Override
@@ -202,7 +201,6 @@ public class AccountTest {
Account account = new Account(login);
Authorization auth = account.preAuthorizeDomain(domainName);
- assertThat(auth.getDomain(), is(domainName));
assertThat(auth.getIdentifier().getDomain(), is(domainName));
assertThat(auth.getStatus(), is(Status.PENDING));
assertThat(auth.getExpires(), is(nullValue()));
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 871c8123..051261c1 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java
@@ -88,7 +88,6 @@ public class AuthorizationTest {
* Test that authorization is properly updated.
*/
@Test
- @SuppressWarnings("deprecation")
public void testUpdate() throws Exception {
TestableConnectionProvider provider = new TestableConnectionProvider() {
@Override
@@ -117,7 +116,6 @@ public class AuthorizationTest {
Authorization auth = new Authorization(login, locationUrl);
auth.update();
- assertThat(auth.getDomain(), is("example.org"));
assertThat(auth.getIdentifier().getDomain(), is("example.org"));
assertThat(auth.getStatus(), is(Status.VALID));
assertThat(auth.isWildcard(), is(false));
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java
index e05bb2dd..06163955 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderBuilderTest.java
@@ -46,7 +46,6 @@ public class OrderBuilderTest {
* Test that a new {@link Order} can be created.
*/
@Test
- @SuppressWarnings("deprecation")
public void testOrderCertificate() throws Exception {
Instant notBefore = parseTimestamp("2016-01-01T00:00:00Z");
Instant notAfter = parseTimestamp("2016-01-08T00:00:00Z");
@@ -88,12 +87,6 @@ public class OrderBuilderTest {
.notAfter(notAfter)
.create();
- assertThat(order.getDomains(), containsInAnyOrder(
- "example.com", "www.example.com",
- "example.org",
- "m.example.com", "m.example.org",
- "d.example.com",
- "d2.example.com"));
assertThat(order.getIdentifiers(), containsInAnyOrder(
Identifier.dns("example.com"),
Identifier.dns("www.example.com"),
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java
index 9003ba4e..e601331b 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/OrderTest.java
@@ -44,7 +44,6 @@ public class OrderTest {
* Test that order is properly updated.
*/
@Test
- @SuppressWarnings("deprecation")
public void testUpdate() throws Exception {
TestableConnectionProvider provider = new TestableConnectionProvider() {
@Override
@@ -73,7 +72,6 @@ public class OrderTest {
assertThat(order.getExpires(), is(parseTimestamp("2015-03-01T14:09:00Z")));
assertThat(order.getLocation(), is(locationUrl));
- assertThat(order.getDomains(), containsInAnyOrder("example.com", "www.example.com"));
assertThat(order.getIdentifiers(), containsInAnyOrder(
Identifier.dns("example.com"),
Identifier.dns("www.example.com")));
@@ -150,7 +148,6 @@ public class OrderTest {
* Test that order is properly finalized.
*/
@Test
- @SuppressWarnings("deprecation")
public void testFinalize() throws Exception {
byte[] csr = TestUtils.getResourceAsByteArray("/csr.der");
@@ -192,7 +189,6 @@ public class OrderTest {
assertThat(order.getExpires(), is(parseTimestamp("2015-03-01T14:09:00Z")));
assertThat(order.getLocation(), is(locationUrl));
- assertThat(order.getDomains(), containsInAnyOrder("example.com", "www.example.com"));
assertThat(order.getIdentifiers(), containsInAnyOrder(
Identifier.dns("example.com"),
Identifier.dns("www.example.com")));