Skip to content

Commit 7a1f53f

Browse files
committed
use bas64 encoder that's build into java
1 parent ba5e612 commit 7a1f53f

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

project/build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#Project properties
2-
#Mon May 24 23:09:46 EDT 2010
2+
#Tue Sep 14 15:46:08 EDT 2010
33
project.organization=org.scalaj
44
project.name=scalaj-http
55
sbt.version=0.7.4
6-
project.version=0.2.1
6+
project.version=0.2.2
77
def.scala.version=2.7.7
88
build.scala.versions=2.8.0 2.7.7
99
project.initialize=false

project/build/HttpProject.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ class HttpProject(info: ProjectInfo) extends DefaultProject(info) {
99
val sourceArtifact = Artifact.sources(artifactID)
1010
override def packageToPublishActions = super.packageToPublishActions ++ Seq(packageSrc)
1111

12-
val commonsCodec = "commons-codec" % "commons-codec" % "1.3" % "compile" withSources()
13-
1412
val specs = if (buildScalaVersion.startsWith("2.7.")) {
1513
"org.scala-tools.testing" % "specs" % "1.6.2.2" % "test" withSources()
1614
} else {

src/main/scala/scalaj/http/Http.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ package scalaj.http
22

33
import java.net.{HttpURLConnection, URL, URLEncoder, URLDecoder}
44
import java.io.{DataOutputStream, InputStream, BufferedReader, InputStreamReader, ByteArrayOutputStream}
5-
import org.apache.commons.codec.binary.Base64
65
import javax.net.ssl.HttpsURLConnection
76
import javax.net.ssl.SSLContext
87
import javax.net.ssl.SSLSession
98
import javax.net.ssl.TrustManager
109
import javax.net.ssl.X509TrustManager
1110
import javax.net.ssl.HostnameVerifier
1211
import java.security.cert.X509Certificate
13-
12+
import sun.misc.BASE64Encoder
1413

1514
object HttpOptions {
1615
type HttpOption = HttpURLConnection => Unit
@@ -171,7 +170,7 @@ object Http {
171170

172171
def urlEncode(name: String): String = URLEncoder.encode(name, charset)
173172
def urlDecode(name: String): String = URLDecoder.decode(name, charset)
174-
def base64(bytes: Array[Byte]) = new String((new Base64).encode(bytes))
173+
def base64(bytes: Array[Byte]) = new BASE64Encoder().encode(bytes)
175174
def base64(in: String): String = base64(in.getBytes(charset))
176175

177176
def toQs(params: List[(String,String)]) = params.map(p => urlEncode(p._1) + "=" + urlEncode(p._2)).mkString("&")

0 commit comments

Comments
 (0)