From 651be0c50dc2a4919ecfb44b7d9f05f667652398 Mon Sep 17 00:00:00 2001 From: redkale Date: Fri, 1 Sep 2023 07:45:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Writer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/redkale/convert/Writer.java | 4 ++-- .../java/org/redkale/convert/bson/BsonByteBufferWriter.java | 6 ------ src/main/java/org/redkale/convert/bson/BsonConvert.java | 6 +++--- src/main/java/org/redkale/convert/bson/BsonWriter.java | 5 ++--- src/main/java/org/redkale/convert/json/JsonConvert.java | 4 ++-- src/main/java/org/redkale/convert/json/JsonWriter.java | 5 ++--- 6 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/redkale/convert/Writer.java b/src/main/java/org/redkale/convert/Writer.java index 67e00eeea..cacf2e5aa 100644 --- a/src/main/java/org/redkale/convert/Writer.java +++ b/src/main/java/org/redkale/convert/Writer.java @@ -75,11 +75,11 @@ public abstract class Writer { * 获取配置属性 * */ - public final int features() { + public final int getFeatures() { return features; } - public Writer features(int features) { + public Writer withFeatures(int features) { this.features = features; return this; } diff --git a/src/main/java/org/redkale/convert/bson/BsonByteBufferWriter.java b/src/main/java/org/redkale/convert/bson/BsonByteBufferWriter.java index c0a179316..9efd9b7e5 100644 --- a/src/main/java/org/redkale/convert/bson/BsonByteBufferWriter.java +++ b/src/main/java/org/redkale/convert/bson/BsonByteBufferWriter.java @@ -70,12 +70,6 @@ public class BsonByteBufferWriter extends BsonWriter { return this.getClass().getSimpleName() + "[count=" + this.count + "]"; } - @Override - public BsonByteBufferWriter features(int features) { - this.features = features; - return this; - } - @Override protected int expand(final int byteLength) { if (this.buffers == null) { diff --git a/src/main/java/org/redkale/convert/bson/BsonConvert.java b/src/main/java/org/redkale/convert/bson/BsonConvert.java index c9c7bee70..21e5ba2fe 100644 --- a/src/main/java/org/redkale/convert/bson/BsonConvert.java +++ b/src/main/java/org/redkale/convert/bson/BsonConvert.java @@ -129,7 +129,7 @@ public class BsonConvert extends BinaryConvert { } else { writerPool.set(null); } - return configWrite(writer.features(features)); + return configWrite(writer.withFeatures(features)); } @Override @@ -234,7 +234,7 @@ public class BsonConvert extends BinaryConvert { @Override public void convertToBytes(final ByteArray array, final Type type, final Object value) { Objects.requireNonNull(array); - final BsonWriter writer = configWrite(new BsonWriter(array).features(features)); + final BsonWriter writer = configWrite(new BsonWriter(array).withFeatures(features)); if (value == null) { writer.writeNull(); } else { @@ -280,7 +280,7 @@ public class BsonConvert extends BinaryConvert { if (value == null) { return null; } - final BsonWriter writer = writerPool.get().features(features); + final BsonWriter writer = writerPool.get().withFeatures(features); factory.loadEncoder(type == null ? value.getClass() : type).convertTo(writer, value); return writer; } diff --git a/src/main/java/org/redkale/convert/bson/BsonWriter.java b/src/main/java/org/redkale/convert/bson/BsonWriter.java index 4223327cb..10ab5c2e1 100644 --- a/src/main/java/org/redkale/convert/bson/BsonWriter.java +++ b/src/main/java/org/redkale/convert/bson/BsonWriter.java @@ -94,9 +94,8 @@ public class BsonWriter extends Writer implements ByteTuple { this.count = array.length(); } - public BsonWriter features(int features) { - super.features(features); - return this; + public BsonWriter withFeatures(int features) { + return (BsonWriter) super.withFeatures(features); } //----------------------------------------------------------------------- diff --git a/src/main/java/org/redkale/convert/json/JsonConvert.java b/src/main/java/org/redkale/convert/json/JsonConvert.java index 73896f1c1..6cedc43ef 100644 --- a/src/main/java/org/redkale/convert/json/JsonConvert.java +++ b/src/main/java/org/redkale/convert/json/JsonConvert.java @@ -110,7 +110,7 @@ public class JsonConvert extends TextConvert { } else { bytesWriterPool.set(null); } - return configWrite((JsonBytesWriter) writer.features(features)); + return configWrite((JsonBytesWriter) writer.withFeatures(features)); } @Override @@ -130,7 +130,7 @@ public class JsonConvert extends TextConvert { } else { bytesWriterPool.set(null); } - return configWrite((JsonBytesWriter) writer.features(features)); + return configWrite((JsonBytesWriter) writer.withFeatures(features)); } private void offerJsonBytesWriter(final JsonBytesWriter writer) { diff --git a/src/main/java/org/redkale/convert/json/JsonWriter.java b/src/main/java/org/redkale/convert/json/JsonWriter.java index a1a5486fe..d3f899673 100644 --- a/src/main/java/org/redkale/convert/json/JsonWriter.java +++ b/src/main/java/org/redkale/convert/json/JsonWriter.java @@ -25,9 +25,8 @@ public abstract class JsonWriter extends Writer { this.features = JsonFactory.root().getFeatures(); } - public JsonWriter features(int features) { - super.features(features); - return this; + public JsonWriter withFeatures(int features) { + return (JsonWriter) super.withFeatures(features); } @AsmDepends