scrub UrlBuilderStrategy, enable crippled core mode without loading strategies, move core test to core

Author: itaibenari

cloudinary-android-test/src/main/java/com/cloudinary/test/CloudinaryTest.java

@@ -17,7 +17,6 @@
 
 import com.cloudinary.strategies.AbstractApiStrategy;
 import com.cloudinary.strategies.AbstractUploaderStrategy;
-import com.cloudinary.strategies.AbstractUrlBuilderStrategy;
 import com.cloudinary.strategies.StrategyLoader;
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.StringUtils;
@@ -35,11 +34,6 @@ public class Cloudinary {
 		"com.cloudinary.http42.ApiStrategy", 
 		"com.cloudinary.http43.ApiStrategy",
 		"com.cloudinary.http44.ApiStrategy" ));
-	private static List<String> URLBUILDER_STRATEGIES = new ArrayList<String>(Arrays.asList( 
-		"com.cloudinary.android.UrlBuilderStrategy",
-		"com.cloudinary.http42.UrlBuilderStrategy",
-		"com.cloudinary.http43.UrlBuilderStrategy",
-		"com.cloudinary.http44.UrlBuilderStrategy" ));
 
 	public final static String CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
 	public final static String OLD_AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net";
@@ -52,7 +46,6 @@ public class Cloudinary {
 	public final Configuration config;
 	private AbstractUploaderStrategy uploaderStrategy;
 	private AbstractApiStrategy apiStrategy;
-	private AbstractUrlBuilderStrategy urlBuilderStrategy;
 
 	public Uploader uploader(){
 		return new Uploader(this,uploaderStrategy);
@@ -76,13 +69,8 @@ public static void registerAPIStrategy(String className){
 		}
 	}
 
-	public static void registerUrlBuilderStrategy(String className){
-		if (!URLBUILDER_STRATEGIES.contains(className)){
-			URLBUILDER_STRATEGIES.add(className);
-		}
-	}
-
 	private void loadStrategies() {
+		if (!this.config.loadStrategies) return;
 		uploaderStrategy= StrategyLoader.find(UPLOAD_STRATEGIES);
 
 		if (uploaderStrategy==null){
@@ -93,33 +81,26 @@ private void loadStrategies() {
 		if (apiStrategy==null){
 			throw new UnknownError("Can't find Cloudinary platform adapter [" + StringUtils.join(API_STRATEGIES, ",") + "]");
 		}
-
-		urlBuilderStrategy= StrategyLoader.find(URLBUILDER_STRATEGIES);
-		if (urlBuilderStrategy==null){
-			throw new UnknownError("Can't find Cloudinary platform adapter [" + StringUtils.join(URLBUILDER_STRATEGIES, ",") + "]");
-		}
 	}
 
 	public Cloudinary(Map config) {
-		loadStrategies();
 		this.config = new Configuration(config);
-
+		loadStrategies();
 	}
 
 	public Cloudinary(String cloudinaryUrl) {
-		loadStrategies();
 		this.config = new Configuration(parseConfigUrl(cloudinaryUrl));
+		loadStrategies();
 	}
 
 	public Cloudinary() {
-		loadStrategies();
 		String cloudinaryUrl = System.getProperty("CLOUDINARY_URL", System.getenv("CLOUDINARY_URL"));
 		if (cloudinaryUrl != null) {
 			this.config = new Configuration(parseConfigUrl(cloudinaryUrl));
 		}else {
 			this.config = new Configuration();
 		}
-
+		loadStrategies();
 	}
 
 	public Url url() {

cloudinary-android/src/main/java/com/cloudinary/android/UrlBuilderStrategy.java

@@ -37,15 +37,16 @@ public class Configuration {
 	public Boolean secureCdnSubdomain;
 	public boolean useRootPath;
     public int timeout;
+    public boolean loadStrategies = true;
 
     public Configuration(){
     }
 
     private Configuration(String cloudName, String apiKey, String apiSecret, String secureDistribution, String cname, String uploadPrefix, boolean secure, boolean privateCdn, boolean cdnSubdomain, boolean shorten, String callback, String proxyHost, int proxyPort, Boolean secureCdnSubdomain, boolean useRootPath) {
-        this(cloudName, apiKey, apiSecret, secureDistribution, cname, uploadPrefix, secure, privateCdn, cdnSubdomain, shorten, callback, proxyHost, proxyPort, secureCdnSubdomain, useRootPath, 0);
+        this(cloudName, apiKey, apiSecret, secureDistribution, cname, uploadPrefix, secure, privateCdn, cdnSubdomain, shorten, callback, proxyHost, proxyPort, secureCdnSubdomain, useRootPath, 0, true);
     }
 
-    private Configuration(String cloudName, String apiKey, String apiSecret, String secureDistribution, String cname, String uploadPrefix, boolean secure, boolean privateCdn, boolean cdnSubdomain, boolean shorten, String callback, String proxyHost, int proxyPort, Boolean secureCdnSubdomain, boolean useRootPath, int timeout) {
+    private Configuration(String cloudName, String apiKey, String apiSecret, String secureDistribution, String cname, String uploadPrefix, boolean secure, boolean privateCdn, boolean cdnSubdomain, boolean shorten, String callback, String proxyHost, int proxyPort, Boolean secureCdnSubdomain, boolean useRootPath, int timeout, boolean loadStrategies) {
         this.cloudName = cloudName;
         this.apiKey = apiKey;
         this.apiSecret = apiSecret;
@@ -62,6 +63,7 @@ private Configuration(String cloudName, String apiKey, String apiSecret, String
         this.secureCdnSubdomain = secureCdnSubdomain;
         this.useRootPath = useRootPath;
         this.timeout = 0;
+        this.loadStrategies = loadStrategies;
     }
 
 
@@ -87,6 +89,7 @@ public void update(Map config) {
 		this.proxyPort = ObjectUtils.asInteger(config.get("proxy_port"),0);
 		this.secureCdnSubdomain = ObjectUtils.asBoolean(config.get("secure_cdn_subdomain"), null);
 		this.useRootPath = ObjectUtils.asBoolean(config.get("use_root_path"), false);
+		this.loadStrategies = ObjectUtils.asBoolean(config.get("load_strategies"), true);
         this.timeout = ObjectUtils.asInteger(config.get("timeout"), 0);
 	}
 
@@ -167,8 +170,10 @@ private static Configuration parseConfigUrl(String cloudinaryUrl) {
                 }else if (key.equals("cdn_subdomain")){
                 	builder.setCdnSubdomain(ObjectUtils.asBoolean(val, false));
                 }else if (key.equals("shorten")){
-                	 builder.setShorten(ObjectUtils.asBoolean(val, false));
-                }else {
+                	builder.setShorten(ObjectUtils.asBoolean(val, false));
+                } else if (key.equals("load_strategies")){
+                	builder.setLoadStrategies(ObjectUtils.asBoolean(val, true));
+                } else {
 //                	Log.w("Cloudinary", "ignoring invalid parameter " + val);
                 }
 
@@ -197,6 +202,7 @@ public static class Builder {
         private int proxyPort;
         private Boolean secureCdnSubdomain;
         private boolean useRootPath;
+        private boolean loadStrategies = true;
         private int timeout;
 
         /**
@@ -213,7 +219,7 @@ public Builder setTimeout(int timeout) {
         /**
          * Creates a {@link Configuration} with the arguments supplied to this builder
          */
-        public Configuration build() { return new Configuration(cloudName, apiKey, apiSecret, secureDistribution, cname, uploadPrefix, secure, privateCdn, cdnSubdomain, shorten,callback,proxyHost,proxyPort,secureCdnSubdomain,useRootPath); }
+        public Configuration build() { return new Configuration(cloudName, apiKey, apiSecret, secureDistribution, cname, uploadPrefix, secure, privateCdn, cdnSubdomain, shorten,callback,proxyHost,proxyPort,secureCdnSubdomain,useRootPath, timeout, loadStrategies); }
 
         /**
          * The unique name of your cloud at Cloudinary
@@ -310,6 +316,11 @@ public Builder setUseRootPath(boolean useRootPath) {
             return this;
         }
 
+        public Builder setLoadStrategies(boolean loadStrategies) {
+            this.loadStrategies = loadStrategies;
+            return this;
+        }
+        
 
 
         /**
@@ -333,6 +344,7 @@ public Builder from(Configuration other) {
             this.proxyPort = other.proxyPort;
             this.secureCdnSubdomain = other.secureCdnSubdomain;
             this.useRootPath = other.useRootPath;
+            this.loadStrategies = other.loadStrategies;
             this.timeout = other.timeout;
             return this;
         }

cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java

@@ -21,7 +21,7 @@
 import com.cloudinary.Transformation;
 import com.cloudinary.utils.ObjectUtils;
 
-abstract public class AbstractCloudinaryTest {
+public class CloudinaryTest {
 
 	private Cloudinary cloudinary;
 
@@ -31,7 +31,7 @@ abstract public class AbstractCloudinaryTest {
 	@Before
 	public void setUp() {
 		System.out.println("Running " + this.getClass().getName() + "." + currentTest.getMethodName());
-		this.cloudinary = new Cloudinary("cloudinary://a:b@test123");
+		this.cloudinary = new Cloudinary("cloudinary://a:b@test123?load_strategies=false");
 	}
 
 	@Test