From 9704d5890fef312b71e624ed006fbe4ce880513f Mon Sep 17 00:00:00 2001 From: wentch <22250530@qq.com> Date: Wed, 6 Jan 2016 14:37:17 +0800 Subject: [PATCH] --- src/org/redkale/convert/bson/BsonConvert.java | 10 +++++----- src/org/redkale/convert/json/JsonConvert.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/org/redkale/convert/bson/BsonConvert.java b/src/org/redkale/convert/bson/BsonConvert.java index 1bf29c6ce..05c583923 100644 --- a/src/org/redkale/convert/bson/BsonConvert.java +++ b/src/org/redkale/convert/bson/BsonConvert.java @@ -105,16 +105,16 @@ public final class BsonConvert extends Convert { return rs; } - public T convertFrom(final Type type, final ByteBuffer... buffers) { - if (type == null || buffers.length < 1) return null; - return (T) factory.loadDecoder(type).convertFrom(new BsonByteBufferReader(buffers)); - } - public T convertFrom(final Type type, final InputStream in) { if (type == null || in == null) return null; return (T) factory.loadDecoder(type).convertFrom(new BsonStreamReader(in)); } + public T convertFrom(final Type type, final ByteBuffer... buffers) { + if (type == null || buffers.length < 1) return null; + return (T) factory.loadDecoder(type).convertFrom(new BsonByteBufferReader(buffers)); + } + public T convertFrom(final Type type, final BsonReader reader) { if (type == null) return null; @SuppressWarnings("unchecked") diff --git a/src/org/redkale/convert/json/JsonConvert.java b/src/org/redkale/convert/json/JsonConvert.java index 1057794b4..953cdc945 100644 --- a/src/org/redkale/convert/json/JsonConvert.java +++ b/src/org/redkale/convert/json/JsonConvert.java @@ -100,16 +100,16 @@ public final class JsonConvert extends Convert { return rs; } - public T convertFrom(final Type type, final ByteBuffer... buffers) { - if (type == null || buffers == null || buffers.length == 0) return null; - return (T) factory.loadDecoder(type).convertFrom(new JsonByteBufferReader(buffers)); - } - public T convertFrom(final Type type, final InputStream in) { if (type == null || in == null) return null; return (T) factory.loadDecoder(type).convertFrom(new JsonStreamReader(in)); } + public T convertFrom(final Type type, final ByteBuffer... buffers) { + if (type == null || buffers == null || buffers.length == 0) return null; + return (T) factory.loadDecoder(type).convertFrom(new JsonByteBufferReader(buffers)); + } + public T convertFrom(final Type type, final JsonReader reader) { if (type == null) return null; @SuppressWarnings("unchecked")