fixed lint issues

Author: daniel-sanche

cdn/signed-urls/src/main/java/com/google/cdn/SignedUrls.java

@@ -15,20 +15,21 @@
  */
 
 package com.google.cdn;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
 
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.security.InvalidKeyException;
 import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
 import java.util.Calendar;
 import java.util.Date;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
 
+/**
+ * Samples to create a signed URL for a Cloud CDN endpoint
+ */
 public class SignedUrls {
 
     // [START signUrl]
@@ -52,7 +53,7 @@ public class SignedUrls {
      * @param expirationTime the date that the signed URL expires
      * @return a properly formatted signed URL
      * @throws InvalidKeyException when there is an error generating the signature for the input key
-     * @throws NoSuchAlgorithmException when the HmacSHA1 algorithm is not available in the environment
+     * @throws NoSuchAlgorithmException when HmacSHA1 algorithm is not available in the environment
      */
     public static String signUrl(String url,
                                  byte[] key,
@@ -62,16 +63,18 @@ public static String signUrl(String url,
 
         final long unixTime = expirationTime.getTime() / 1000;
 
-        String urlToSign = url +
-                (url.contains("?") ? "&":"?") +
-                "Expires="+ unixTime +
-                "&KeyName="+ keyName;
+        String urlToSign = url
+                            + (url.contains("?") ? "&" : "?")
+                            + "Expires=" + unixTime
+                            + "&KeyName=" + keyName;
 
         String encoded = SignedUrls.getSignature(key, urlToSign);
-        return urlToSign+"&Signature="+encoded;
+        return urlToSign + "&Signature=" + encoded;
     }
 
-    public static String getSignature(byte[] privateKey, String input) throws InvalidKeyException, NoSuchAlgorithmException {
+    public static String getSignature(byte[] privateKey, String input)
+        throws InvalidKeyException, NoSuchAlgorithmException {
+
         final String algorithm = "HmacSHA1";
         Key key = new SecretKeySpec(privateKey, 0, privateKey.length, algorithm);
         Mac mac = Mac.getInstance(algorithm);
@@ -87,7 +90,8 @@ public static void main(String[] args) throws Exception {
         Date tomorrow = cal.getTime();
 
         //read the key as a base 64 url-safe encoded string
-        String base64String = new String(Files.readAllBytes(Paths.get("./src/main/resources/my-key")));
+        final String keyPath = "./src/main/resources/my-key";
+        String base64String = new String(Files.readAllBytes(Paths.get(keyPath)));
         //turn the key string into a byte array
         byte[] keyBytes = Base64.getUrlDecoder().decode(base64String);
 

cdn/signed-urls/src/test/java/com/google/cdn/SignedUrlsTest.java

@@ -17,34 +17,37 @@
 
 package com.google.cdn;
 
+import static com.google.cdn.SignedUrls.signUrl;
+import static junit.framework.TestCase.assertEquals;
+
 import java.util.Base64;
 import java.util.Date;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import static com.google.cdn.SignedUrls.signUrl;
-import static junit.framework.TestCase.assertEquals;
-
-
+/**
+ * Test SignedUrls samples
+ */
 @RunWith(JUnit4.class)
 @SuppressWarnings("checkstyle:abbreviationaswordinname")
 public class SignedUrlsTest {
-    private static Date EXPIRATION = new Date((long)1518135754*1000);
+    private static long TIMESTAMP = 1518135754;
+    private static Date EXPIRATION = new Date(TIMESTAMP * 1000);
     private static byte[] KEY_BYTES = Base64.getUrlDecoder().decode("aaaaaaaaaaaaaaaaaaaaaa==");
     private static String KEY_NAME = "my-key";
     private static String BASE_URL = "https://www.google.com/";
 
     @Test
     public void testUrlPath() throws Exception {
-        String result = signUrl(BASE_URL+"foo", KEY_BYTES, KEY_NAME, EXPIRATION);
+        String result = signUrl(BASE_URL + "foo", KEY_BYTES, KEY_NAME, EXPIRATION);
         final String expected = "https://www.google.com/foo?Expires=1518135754&KeyName=my-key&Signature=SBdQtypBTcz0gvHRDZjy2pc-F0s=";
         assertEquals(result, expected);
     }
 
     @Test
     public void testUrlParams() throws Exception {
-        String result = signUrl(BASE_URL+"?param=true", KEY_BYTES, KEY_NAME, EXPIRATION);
+        String result = signUrl(BASE_URL + "?param=true", KEY_BYTES, KEY_NAME, EXPIRATION);
         final String expected = "https://www.google.com/?param=true&Expires=1518135754&KeyName=my-key&Signature=ilkstIAKFvOlckbVdfZBWAror3o=";
         assertEquals(result, expected);
     }