Merge pull request #35 from hydrogen2/master

Add a new API fromByteArray() to avoid the base64 decoding if the cli…

Author: lanusau

src/main/java/com/iab/gdpr/consent/VendorConsentDecoder.java

@@ -20,7 +20,14 @@ public static VendorConsent fromBase64String(String consentString) {
         if (isNullOrEmpty(consentString))
             throw new IllegalArgumentException("Null or empty consent string passed as an argument");
 
-        final Bits bits = new Bits(BASE64_DECODER.decode(consentString));
+        return fromByteArray(BASE64_DECODER.decode(consentString));
+    }
+
+    public static VendorConsent fromByteArray(byte[] bytes) {
+        if (bytes == null || bytes.length == 0)
+            throw new IllegalArgumentException("Null or empty consent bytes passed as an argument");
+
+        final Bits bits = new Bits(bytes);
         final int version = getVersion(bits);
         switch (version) {
             case 1:

src/test/java/com/iab/gdpr/consent/VendorConsentDecoderTest.java

@@ -24,6 +24,17 @@ public void testNullConsentString() {
         // Then IllegalArgumentException exception is thrown
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullConsentBytes() {
+        // Given: null consent string
+        byte[] consentBytes = null;
+
+        // When: decoder is called
+        final VendorConsent vendorConsent = VendorConsentDecoder.fromByteArray(consentBytes);
+
+        // Then IllegalArgumentException exception is thrown
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void testEmptyConsentString() {
         // Given: empty consent string
@@ -36,6 +47,18 @@ public void testEmptyConsentString() {
 
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testEmptyConsentBytes() {
+        // Given: empty consent string
+        byte[] consentBytes = new byte[0];
+
+        // When: decoder is called
+        final VendorConsent vendorConsent = VendorConsentDecoder.fromByteArray(consentBytes);
+
+        // Then IllegalArgumentException exception is thrown
+
+    }
+
     @Test(expected = IllegalStateException.class)
     public void testUnknownVersion() {
         // Given: unknown version number in consent string