Merge pull request #13 from akamai-open/maciej-changes-for-rc2

Maciej changes for rc2

Author: elreydetodo

README.md

@@ -1,4 +1,4 @@
-# EdgeGrid for Java
+# EdgeGrid Client for Java
 
 Java implementation of Akamai {OPEN} EdgeGrid signing in Java.
 

edgegrid-signer-core/pom.xml

@@ -11,6 +11,7 @@
 
     <artifactId>edgegrid-signer-core</artifactId>
     <packaging>jar</packaging>
+    <name>EdgeGrid Client for Java</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

edgegrid-signer-core/src/main/java/com/akamai/edgegrid/signer/AbstractEdgeGridRequestSigner.java

@@ -90,9 +90,9 @@ public void sign(RequestT request) throws RequestSigningException {
      *
      * @param request an HTTP client-specific request
      * @return a {@link Request} representation of {@code request}
-     * @throws RequestSigningException if duplicate header definitions are found
+     * @throws IllegalArgumentException if duplicate header definitions are found
      */
-    protected abstract Request map(RequestT request) throws RequestSigningException;
+    protected abstract Request map(RequestT request);
 
     /**
      * Updates a given HTTP request by adding Authorization header with a value containing request

edgegrid-signer-core/src/main/java/com/akamai/edgegrid/signer/EdgeGridV1Signer.java

@@ -239,8 +239,9 @@ private String getCanonicalizedRequest(Request request, ClientCredential credent
         sb.append(request.getMethod().toUpperCase());
         sb.append('\t');
 
-        String scheme = StringUtils.defaultString(request.getUri().getScheme(), "https");
-        sb.append(scheme.toLowerCase());
+        // all OPEN APIs use HTTPS, not HTTP
+        String scheme = "https";
+        sb.append(scheme);
         sb.append('\t');
 
         String host = credential.getHost();

edgegrid-signer-core/src/main/java/com/akamai/edgegrid/signer/Request.java

@@ -30,8 +30,6 @@
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.akamai.edgegrid.signer.exceptions.RequestSigningException;
-
 
 /**
  * Library-agnostic representation of an HTTP request. This object is immutable, so you probably
@@ -152,14 +150,14 @@ public RequestBuilder body(byte[] requestBody) {
          * @param headerName a header name
          * @param value a header value
          * @return reference back to this builder instance
-         * @throws RequestSigningException if a duplicate header name is encountered
+         * @throws IllegalArgumentException if a duplicate header name is encountered
          */
-        public RequestBuilder header(String headerName, String value) throws RequestSigningException {
+        public RequestBuilder header(String headerName, String value) {
             Validate.notEmpty(headerName, "headerName cannot be empty");
             Validate.notEmpty(value, "value cannot be empty");
             headerName = headerName.toLowerCase();
             if (this.headers.containsKey(headerName)) {
-                throw new RequestSigningException("Duplicate header found: " + headerName);
+                throw new IllegalArgumentException("Duplicate header found: " + headerName);
             }
             headers.put(headerName, value);
             return this;
@@ -178,9 +176,9 @@ public RequestBuilder header(String headerName, String value) throws RequestSign
          *
          * @param headers a {@link Map} of headers
          * @return reference back to this builder instance
-         * @throws RequestSigningException if a duplicate header name is encountered
+         * @throws IllegalArgumentException if a duplicate header name is encountered
          */
-        public RequestBuilder headers(Map<String, String> headers) throws RequestSigningException {
+        public RequestBuilder headers(Map<String, String> headers)  {
             Validate.notNull(headers, "headers cannot be null");
             for (Map.Entry<String, String> entry : headers.entrySet()) {
                 header(entry.getKey(), entry.getValue());
@@ -243,17 +241,6 @@ public RequestBuilder uri(URI uri) {
             return this;
         }
 
-        /**
-         * Please use {@link #uri(URI)} instead.
-         *
-         * @param uri a {@link URI}
-         * @return reference back to this builder instance
-         * @deprecated
-         */
-        @Deprecated
-        public RequestBuilder uriWithQuery(URI uri) {
-            return uri(uri);
-        }
 
         /**
          * Returns a newly-created immutable HTTP request.

edgegrid-signer-core/src/test/java/com/akamai/edgegrid/signer/AbstractEdgeGridRequestSignerTest.java

@@ -54,7 +54,7 @@ public AbstractEdgeGridRequestSigner mockedSigner(ClientCredentialProvider clien
 
         return new AbstractEdgeGridRequestSigner(clientCredentialProvider) {
             @Override
-            protected Request map(Object request) throws RequestSigningException {
+            protected Request map(Object request)  {
                 return null;
             }
 

edgegrid-signer-core/src/test/java/com/akamai/edgegrid/signer/RequestTest.java

@@ -26,7 +26,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import com.akamai.edgegrid.signer.exceptions.RequestSigningException;
 
 /**
  * Unit tests for {@link Request}.
@@ -40,7 +39,7 @@ public void testAcceptRequestWithAbsoluteUriAsString(
             String caseName,
             String uri,
             String expectedPath,
-            String expectedQuery) throws RequestSigningException {
+            String expectedQuery) {
         Request request = Request.builder()
                 .body("body".getBytes())
                 .method("GET")
@@ -61,7 +60,7 @@ public void testAcceptRequestWithAbsoluteUriAsURI(
             String caseName,
             String uri,
             String expectedPath,
-            String expectedQuery) throws RequestSigningException {
+            String expectedQuery) {
         Request request = Request.builder()
                 .body("body".getBytes())
                 .method("GET")
@@ -78,7 +77,7 @@ public void testAcceptRequestWithAbsoluteUriAsURI(
     }
 
     @Test
-    public void testAcceptRequestWithRelativeUri() throws RequestSigningException {
+    public void testAcceptRequestWithRelativeUri() {
         Request request = Request.builder()
                 .body("body".getBytes())
                 .method("GET")
@@ -94,7 +93,7 @@ public void testAcceptRequestWithRelativeUri() throws RequestSigningException {
     }
 
     @Test
-    public void testHeadersLowercasing() throws RequestSigningException {
+    public void testHeadersLowercasing()  {
         Request request = Request.builder()
                 .body("body".getBytes())
                 .method("GET")
@@ -105,8 +104,8 @@ public void testHeadersLowercasing() throws RequestSigningException {
         assertThat(request.getHeaders().get("header"), equalTo("h"));
     }
 
-    @Test(expectedExceptions = RequestSigningException.class)
-    public void testRejectDuplicateHeaderNames() throws RequestSigningException {
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testRejectDuplicateHeaderNames() {
         Request.builder()
                 .method("GET")
                 .uri(URI.create("https://control.akamai.com/check"))
@@ -115,8 +114,8 @@ public void testRejectDuplicateHeaderNames() throws RequestSigningException {
                 .build();
     }
 
-    @Test(expectedExceptions = RequestSigningException.class)
-    public void testRejectDuplicateCaseInsensitiveHeaderNames() throws RequestSigningException {
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testRejectDuplicateCaseInsensitiveHeaderNames() {
         Request.builder()
                 .method("GET")
                 .uri(URI.create("https://control.akamai.com/check"))
@@ -125,8 +124,8 @@ public void testRejectDuplicateCaseInsensitiveHeaderNames() throws RequestSignin
                 .build();
     }
 
-    @Test(expectedExceptions = RequestSigningException.class)
-    public void testRejectDuplicateHeaderNamesMap() throws RequestSigningException {
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testRejectDuplicateHeaderNamesMap() {
         Request.RequestBuilder builder = Request.builder()
                 .method("GET")
                 .uri(URI.create("https://control.akamai.com/check"))
@@ -136,8 +135,8 @@ public void testRejectDuplicateHeaderNamesMap() throws RequestSigningException {
         builder.headers(headers);
     }
 
-    @Test(expectedExceptions = RequestSigningException.class)
-    public void testRejectDuplicateHeaderNamesMixedCase() throws RequestSigningException {
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testRejectDuplicateHeaderNamesMixedCase() {
         Request.builder()
                 .method("GET")
                 .uri(URI.create("https://control.akamai.com/check"))

edgegrid-signer-google-http-client/pom.xml

@@ -11,6 +11,7 @@
 
     <artifactId>edgegrid-signer-google-http-client</artifactId>
     <packaging>jar</packaging>
+    <name>Google HTTP Client Library binding for EdgeGrid Client</name>
 
     <dependencies>
         <dependency>

edgegrid-signer-google-http-client/src/main/java/com/akamai/edgegrid/signer/googlehttpclient/GoogleHttpClientEdgeGridRequestSigner.java

@@ -59,7 +59,7 @@ public GoogleHttpClientEdgeGridRequestSigner(ClientCredentialProvider clientCred
     }
 
     @Override
-    protected Request map(HttpRequest request) throws RequestSigningException {
+    protected Request map(HttpRequest request) {
         Request.RequestBuilder builder = Request.builder()
                 .method(request.getRequestMethod())
                 .uri(request.getUrl().toURI())

edgegrid-signer-rest-assured/pom.xml

@@ -11,6 +11,7 @@
 
     <artifactId>edgegrid-signer-rest-assured</artifactId>
     <packaging>jar</packaging>
+    <name>REST-assured binding for EdgeGrid Client</name>
 
     <dependencies>
         <dependency>