fixing base64 dependency

sboesebeck · Apr 5, 2019 · 734962a · 734962a
1 parent 9cb2b42
commit 734962a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/de/caluga/morphium/ObjectMapperImpl.java b/src/de/caluga/morphium/ObjectMapperImpl.java
@@ -10,14 +10,14 @@
 import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
 import sun.reflect.ReflectionFactory;
 
 import java.io.*;
 import java.lang.reflect.*;
 import java.math.BigInteger;
 import java.util.*;
+import java.util.Base64.Decoder;
+import java.util.Base64.Encoder;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -221,9 +221,9 @@ public Map<String, Object> serialize(Object o) {
                         oout.writeObject(o);
                         oout.flush();
 
-                        BASE64Encoder enc = new BASE64Encoder();
+                        Encoder enc = Base64.getEncoder();
 
-                        String str = enc.encode(out.toByteArray());
+                        String str = new String(enc.encode(out.toByteArray()));
                         obj.setB64Data(str);
                         return serialize(obj);
 
@@ -1007,8 +1007,8 @@ public Type[] getActualTypeArguments() {
 
             if (ret instanceof BinarySerializedObject) {
                 BinarySerializedObject bso = (BinarySerializedObject) ret;
-                BASE64Decoder dec = new BASE64Decoder();
-                ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(dec.decodeBuffer(bso.getB64Data())));
+                Decoder dec = Base64.getDecoder();
+                ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(dec.decode(bso.getB64Data())));
                 return (T) in.readObject();
             }
             return (T) ret;
@@ -1055,10 +1055,10 @@ private Object unmarshallInternal(Object val) {
                 if (d == null) {
                     d = (String) mapVal.get("b64Data");
                 }
-                BASE64Decoder dec = new BASE64Decoder();
+                Decoder dec = Base64.getDecoder();
                 ObjectInputStream in;
                 try {
-                    in = new ObjectInputStream(new ByteArrayInputStream(dec.decodeBuffer(d)));
+                    in = new ObjectInputStream(new ByteArrayInputStream(dec.decode(d)));
                     return in.readObject();
                 } catch (IOException | ClassNotFoundException e) {
                     throw new RuntimeException(e);