| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package rawdatastore | 5 package datastore |
| 6 | 6 |
| 7 import ( | 7 import ( |
| 8 "encoding/json" | 8 "encoding/json" |
| 9 ) | 9 ) |
| 10 | 10 |
| 11 // GenericKey is an implementation of Key which doesn't rely on the | 11 // GenericKey is an implementation of Key which doesn't rely on the |
| 12 // SDK's implementation. It differs slightly in that it's not recursive (and | 12 // SDK's implementation. It differs slightly in that it's not recursive (and |
| 13 // thus cannot express some of the invalid Key's that the SDK implementation | 13 // thus cannot express some of the invalid Key's that the SDK implementation |
| 14 // can). In particular, it's not possible to have a GenericKey in a namespace | 14 // can). In particular, it's not possible to have a GenericKey in a namespace |
| 15 // whose Parent() is in a different namespace. | 15 // whose Parent() is in a different namespace. |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 96 |
| 97 // UnmarshalJSON allows this key to be automatically unmarshaled by encoding/jso
n. | 97 // UnmarshalJSON allows this key to be automatically unmarshaled by encoding/jso
n. |
| 98 func (k *GenericKey) UnmarshalJSON(buf []byte) error { | 98 func (k *GenericKey) UnmarshalJSON(buf []byte) error { |
| 99 appID, namespace, toks, err := KeyUnmarshalJSON(buf) | 99 appID, namespace, toks, err := KeyUnmarshalJSON(buf) |
| 100 if err != nil { | 100 if err != nil { |
| 101 return err | 101 return err |
| 102 } | 102 } |
| 103 *k = *NewKeyToks(appID, namespace, toks) | 103 *k = *NewKeyToks(appID, namespace, toks) |
| 104 return nil | 104 return nil |
| 105 } | 105 } |
| OLD | NEW |