Bug 5446: Yangtools UnionStringCodec is not consistent with BinaryStringCodec

[yangtools.git] / yang / yang-data-impl / src / main / java / org / opendaylight / yangtools / yang / data / impl / codec / UnionStringCodec.java

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
index 2dd81a07837840a67224e0e26b8effaeffbda7c0..6d47ab94ab774f95eb194529ef2ad105b6e35796 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
@@ -1,24 +1,27 @@
 /*
- * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
- * This program and the accompanying materials are made available under the terms of the Eclipse
- * Public License v1.0 which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
+
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
 import com.google.common.base.Optional;
+import com.google.common.io.BaseEncoding;
+import java.util.Objects;
 import org.opendaylight.yangtools.yang.data.api.codec.UnionCodec;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class UnionStringCodec extends TypeDefinitionAwareCodec<Object, UnionTypeDefinition> implements UnionCodec<String> {
+final class UnionStringCodec extends TypeDefinitionAwareCodec<Object, UnionTypeDefinition> implements UnionCodec<String> {
 
     private final static Logger LOG = LoggerFactory.getLogger(UnionStringCodec.class);
 
-    protected UnionStringCodec(final Optional<UnionTypeDefinition> typeDef) {
+    private UnionStringCodec(final Optional<UnionTypeDefinition> typeDef) {
         super(typeDef, Object.class);
     }
 
@@ -27,12 +30,16 @@ class UnionStringCodec extends TypeDefinitionAwareCodec<Object, UnionTypeDefinit
     }
 
     @Override
-    public final String serialize(final Object data) {
-        return data == null ? "" : data.toString();
+    public String serialize(final Object data) {
+        if (data instanceof byte[]) {
+            return BaseEncoding.base64().encode((byte[]) data);
+        } else {
+            return Objects.toString(data, "");
+        }
     }
 
     @Override
-    public final Object deserialize(final String stringRepresentation) {
+    public Object deserialize(final String stringRepresentation) {
 
         if (!getTypeDefinition().isPresent()) {
             return stringRepresentation;