Remove decodeSlash

Author: pkoenig10

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/AbstractFeignJaxRsClientBuilder.java

@@ -124,7 +124,6 @@ private static Contract createContract() {
         Contract contract = new JaxRsContract();
         contract = new GuavaOptionalAwareContract(contract);
         contract = new Java8OptionalAwareContract(contract);
-        contract = new SlashEncodingContract(contract);
         contract = new MethodHeaderEnrichmentContract(contract);
         contract = new EndpointNameHeaderEnrichmentContract(contract);
         return contract;

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/RequestTemplate.java

@@ -44,7 +44,6 @@ final class RequestTemplate {
     private StringBuilder url = new StringBuilder();
 
     private byte[] body;
-    private boolean decodeSlash = true;
 
     RequestTemplate() {}
 
@@ -56,7 +55,6 @@ final class RequestTemplate {
         this.queries.putAll(toCopy.queries);
         this.headers.putAll(toCopy.headers);
         this.body = toCopy.body;
-        this.decodeSlash = toCopy.decodeSlash;
     }
 
     private static String urlDecode(String arg) {
@@ -181,9 +179,6 @@ RequestTemplate resolve(Map<String, ?> unencoded) {
             encoded.put(entry.getKey(), urlEncode(String.valueOf(entry.getValue())));
         }
         String resolvedUrl = expand(url.toString(), encoded).replace("+", "%20");
-        if (decodeSlash) {
-            resolvedUrl = resolvedUrl.replace("%2F", "/");
-        }
         url = new StringBuilder(resolvedUrl);
 
         Map<String, Collection<String>> resolvedHeaders = new LinkedHashMap<String, Collection<String>>();
@@ -219,15 +214,6 @@ String method() {
         return method;
     }
 
-    RequestTemplate decodeSlash(boolean decodeSlash) {
-        this.decodeSlash = decodeSlash;
-        return this;
-    }
-
-    boolean decodeSlash() {
-        return decodeSlash;
-    }
-
     /** @see #url() */
     RequestTemplate append(String value) {
         url.append(value);
@@ -439,15 +425,10 @@ Map<String, Collection<String>> headers() {
     }
 
     /**
-     * replaces the {@link Util#CONTENT_LENGTH} header. <br> Usually populated by an {@link
-     * Encoder}.
-     *
      * @see Request#body()
      */
-    RequestTemplate body(byte[] bodyData) {
-        this.body = bodyData;
-        int bodyLength = bodyData != null ? bodyData.length : 0;
-        header(Util.CONTENT_LENGTH, String.valueOf(bodyLength));
+    RequestTemplate body(byte[] body) {
+        this.body = body;
         return this;
     }
 

conjure-java-jaxrs-client/src/main/java/com/palantir/conjure/java/client/jaxrs/SlashEncodingContract.java

@@ -47,10 +47,6 @@ final class Util {
      * The HTTP Content-Length header field name.
      */
     static final String CONTENT_LENGTH = "Content-Length";
-    /**
-     * UTF-8: eight-bit UCS Transformation Format.
-     */
-    static final Charset UTF_8 = Charset.forName("UTF-8");
 
     private static final int BUF_SIZE = 0x800; // 2K chars (4K bytes)