removed apache commons dependencies since there is a way to base64-encode an array of bytes in the JDK (though it's hidden)

fernandezpablo85 · fernandezpablo85 · commit b3d83739980a · 2013-02-20T12:56:03.000-03:00
diff --git a/pom.xml b/pom.xml
@@ -44,11 +44,6 @@
   </scm>
 
   <dependencies>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.4</version>
-    </dependency>
 
     <dependency>
       <groupId>junit</groupId>
diff --git a/src/main/java/org/scribe/services/HMACSha1SignatureService.java b/src/main/java/org/scribe/services/HMACSha1SignatureService.java
@@ -3,10 +3,12 @@
 import javax.crypto.*;
 import javax.crypto.spec.*;
 
-import org.apache.commons.codec.binary.*;
 import org.scribe.exceptions.*;
 import org.scribe.utils.*;
 
+// implementation of base64 encoding lives here.
+import javax.xml.bind.DatatypeConverter;
+
 /**
  * HMAC-SHA1 implementation of {@SignatureService}
  * 
@@ -44,7 +46,12 @@ private String doSign(String toSign, String keyString) throws Exception
     Mac mac = Mac.getInstance(HMAC_SHA1);
     mac.init(key);
     byte[] bytes = mac.doFinal(toSign.getBytes(UTF8));
-    return new String(Base64.encodeBase64(bytes), UTF8).replace(CARRIAGE_RETURN, EMPTY_STRING);
+    return bytesToBase64String(bytes).replace(CARRIAGE_RETURN, EMPTY_STRING);
+  }
+
+  private String bytesToBase64String(byte[] bytes)
+  {
+    return DatatypeConverter.printBase64Binary(bytes);
   }
 
   /**
diff --git a/src/main/java/org/scribe/services/RSASha1SignatureService.java b/src/main/java/org/scribe/services/RSASha1SignatureService.java
@@ -1,9 +1,11 @@
 package org.scribe.services;
 
-import org.apache.commons.codec.binary.*;
 import org.scribe.exceptions.*;
 import java.security.*;
 
+// implementation of base64 encoding lives here.
+import javax.xml.bind.DatatypeConverter;
+
 /**
  * A signature service that uses the RSA-SHA1 algorithm.
  */
@@ -30,14 +32,19 @@ public String getSignature(String baseString, String apiSecret, String tokenSecr
       Signature signature = Signature.getInstance(RSA_SHA1);
       signature.initSign(privateKey);
       signature.update(baseString.getBytes(UTF8));
-      return new String(Base64.encodeBase64(signature.sign(), false), UTF8);
+      return bytesToBase64String(signature);
     }
     catch (Exception e)
     {
       throw new OAuthSignatureException(baseString, e);
     }
   }
 
+  private String bytesToBase64String(Signature signature) throws SignatureException
+  {
+    return DatatypeConverter.printBase64Binary(signature.sign());
+  }
+
   /**
    * {@inheritDoc}
    */
diff --git a/src/test/java/org/scribe/services/RSASha1SignatureServiceTest.java b/src/test/java/org/scribe/services/RSASha1SignatureServiceTest.java
@@ -3,7 +3,8 @@
 import static org.junit.Assert.*;
 
 import org.junit.*;
-import org.apache.commons.codec.binary.*;
+
+import javax.xml.bind.DatatypeConverter;
 import java.security.*;
 import java.security.spec.*;
 
@@ -55,7 +56,7 @@ private static PrivateKey getPrivateKey()
     try
     {
       KeyFactory fac = KeyFactory.getInstance("RSA");
-      PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(Base64.decodeBase64(str.getBytes()));
+      PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(DatatypeConverter.parseBase64Binary(str));
       return fac.generatePrivate(privKeySpec);
     }
     catch (Exception e)
