/*
 * Copyright (C) 2011 Benoit GUEROUT <bguerout at gmail dot com> and Yves AMSELLEM <amsellem dot yves at gmail dot com>
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.jongo.marshall.jackson.oid;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.TreeNode;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;

import java.io.IOException;

import static org.jongo.MongoCollection.MONGO_QUERY_OID;

public class ObjectIdDeserializer extends JsonDeserializer<String> {

    @Override
    public String deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException {
        TreeNode treeNode = jp.readValueAsTree();
        JsonNode oid = ((JsonNode) treeNode).get(MONGO_QUERY_OID);
        if (oid != null)
            return oid.asText();
        else if(treeNode.isValueNode()) {
            return ((JsonNode) treeNode).textValue();
        }
        else
            return treeNode.toString();
    }
}

@@ -975,16 +975,69 @@
 sonNode;
+%0Aimport com.fasterxml.jackson.databind.node.TextNode;
 %0A%0Aimport
@@ -1509,16 +1509,48 @@
 ueNode()
+ && treeNode instanceof TextNode
 ) %7B%0A    

Add additional check for TextNode for converting to textValue