base64 encoding for java 9+

Author: rashtao

src/main/java/com/arangodb/velocypack/internal/VPackDeserializers.java

@@ -20,22 +20,21 @@
 
 package com.arangodb.velocypack.internal;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.xml.bind.DatatypeConverter;
-
 import com.arangodb.velocypack.VPackDeserializationContext;
 import com.arangodb.velocypack.VPackDeserializer;
 import com.arangodb.velocypack.VPackSlice;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocypack.exception.VPackParserException;
 import com.arangodb.velocypack.internal.util.DateUtil;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.util.Base64;
+import java.util.Date;
+import java.util.UUID;
+
 /**
  * @author Mark Vollmary
  *
@@ -227,7 +226,7 @@ public byte[] deserialize(
 			final VPackSlice parent,
 			final VPackSlice vpack,
 			final VPackDeserializationContext context) throws VPackException {
-			return DatatypeConverter.parseBase64Binary(vpack.getAsString());
+			return Base64.getDecoder().decode(vpack.getAsString());
 		}
 
 	};

src/main/java/com/arangodb/velocypack/internal/VPackSerializers.java

@@ -20,21 +20,20 @@
 
 package com.arangodb.velocypack.internal;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.UUID;
-
-import javax.xml.bind.DatatypeConverter;
-
 import com.arangodb.velocypack.VPackBuilder;
 import com.arangodb.velocypack.VPackSerializationContext;
 import com.arangodb.velocypack.VPackSerializer;
 import com.arangodb.velocypack.VPackSlice;
 import com.arangodb.velocypack.exception.VPackException;
 import com.arangodb.velocypack.internal.util.DateUtil;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.util.Base64;
+import java.util.Date;
+import java.util.UUID;
+
 /**
  * @author Mark Vollmary
  *
@@ -212,7 +211,7 @@ public void serialize(
 			final String attribute,
 			final byte[] value,
 			final VPackSerializationContext context) throws VPackException {
-			builder.add(attribute, DatatypeConverter.printBase64Binary(value));
+			builder.add(attribute, Base64.getEncoder().encodeToString(value));
 		}
 	};
 	public static final VPackSerializer<Byte> BYTE = new VPackSerializer<Byte>() {

src/test/java/com/arangodb/velocypack/VPackSerializeDeserializeTest.java

@@ -20,11 +20,11 @@
 
 package com.arangodb.velocypack;
 
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+import com.arangodb.velocypack.VPack.SerializeOptions;
+import com.arangodb.velocypack.annotations.Expose;
+import com.arangodb.velocypack.annotations.SerializedName;
+import com.arangodb.velocypack.exception.VPackException;
+import org.junit.Test;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -35,30 +35,11 @@
 import java.math.BigInteger;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import javax.xml.bind.DatatypeConverter;
 
-import org.junit.Test;
-
-import com.arangodb.velocypack.VPack.SerializeOptions;
-import com.arangodb.velocypack.annotations.Expose;
-import com.arangodb.velocypack.annotations.SerializedName;
-import com.arangodb.velocypack.exception.VPackException;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 
 /**
  * @author Mark Vollmary
@@ -3875,12 +3856,12 @@ public void fromBinary() {
 		assertThat(vpack, is(notNullValue()));
 		assertThat(vpack.isObject(), is(true));
 		assertThat(vpack.get("foo").isString(), is(true));
-		assertThat(vpack.get("foo").getAsString(), is(DatatypeConverter.printBase64Binary(entity.foo)));
+		assertThat(vpack.get("foo").getAsString(), is(Base64.getEncoder().encodeToString(entity.foo)));
 	}
 
 	@Test
 	public void toBinary() {
-		final String value = DatatypeConverter.printBase64Binary("bar".getBytes());
+		final String value = Base64.getEncoder().encodeToString("bar".getBytes());
 		final VPackSlice vpack = new VPackBuilder().add(ValueType.OBJECT).add("foo", value).close().slice();
 		final BinaryEntity entity = new VPack.Builder().build().deserialize(vpack, BinaryEntity.class);
 		assertThat(entity, is(notNullValue()));