LogDog: Update protobufs, add support library.

common/logdog/types/streamname.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package types
 
 import (
+        "encoding/json"
         "errors"
         "fmt"
         "strings"
         "unicode/utf8"
 )
 
 const (
         // StreamNameSep is the separator rune for stream name tokens.
         StreamNameSep = '/'
         nameSepStr    = "/"
@@ skipping 184 matching lines @@
 }
 
 // SegmentCount returns the total number of segments in the StreamName.
 func (s StreamName) SegmentCount() int {
         if len(s) == 0 {
                 return 0
         }
         return strings.Count(string(s), string(StreamNameSep)) + 1
 }
 
+// UnmarshalJSON implements json.Unmarshaler.
+func (s *StreamName) UnmarshalJSON(data []byte) error {
+        v := ""
+        if err := json.Unmarshal(data, &v); err != nil {
+                return err
+        }
+        if err := StreamName(v).Validate(); err != nil {
+                return err
+        }
+        *s = StreamName(v)
+        return nil
+}
+
+// MarshalJSON implements json.Marshaler.
+func (s StreamName) MarshalJSON() ([]byte, error) {
+        v := string(s)
+        return json.Marshal(&v)
+}
+
 // A StreamPath consists of two StreamName, joined via a StreamPathSep (+)
 // separator.
 type StreamPath string
 
 // Split splits a StreamPath into its prefix and name components.
 //
 // If there is no divider present (e.g., foo/bar/baz), the result will parse
 // as the stream prefix with an empty name component.
 func (p StreamPath) Split() (StreamName, StreamName) {
         segments := StreamName(p).Segments()
@@ skipping 10 matching lines @@
 func (p StreamPath) Validate() error {
         prefix, tail := p.Split()
         if err := prefix.Validate(); err != nil {
                 return err
         }
         if err := tail.Validate(); err != nil {
                 return err
         }
         return nil
 }
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (p *StreamPath) UnmarshalJSON(data []byte) error {
+        v := ""
+        if err := json.Unmarshal(data, &v); err != nil {
+                return err
+        }
+        if err := StreamPath(v).Validate(); err != nil {
+                return err
+        }
+        *p = StreamPath(v)
+        return nil
+}
+
+// MarshalJSON implements json.Marshaler.
+func (p StreamPath) MarshalJSON() ([]byte, error) {
+        v := string(p)
+        return json.Marshal(&v)
+}