From be6b511085896c12467755e068b3ac54bb0e4642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20K=C3=B6rber?= <github@shredzone.org>
Date: Sat, 11 Feb 2017 16:26:20 +0100
Subject: [PATCH] Remove support for deprecated urn:acme:error prefix

---
 .../src/main/java/org/shredzone/acme4j/util/AcmeUtils.java  | 6 ------
 .../test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java  | 1 -
 2 files changed, 7 deletions(-)

diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/util/AcmeUtils.java b/acme4j-client/src/main/java/org/shredzone/acme4j/util/AcmeUtils.java
index dedd9d9a..45581c66 100644
--- a/acme4j-client/src/main/java/org/shredzone/acme4j/util/AcmeUtils.java
+++ b/acme4j-client/src/main/java/org/shredzone/acme4j/util/AcmeUtils.java
@@ -40,7 +40,6 @@ import org.shredzone.acme4j.exception.AcmeProtocolException;
 public final class AcmeUtils {
     private static final char[] HEX = "0123456789abcdef".toCharArray();
     private static final String ACME_ERROR_PREFIX = "urn:ietf:params:acme:error:";
-    private static final String ACME_ERROR_PREFIX_DEPRECATED = "urn:acme:error:";
 
     private static final Pattern DATE_PATTERN = Pattern.compile(
                     "^(\\d{4})-(\\d{2})-(\\d{2})T"
@@ -206,9 +205,6 @@ public final class AcmeUtils {
      * Strips the acme error prefix from the error string.
      * <p>
      * For example, for "urn:ietf:params:acme:error:conflict", "conflict" is returned.
-     * <p>
-     * This method also handles the deprecated prefix "urn:acme:error:" that is still in
-     * use at Let's Encrypt.
      *
      * @param type
      *            Error type to strip the prefix from. {@code null} is safe.
@@ -217,8 +213,6 @@ public final class AcmeUtils {
     public static String stripErrorPrefix(String type) {
         if (type != null && type.startsWith(ACME_ERROR_PREFIX)) {
             return type.substring(ACME_ERROR_PREFIX.length());
-        } else if (type != null && type.startsWith(ACME_ERROR_PREFIX_DEPRECATED)) {
-            return type.substring(ACME_ERROR_PREFIX_DEPRECATED.length());
         } else {
             return null;
         }
diff --git a/acme4j-client/src/test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java b/acme4j-client/src/test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java
index 5452c590..46f92e19 100644
--- a/acme4j-client/src/test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java
+++ b/acme4j-client/src/test/java/org/shredzone/acme4j/util/AcmeUtilsTest.java
@@ -238,7 +238,6 @@ public class AcmeUtilsTest {
     @Test
     public void testStripErrorPrefix() {
         assertThat(stripErrorPrefix("urn:ietf:params:acme:error:unauthorized"), is("unauthorized"));
-        assertThat(stripErrorPrefix("urn:acme:error:deprecated"), is("deprecated"));
         assertThat(stripErrorPrefix("urn:somethingelse:error:message"), is(nullValue()));
         assertThat(stripErrorPrefix(null), is(nullValue()));
     }