Support akamai

tallevami-home · tallevami-home · commit 2ef6dacdc024 · 2013-03-13T16:50:11.000+02:00
diff --git a/src/com/cloudinary/Cloudinary.java b/src/com/cloudinary/Cloudinary.java
@@ -20,8 +20,10 @@
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class Cloudinary {
-	public final static String SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
-
+	public final static String CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
+	public final static String AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net";
+	public final static String SHARED_CDN = AKAMAI_SHARED_CDN;
+	
 	private final Map config = new HashMap();
 	
 	public Cloudinary(Map config) {
diff --git a/src/com/cloudinary/Url.java b/src/com/cloudinary/Url.java
@@ -111,11 +111,7 @@ public String generate(String source) {
           source = source + "." + format;
         }            
         if (secure && StringUtils.isBlank(secureDistribution)) {
-            if (privateCdn) {
-                throw new IllegalArgumentException("secure_distribution not defined");
-            } else {
-                secureDistribution = Cloudinary.SHARED_CDN;
-            }
+            secureDistribution = Cloudinary.SHARED_CDN;
         } 
         String prefix;
         if (secure) {
@@ -127,7 +123,7 @@ public String generate(String source) {
             String host = cname != null ? cname : (privateCdn ? cloudName + "-" : "") + "res.cloudinary.com";
             prefix = "http://" + subdomain + host;
         }
-        if (!privateCdn) prefix = prefix + "/" + cloudName;
+        if (!privateCdn || (secure && Cloudinary.AKAMAI_SHARED_CDN.equals(secureDistribution))) prefix = prefix + "/" + cloudName;
         if (version != null) version = "v" + version;
         
         return StringUtils.join(new String[]{prefix, resourceType, type, transformationStr, version, source}, "/").replaceAll("([^:])\\/+", "$1/");
diff --git a/tests/com/cloudinary/test/CloudinaryTest.java b/tests/com/cloudinary/test/CloudinaryTest.java
@@ -36,7 +36,7 @@ public void testCloudNameOptions() {
 	public void testSecureDistribution() {
 		// should use default secure distribution if secure=TRUE
 		String result = cloudinary.url().secure(true).generate("test");
-		assertEquals("https://d3jpl91pxevbkh.cloudfront.net/test123/image/upload/test", result);
+		assertEquals("https://cloudinary-a.akamaihd.net/test123/image/upload/test", result);
 	}
 
 	@Test
@@ -54,12 +54,31 @@ public void testSecureDistibution() {
 		assertEquals("https://config.secure.distribution.com/test123/image/upload/test", result);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void testMissingSecureDistribution() {
-		// should raise exception if secure is given with private_cdn and no
-		// secure_distribution
+	@Test
+	public void testSecureAkamai() {
+		// should default to akamai if secure is given with private_cdn and no secure_distribution
+		cloudinary.setConfig("secure", true);
+		cloudinary.setConfig("private_cdn", true);
+		String result = cloudinary.url().generate("test");
+		assertEquals("https://cloudinary-a.akamaihd.net/test123/image/upload/test", result);
+	}
+
+	@Test
+	public void testSecureNonAkamai() {
+		// should not add cloud_name if private_cdn and secure non akamai secure_distribution
+		cloudinary.setConfig("secure", true);
 		cloudinary.setConfig("private_cdn", true);
-		cloudinary.url().secure(true).generate("test");
+		cloudinary.setConfig("secure_distribution", "something.cloudfront.net");
+		String result = cloudinary.url().generate("test");
+		assertEquals("https://something.cloudfront.net/image/upload/test", result);
+	}
+
+	@Test
+	public void testHttpPrivateCdn() {
+		// should not add cloud_name if private_cdn and not secure
+		cloudinary.setConfig("private_cdn", true);
+		String result = cloudinary.url().generate("test");
+		assertEquals("http://test123-res.cloudinary.com/image/upload/test", result);
 	}
 
 	@Test
