fix string == -> equals()

sebest · sebest · commit f937cec8233e · 2012-09-19T15:47:06.000+02:00
diff --git a/build.xml b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="CloudKey" default="jar" basedir=".">
-  <property name="version" value="1.1" />
+  <property name="version" value="1.2" />
   <property name="src" location="src" />
   <property name="build" location="build" />
   <property name="thirdparty" value="third-party" />
diff --git a/cloudkey-1.1.jar b/cloudkey-1.1.jar
diff --git a/src/net/dmcloud/cloudkey/CloudKey.java b/src/net/dmcloud/cloudkey/CloudKey.java
@@ -58,18 +58,18 @@ public String mediaGetStreamUrl(String id, String asset_name, int seclevel, Stri
 
 	public String mediaGetStreamUrl(String url, String id, String asset_name, int seclevel, String asnum, String ip, String useragent, String[] countries, String[] referers, int expires, String extension, Boolean download)  throws DCException
 	{
-		if (extension == "")
+		if (extension.equals(""))
 		{
 			String[] parts = asset_name.split("\\_");
-			extension = (parts[0] != asset_name) ? parts[0] : extension;
+			extension = (!parts[0].equals(asset_name)) ? parts[0] : extension;
 		}
 		if (asset_name.length() >= 15 && asset_name.substring(0, 15) == "jpeg_thumbnail_")
 		{
 			return CloudKey.STATIC_URL + this.user_id + "/" + id + "/" + asset_name + "." + extension;
 		}
 		else
 		{
-			String _url = this.cdn_url + "/route/" + this.user_id + "/" + id + "/" + asset_name + ((extension != "") ? "." + extension : "");
+			String _url = this.cdn_url + "/route/" + this.user_id + "/" + id + "/" + asset_name + ((!extension.equals("")) ? "." + extension : "");
 			return Helpers.sign_url(_url, this.api_key, seclevel, asnum, ip, useragent, countries, referers, expires) + (download ? "&throttle=0&helper=0&cache=0" : "");
 		}
 	}
@@ -165,11 +165,11 @@ public DCObject fileUpload(Boolean status, String jsonp_cb, String target) throw
 		{
 			args.push("status", true);
 		}
-		if (jsonp_cb != "")
+		if (!jsonp_cb.equals(""))
 		{
 			args.push("jsonp_cb", jsonp_cb);
 		}
-		if (target != "")
+		if (!target.equals(""))
 		{
 			args.push("target", target);
 		}
diff --git a/src/net/dmcloud/cloudkey/Helpers.java b/src/net/dmcloud/cloudkey/Helpers.java
@@ -125,23 +125,23 @@ static public String sign_url(String url, String secret, int seclevel, String as
 		{
 			if ((seclevel & CloudKey.SECLEVEL_ASNUM) > 0)
 			{
-				if (asnum == "")
+				if (asnum.equals(""))
 				{
 					throw new DCException("IP security level required and no IP address provided.");
 				}
 				secparams += asnum;
 			}
 			if ((seclevel & CloudKey.SECLEVEL_IP) > 0)
 			{
-				if (asnum == "")
+				if (asnum.equals(""))
 				{
 					throw new DCException("IP security level required and no IP address provided.");
 				}
 				secparams += ip;
 			}
 			if ((seclevel & CloudKey.SECLEVEL_USERAGENT) > 0)
 			{
-				if (asnum == "")
+				if (asnum.equals(""))
 				{
 					throw new DCException("USERAGENT security level required and no user-agent provided.");
 				}
@@ -184,7 +184,7 @@ static public String sign_url(String url, String secret, int seclevel, String as
 		{
             try
             {
-				public_secparams_encoded = Base64.encodeBase64String(gzcompress(implode("&", public_secparams)));
+				public_secparams_encoded = Base64.encodeBase64URLSafeString(gzcompress(implode("&", public_secparams)));
 			}
             catch (Exception e)
             {
@@ -201,7 +201,7 @@ static public String sign_url(String url, String secret, int seclevel, String as
 
         String digest = md5(seclevel + url + expires + rand + secret + secparams + public_secparams_encoded);
 
-		return url + "?" + (query != "" ? query + '&' : "") + "auth=" + expires + "-" + seclevel + "-" + rand + "-" + digest + (public_secparams_encoded != "" ? "-" + public_secparams_encoded : "");
+		return url + "?" + (!query.equals("") ? query + '&' : "") + "auth=" + expires + "-" + seclevel + "-" + rand + "-" + digest + (public_secparams_encoded != "" ? "-" + public_secparams_encoded : "");
 	}
 
 	private static String implode(String delim, String[] args)
diff --git a/src/net/dmcloud/cloudkey/Test.java b/src/net/dmcloud/cloudkey/Test.java
@@ -97,7 +97,7 @@ public void testCloudKey()
 			for(int i=0; i<list.size(); i++)
 			{
 				DCObject item = DCObject.create((Map)list.get(i));
-				assertEquals((item.pull("meta.title") != ""), true);
+				assertEquals((!item.pull("meta.title").equals("")), true);
 			}
 		}
 		catch (Exception e)
diff --git a/src/net/dmcloud/util/FAToken.java b/src/net/dmcloud/util/FAToken.java
@@ -187,7 +187,7 @@ public String toJSON() throws Exception {
     }
 
     public String toBase64() throws Exception {
-        return Base64.encodeBase64String(toJSON().getBytes());
+        return Base64.encodeBase64URLSafeString(toJSON().getBytes());
    }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -58,18 +58,18 @@ public String mediaGetStreamUrl(String id, String asset_name, int seclevel, Stri`
`58`	`58`
`59`	`59`	`public String mediaGetStreamUrl(String url, String id, String asset_name, int seclevel, String asnum, String ip, String useragent, String[] countries, String[] referers, int expires, String extension, Boolean download) throws DCException`
`60`	`60`	`{`
`61`		`- if (extension == "")`
	`61`	`+ if (extension.equals(""))`
`62`	`62`	`{`
`63`	`63`	`String[] parts = asset_name.split("\\_");`
`64`		`- extension = (parts[0] != asset_name) ? parts[0] : extension;`
	`64`	`+ extension = (!parts[0].equals(asset_name)) ? parts[0] : extension;`
`65`	`65`	`}`
`66`	`66`	`if (asset_name.length() >= 15 && asset_name.substring(0, 15) == "jpeg_thumbnail_")`
`67`	`67`	`{`
`68`	`68`	`return CloudKey.STATIC_URL + this.user_id + "/" + id + "/" + asset_name + "." + extension;`
`69`	`69`	`}`
`70`	`70`	`else`
`71`	`71`	`{`
`72`		`- String _url = this.cdn_url + "/route/" + this.user_id + "/" + id + "/" + asset_name + ((extension != "") ? "." + extension : "");`
	`72`	`+ String _url = this.cdn_url + "/route/" + this.user_id + "/" + id + "/" + asset_name + ((!extension.equals("")) ? "." + extension : "");`
`73`	`73`	`return Helpers.sign_url(_url, this.api_key, seclevel, asnum, ip, useragent, countries, referers, expires) + (download ? "&throttle=0&helper=0&cache=0" : "");`
`74`	`74`	`}`
`75`	`75`	`}`
`@@ -165,11 +165,11 @@ public DCObject fileUpload(Boolean status, String jsonp_cb, String target) throw`
`165`	`165`	`{`
`166`	`166`	`args.push("status", true);`
`167`	`167`	`}`
`168`		`- if (jsonp_cb != "")`
	`168`	`+ if (!jsonp_cb.equals(""))`
`169`	`169`	`{`
`170`	`170`	`args.push("jsonp_cb", jsonp_cb);`
`171`	`171`	`}`
`172`		`- if (target != "")`
	`172`	`+ if (!target.equals(""))`
`173`	`173`	`{`
`174`	`174`	`args.push("target", target);`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,23 +125,23 @@ static public String sign_url(String url, String secret, int seclevel, String as`
`125`	`125`	`{`
`126`	`126`	`if ((seclevel & CloudKey.SECLEVEL_ASNUM) > 0)`
`127`	`127`	`{`
`128`		`- if (asnum == "")`
	`128`	`+ if (asnum.equals(""))`
`129`	`129`	`{`
`130`	`130`	`throw new DCException("IP security level required and no IP address provided.");`
`131`	`131`	`}`
`132`	`132`	`secparams += asnum;`
`133`	`133`	`}`
`134`	`134`	`if ((seclevel & CloudKey.SECLEVEL_IP) > 0)`
`135`	`135`	`{`
`136`		`- if (asnum == "")`
	`136`	`+ if (asnum.equals(""))`
`137`	`137`	`{`
`138`	`138`	`throw new DCException("IP security level required and no IP address provided.");`
`139`	`139`	`}`
`140`	`140`	`secparams += ip;`
`141`	`141`	`}`
`142`	`142`	`if ((seclevel & CloudKey.SECLEVEL_USERAGENT) > 0)`
`143`	`143`	`{`
`144`		`- if (asnum == "")`
	`144`	`+ if (asnum.equals(""))`
`145`	`145`	`{`
`146`	`146`	`throw new DCException("USERAGENT security level required and no user-agent provided.");`
`147`	`147`	`}`
`@@ -184,7 +184,7 @@ static public String sign_url(String url, String secret, int seclevel, String as`
`184`	`184`	`{`
`185`	`185`	`try`
`186`	`186`	`{`
`187`		`- public_secparams_encoded = Base64.encodeBase64String(gzcompress(implode("&", public_secparams)));`
	`187`	`+ public_secparams_encoded = Base64.encodeBase64URLSafeString(gzcompress(implode("&", public_secparams)));`
`188`	`188`	`}`
`189`	`189`	`catch (Exception e)`
`190`	`190`	`{`
`@@ -201,7 +201,7 @@ static public String sign_url(String url, String secret, int seclevel, String as`
`201`	`201`
`202`	`202`	`String digest = md5(seclevel + url + expires + rand + secret + secparams + public_secparams_encoded);`
`203`	`203`
`204`		`- return url + "?" + (query != "" ? query + '&' : "") + "auth=" + expires + "-" + seclevel + "-" + rand + "-" + digest + (public_secparams_encoded != "" ? "-" + public_secparams_encoded : "");`
	`204`	`+ return url + "?" + (!query.equals("") ? query + '&' : "") + "auth=" + expires + "-" + seclevel + "-" + rand + "-" + digest + (public_secparams_encoded != "" ? "-" + public_secparams_encoded : "");`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`private static String implode(String delim, String[] args)`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void testCloudKey()`
`97`	`97`	`for(int i=0; i<list.size(); i++)`
`98`	`98`	`{`
`99`	`99`	`DCObject item = DCObject.create((Map)list.get(i));`
`100`		`- assertEquals((item.pull("meta.title") != ""), true);`
	`100`	`+ assertEquals((!item.pull("meta.title").equals("")), true);`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public String toJSON() throws Exception {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`public String toBase64() throws Exception {`
`190`		`- return Base64.encodeBase64String(toJSON().getBytes());`
	`190`	`+ return Base64.encodeBase64URLSafeString(toJSON().getBytes());`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`}`