/*
 * Copyright 2004-2007 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package ohnosequences.ivy;

import java.net.URI;
import java.net.URISyntaxException;


/**
 * A utility class for parsing full URIs into S3 component parts.
 *
 * @author Ben Hale
 * @author Evdokim Kovach
 */
public class S3Utils {

  /**
   * Parses the S3 bucket from a properly formed S3 URI.
   * @param uri The URI to parse
   * @return An S3 bucket for the given URI
   */
  public static String getBucket(String uri) {
    String bucket = getUri(uri).getHost();
    return bucket;
  }

  /**
   * Parses the S3 key name from a properly formed S3URI.
   * @param uri The URI to parse
   * @return An S3 key name for the given URI
   */
  public static String getKey(String uri) {
    String key = getUri(uri).getPath().substring(1);
    return key;
  }

  private static URI getUri(String uri) {
    try {
      return new URI(uri);
    } catch (URISyntaxException e) {
      throw new IllegalArgumentException("'" + uri + "' is a malformed S3 URI");
    }
  }

}

@@ -1427,16 +1427,163 @@
   try %7B%0A
+      /* For ohnosequences/sbt-s3-resolver#52, has the effect of cleaning up redundant path delimiters (thereby fixing invalid S3 object keys). */%0A
       re
@@ -1599,16 +1599,28 @@
 URI(uri)
+.normalize()
 ;%0A    %7D 

Normalize the URI before returning (fixes tests)