From 1a810d21bc8160fc1031c231575657dd28bfdd46 Mon Sep 17 00:00:00 2001 From: wanglong Date: Sat, 13 Nov 2021 17:31:11 +0800 Subject: [PATCH] rename package --- README.md | 20 +---- pom.xml | 79 +++++-------------- .../dust/tripartite}/protostar/DataType.java | 2 +- .../protostar/DefaultLoadStrategy.java | 8 +- .../tripartite}/protostar/FieldFactory.java | 6 +- .../tripartite}/protostar/IdStrategy.java | 8 +- .../tripartite}/protostar/LoadStrategy.java | 10 +-- .../protostar/PrepareLoadStrategy.java | 6 +- .../tripartite}/protostar/ProtostarUtil.java | 4 +- .../dust/tripartite}/protostar/Schema.java | 2 +- .../protostar/annotation/Field.java | 6 +- .../tripartite}/protostar/annotation/Fs.java | 2 +- .../protostar/annotation/Message.java | 2 +- .../protostar/converter/Converter.java | 2 +- .../protostar/converter/MapConverter.java | 8 +- .../protostar/field/BasicField.java | 6 +- .../protostar/field/DynamicLengthField.java | 10 +-- .../protostar/field/DynamicTotalField.java | 10 +-- .../protostar/field/FixedField.java | 6 +- .../protostar/field/FixedLengthField.java | 6 +- .../protostar/schema/ArraySchema.java | 6 +- .../protostar/schema/ByteBufferSchema.java | 4 +- .../protostar/schema/CollectionSchema.java | 8 +- .../protostar/schema/ConvertSchema.java | 8 +- .../protostar/schema/DateTimeSchema.java | 6 +- .../protostar/schema/NumberSchema.java | 6 +- .../protostar/schema/ObjectSchema.java | 6 +- .../protostar/schema/RuntimeSchema.java | 6 +- .../protostar/schema/StringSchema.java | 8 +- .../dust/tripartite}/protostar/util/Bcd.java | 2 +- .../protostar/util/ByteBufUtils.java | 2 +- .../tripartite}/protostar/util/Cache.java | 2 +- .../protostar/util/CharsBuilder.java | 2 +- .../protostar/util/ClassUtils.java | 2 +- .../tripartite}/protostar/util/StrUtils.java | 2 +- .../protostar/util/ToStringBuilder.java | 2 +- .../tripartite}/protostar/convert/Attr1.java | 6 +- .../tripartite}/protostar/convert/Attr2.java | 4 +- .../protostar/convert/AttributeConverter.java | 10 +-- .../convert/AttributeConverterV2.java | 10 +-- .../tripartite}/protostar/convert/Test.java | 10 +-- .../protostar/multiversion/Test.java | 10 +-- .../tripartite}/protostar/simple/Test.java | 12 +-- 43 files changed, 142 insertions(+), 195 deletions(-) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/DataType.java (94%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/DefaultLoadStrategy.java (89%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/FieldFactory.java (95%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/IdStrategy.java (94%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/LoadStrategy.java (94%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/PrepareLoadStrategy.java (91%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/ProtostarUtil.java (91%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/Schema.java (93%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/annotation/Field.java (78%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/annotation/Fs.java (87%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/annotation/Message.java (84%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/converter/Converter.java (73%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/converter/MapConverter.java (92%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/field/BasicField.java (91%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/field/DynamicLengthField.java (93%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/field/DynamicTotalField.java (89%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/field/FixedField.java (92%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/field/FixedLengthField.java (92%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/ArraySchema.java (97%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/ByteBufferSchema.java (91%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/CollectionSchema.java (90%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/ConvertSchema.java (87%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/DateTimeSchema.java (87%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/NumberSchema.java (95%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/ObjectSchema.java (88%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/RuntimeSchema.java (95%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/schema/StringSchema.java (96%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/util/Bcd.java (98%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/util/ByteBufUtils.java (98%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/util/Cache.java (95%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/util/CharsBuilder.java (97%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/util/ClassUtils.java (98%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/util/StrUtils.java (98%) rename src/main/java/{io/github/yezhihao => com/dust/tripartite}/protostar/util/ToStringBuilder.java (99%) rename src/test/java/{io/github/yezhihao => com/dust/tripartite}/protostar/convert/Attr1.java (84%) rename src/test/java/{io/github/yezhihao => com/dust/tripartite}/protostar/convert/Attr2.java (91%) rename src/test/java/{io/github/yezhihao => com/dust/tripartite}/protostar/convert/AttributeConverter.java (72%) rename src/test/java/{io/github/yezhihao => com/dust/tripartite}/protostar/convert/AttributeConverterV2.java (72%) rename src/test/java/{io/github/yezhihao => com/dust/tripartite}/protostar/convert/Test.java (93%) rename src/test/java/{io/github/yezhihao => com/dust/tripartite}/protostar/multiversion/Test.java (91%) rename src/test/java/{io/github/yezhihao => com/dust/tripartite}/protostar/simple/Test.java (90%) diff --git a/README.md b/README.md index 779f19a..ba51355 100644 --- a/README.md +++ b/README.md @@ -78,26 +78,8 @@ public class Test { } } ``` - -### Maven - ```xml - - io.github.yezhihao - protostar - 1.0.0.RELEASE - - ``` ### 代码仓库 -* Gitee仓库地址:[https://gitee.com/yezhihao/protostar/tree/master](https://gitee.com/yezhihao/protostar/tree/master) -* Github仓库地址:[https://github.com/yezhihao/protostar/tree/master](https://github.com/yezhihao/protostar/tree/master) +当前项目是Fork [剑器近](https://gitee.com/yezhihao) 的 [https://gitee.com/yezhihao/protostar/tree/master](https://gitee.com/yezhihao/protostar/tree/master) 更多的例子请参考Test目录 - -使用该组件的项目:[https://gitee.com/yezhihao/jt808-server/tree/master](https://gitee.com/yezhihao/jt808-server/tree/master) - -项目会不定期进行更新,建议star和watch一份,您的支持是我最大的动力。 - -如有任何疑问或者BUG,请联系我,非常感谢。 - -技术交流QQ群:[906230542] diff --git a/pom.xml b/pom.xml index a4d74bd..b2d4405 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,12 @@ 4.0.0 - io.github.yezhihao + com.dust.tripartite protostar 2.0.7.RELEASE jar Protostar - https://github.com/yezhihao/protostar Java serialization library,write in bytecode order. @@ -17,18 +16,6 @@ - - https://github.com/yezhihao/protostar - https://github.com/yezhihao/protostar.git - - - - - protostar.yezhihao - protostar - zhihao.ye@qq.com - - 1.8 @@ -69,7 +56,7 @@ - nexus-release + nexus-releases true @@ -101,20 +88,6 @@ - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - org.apache.maven.plugins maven-compiler-plugin @@ -143,46 +116,36 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - central-nexus - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-scm-plugin - 1.11.2 - - - - nexus-release - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - nexus-snapshot - https://oss.sonatype.org/content/repositories/snapshots - - + + + nexus-releases + Nexus Release Repository + http://113.250.52.44:8081/repository/maven-releases/ + + + nexus-snapshots + Nexus Release Repository + http://113.250.52.44:8081/repository/maven-snapshots/ + + + - central - Maven Central - http://maven.aliyun.com/nexus/content/groups/public/ + deployer + deployer + http://113.250.52.44:8081/repository/maven-public/ default true + + true + \ No newline at end of file diff --git a/src/main/java/io/github/yezhihao/protostar/DataType.java b/src/main/java/com/dust/tripartite/protostar/DataType.java similarity index 94% rename from src/main/java/io/github/yezhihao/protostar/DataType.java rename to src/main/java/com/dust/tripartite/protostar/DataType.java index 124230b..70c285a 100644 --- a/src/main/java/io/github/yezhihao/protostar/DataType.java +++ b/src/main/java/com/dust/tripartite/protostar/DataType.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar; +package com.dust.tripartite.protostar; /** * 支持的数据类型 diff --git a/src/main/java/io/github/yezhihao/protostar/DefaultLoadStrategy.java b/src/main/java/com/dust/tripartite/protostar/DefaultLoadStrategy.java similarity index 89% rename from src/main/java/io/github/yezhihao/protostar/DefaultLoadStrategy.java rename to src/main/java/com/dust/tripartite/protostar/DefaultLoadStrategy.java index ef90f5c..6004404 100644 --- a/src/main/java/io/github/yezhihao/protostar/DefaultLoadStrategy.java +++ b/src/main/java/com/dust/tripartite/protostar/DefaultLoadStrategy.java @@ -1,8 +1,8 @@ -package io.github.yezhihao.protostar; +package com.dust.tripartite.protostar; -import io.github.yezhihao.protostar.annotation.Message; -import io.github.yezhihao.protostar.schema.RuntimeSchema; -import io.github.yezhihao.protostar.util.ClassUtils; +import com.dust.tripartite.protostar.annotation.Message; +import com.dust.tripartite.protostar.schema.RuntimeSchema; +import com.dust.tripartite.protostar.util.ClassUtils; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/io/github/yezhihao/protostar/FieldFactory.java b/src/main/java/com/dust/tripartite/protostar/FieldFactory.java similarity index 95% rename from src/main/java/io/github/yezhihao/protostar/FieldFactory.java rename to src/main/java/com/dust/tripartite/protostar/FieldFactory.java index 2e9647d..8fdfbaa 100644 --- a/src/main/java/io/github/yezhihao/protostar/FieldFactory.java +++ b/src/main/java/com/dust/tripartite/protostar/FieldFactory.java @@ -1,6 +1,8 @@ -package io.github.yezhihao.protostar; +package com.dust.tripartite.protostar; -import io.github.yezhihao.protostar.annotation.Field; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.field.*; +import com.dust.tripartite.protostar.schema.*; import io.github.yezhihao.protostar.field.*; import io.github.yezhihao.protostar.schema.*; diff --git a/src/main/java/io/github/yezhihao/protostar/IdStrategy.java b/src/main/java/com/dust/tripartite/protostar/IdStrategy.java similarity index 94% rename from src/main/java/io/github/yezhihao/protostar/IdStrategy.java rename to src/main/java/com/dust/tripartite/protostar/IdStrategy.java index e6bfdd8..05b7b12 100644 --- a/src/main/java/io/github/yezhihao/protostar/IdStrategy.java +++ b/src/main/java/com/dust/tripartite/protostar/IdStrategy.java @@ -1,8 +1,8 @@ -package io.github.yezhihao.protostar; +package com.dust.tripartite.protostar; -import io.github.yezhihao.protostar.annotation.Field; -import io.github.yezhihao.protostar.field.BasicField; -import io.github.yezhihao.protostar.schema.RuntimeSchema; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.field.BasicField; +import com.dust.tripartite.protostar.schema.RuntimeSchema; import io.netty.buffer.ByteBuf; import java.lang.reflect.ParameterizedType; diff --git a/src/main/java/io/github/yezhihao/protostar/LoadStrategy.java b/src/main/java/com/dust/tripartite/protostar/LoadStrategy.java similarity index 94% rename from src/main/java/io/github/yezhihao/protostar/LoadStrategy.java rename to src/main/java/com/dust/tripartite/protostar/LoadStrategy.java index d5d499a..3d9f50e 100644 --- a/src/main/java/io/github/yezhihao/protostar/LoadStrategy.java +++ b/src/main/java/com/dust/tripartite/protostar/LoadStrategy.java @@ -1,9 +1,9 @@ -package io.github.yezhihao.protostar; +package com.dust.tripartite.protostar; -import io.github.yezhihao.protostar.annotation.Field; -import io.github.yezhihao.protostar.annotation.Fs; -import io.github.yezhihao.protostar.field.BasicField; -import io.github.yezhihao.protostar.schema.RuntimeSchema; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.annotation.Fs; +import com.dust.tripartite.protostar.field.BasicField; +import com.dust.tripartite.protostar.schema.RuntimeSchema; import java.lang.reflect.ParameterizedType; import java.util.*; diff --git a/src/main/java/io/github/yezhihao/protostar/PrepareLoadStrategy.java b/src/main/java/com/dust/tripartite/protostar/PrepareLoadStrategy.java similarity index 91% rename from src/main/java/io/github/yezhihao/protostar/PrepareLoadStrategy.java rename to src/main/java/com/dust/tripartite/protostar/PrepareLoadStrategy.java index a2c9010..1010963 100644 --- a/src/main/java/io/github/yezhihao/protostar/PrepareLoadStrategy.java +++ b/src/main/java/com/dust/tripartite/protostar/PrepareLoadStrategy.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar; +package com.dust.tripartite.protostar; -import io.github.yezhihao.protostar.schema.ArraySchema; -import io.github.yezhihao.protostar.schema.NumberSchema; +import com.dust.tripartite.protostar.schema.ArraySchema; +import com.dust.tripartite.protostar.schema.NumberSchema; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/io/github/yezhihao/protostar/ProtostarUtil.java b/src/main/java/com/dust/tripartite/protostar/ProtostarUtil.java similarity index 91% rename from src/main/java/io/github/yezhihao/protostar/ProtostarUtil.java rename to src/main/java/com/dust/tripartite/protostar/ProtostarUtil.java index 7832489..9048db4 100644 --- a/src/main/java/io/github/yezhihao/protostar/ProtostarUtil.java +++ b/src/main/java/com/dust/tripartite/protostar/ProtostarUtil.java @@ -1,6 +1,6 @@ -package io.github.yezhihao.protostar; +package com.dust.tripartite.protostar; -import io.github.yezhihao.protostar.schema.RuntimeSchema; +import com.dust.tripartite.protostar.schema.RuntimeSchema; import java.util.Map; diff --git a/src/main/java/io/github/yezhihao/protostar/Schema.java b/src/main/java/com/dust/tripartite/protostar/Schema.java similarity index 93% rename from src/main/java/io/github/yezhihao/protostar/Schema.java rename to src/main/java/com/dust/tripartite/protostar/Schema.java index 8bbe21a..8adc956 100644 --- a/src/main/java/io/github/yezhihao/protostar/Schema.java +++ b/src/main/java/com/dust/tripartite/protostar/Schema.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar; +package com.dust.tripartite.protostar; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/io/github/yezhihao/protostar/annotation/Field.java b/src/main/java/com/dust/tripartite/protostar/annotation/Field.java similarity index 78% rename from src/main/java/io/github/yezhihao/protostar/annotation/Field.java rename to src/main/java/com/dust/tripartite/protostar/annotation/Field.java index 2d13217..4d00eb1 100644 --- a/src/main/java/io/github/yezhihao/protostar/annotation/Field.java +++ b/src/main/java/com/dust/tripartite/protostar/annotation/Field.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.annotation; +package com.dust.tripartite.protostar.annotation; -import io.github.yezhihao.protostar.DataType; -import io.github.yezhihao.protostar.converter.Converter; +import com.dust.tripartite.protostar.DataType; +import com.dust.tripartite.protostar.converter.Converter; import java.lang.annotation.*; diff --git a/src/main/java/io/github/yezhihao/protostar/annotation/Fs.java b/src/main/java/com/dust/tripartite/protostar/annotation/Fs.java similarity index 87% rename from src/main/java/io/github/yezhihao/protostar/annotation/Fs.java rename to src/main/java/com/dust/tripartite/protostar/annotation/Fs.java index 63eaf72..9c4756d 100644 --- a/src/main/java/io/github/yezhihao/protostar/annotation/Fs.java +++ b/src/main/java/com/dust/tripartite/protostar/annotation/Fs.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.annotation; +package com.dust.tripartite.protostar.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/io/github/yezhihao/protostar/annotation/Message.java b/src/main/java/com/dust/tripartite/protostar/annotation/Message.java similarity index 84% rename from src/main/java/io/github/yezhihao/protostar/annotation/Message.java rename to src/main/java/com/dust/tripartite/protostar/annotation/Message.java index 595066f..566f5f4 100644 --- a/src/main/java/io/github/yezhihao/protostar/annotation/Message.java +++ b/src/main/java/com/dust/tripartite/protostar/annotation/Message.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.annotation; +package com.dust.tripartite.protostar.annotation; import java.lang.annotation.*; diff --git a/src/main/java/io/github/yezhihao/protostar/converter/Converter.java b/src/main/java/com/dust/tripartite/protostar/converter/Converter.java similarity index 73% rename from src/main/java/io/github/yezhihao/protostar/converter/Converter.java rename to src/main/java/com/dust/tripartite/protostar/converter/Converter.java index 640b312..8f758ef 100644 --- a/src/main/java/io/github/yezhihao/protostar/converter/Converter.java +++ b/src/main/java/com/dust/tripartite/protostar/converter/Converter.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.converter; +package com.dust.tripartite.protostar.converter; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/io/github/yezhihao/protostar/converter/MapConverter.java b/src/main/java/com/dust/tripartite/protostar/converter/MapConverter.java similarity index 92% rename from src/main/java/io/github/yezhihao/protostar/converter/MapConverter.java rename to src/main/java/com/dust/tripartite/protostar/converter/MapConverter.java index 01cfe43..aebd0f8 100644 --- a/src/main/java/io/github/yezhihao/protostar/converter/MapConverter.java +++ b/src/main/java/com/dust/tripartite/protostar/converter/MapConverter.java @@ -1,8 +1,8 @@ -package io.github.yezhihao.protostar.converter; +package com.dust.tripartite.protostar.converter; -import io.github.yezhihao.protostar.PrepareLoadStrategy; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.util.ByteBufUtils; +import com.dust.tripartite.protostar.PrepareLoadStrategy; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.util.ByteBufUtils; import io.netty.buffer.ByteBuf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/github/yezhihao/protostar/field/BasicField.java b/src/main/java/com/dust/tripartite/protostar/field/BasicField.java similarity index 91% rename from src/main/java/io/github/yezhihao/protostar/field/BasicField.java rename to src/main/java/com/dust/tripartite/protostar/field/BasicField.java index deb2886..ecc45d7 100644 --- a/src/main/java/io/github/yezhihao/protostar/field/BasicField.java +++ b/src/main/java/com/dust/tripartite/protostar/field/BasicField.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.field; +package com.dust.tripartite.protostar.field; -import io.github.yezhihao.protostar.annotation.Field; -import io.github.yezhihao.protostar.util.StrUtils; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.util.StrUtils; import io.netty.buffer.ByteBuf; /** diff --git a/src/main/java/io/github/yezhihao/protostar/field/DynamicLengthField.java b/src/main/java/com/dust/tripartite/protostar/field/DynamicLengthField.java similarity index 93% rename from src/main/java/io/github/yezhihao/protostar/field/DynamicLengthField.java rename to src/main/java/com/dust/tripartite/protostar/field/DynamicLengthField.java index 2b68394..9217750 100644 --- a/src/main/java/io/github/yezhihao/protostar/field/DynamicLengthField.java +++ b/src/main/java/com/dust/tripartite/protostar/field/DynamicLengthField.java @@ -1,9 +1,9 @@ -package io.github.yezhihao.protostar.field; +package com.dust.tripartite.protostar.field; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.annotation.Field; -import io.github.yezhihao.protostar.util.ByteBufUtils; -import io.github.yezhihao.protostar.util.StrUtils; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.util.ByteBufUtils; +import com.dust.tripartite.protostar.util.StrUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; diff --git a/src/main/java/io/github/yezhihao/protostar/field/DynamicTotalField.java b/src/main/java/com/dust/tripartite/protostar/field/DynamicTotalField.java similarity index 89% rename from src/main/java/io/github/yezhihao/protostar/field/DynamicTotalField.java rename to src/main/java/com/dust/tripartite/protostar/field/DynamicTotalField.java index eaa24e5..38ec1c1 100644 --- a/src/main/java/io/github/yezhihao/protostar/field/DynamicTotalField.java +++ b/src/main/java/com/dust/tripartite/protostar/field/DynamicTotalField.java @@ -1,9 +1,9 @@ -package io.github.yezhihao.protostar.field; +package com.dust.tripartite.protostar.field; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.annotation.Field; -import io.github.yezhihao.protostar.util.ByteBufUtils; -import io.github.yezhihao.protostar.util.StrUtils; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.util.StrUtils; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.util.ByteBufUtils; import io.netty.buffer.ByteBuf; import java.util.Collection; diff --git a/src/main/java/io/github/yezhihao/protostar/field/FixedField.java b/src/main/java/com/dust/tripartite/protostar/field/FixedField.java similarity index 92% rename from src/main/java/io/github/yezhihao/protostar/field/FixedField.java rename to src/main/java/com/dust/tripartite/protostar/field/FixedField.java index 2010266..e7adda4 100644 --- a/src/main/java/io/github/yezhihao/protostar/field/FixedField.java +++ b/src/main/java/com/dust/tripartite/protostar/field/FixedField.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.field; +package com.dust.tripartite.protostar.field; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.annotation.Field; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.Schema; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; diff --git a/src/main/java/io/github/yezhihao/protostar/field/FixedLengthField.java b/src/main/java/com/dust/tripartite/protostar/field/FixedLengthField.java similarity index 92% rename from src/main/java/io/github/yezhihao/protostar/field/FixedLengthField.java rename to src/main/java/com/dust/tripartite/protostar/field/FixedLengthField.java index e9ac309..d48da87 100644 --- a/src/main/java/io/github/yezhihao/protostar/field/FixedLengthField.java +++ b/src/main/java/com/dust/tripartite/protostar/field/FixedLengthField.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.field; +package com.dust.tripartite.protostar.field; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.annotation.Field; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.Schema; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; diff --git a/src/main/java/io/github/yezhihao/protostar/schema/ArraySchema.java b/src/main/java/com/dust/tripartite/protostar/schema/ArraySchema.java similarity index 97% rename from src/main/java/io/github/yezhihao/protostar/schema/ArraySchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/ArraySchema.java index c344c6e..07cb90d 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/ArraySchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/ArraySchema.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; -import io.github.yezhihao.protostar.DataType; -import io.github.yezhihao.protostar.Schema; +import com.dust.tripartite.protostar.DataType; +import com.dust.tripartite.protostar.Schema; import io.netty.buffer.ByteBuf; public class ArraySchema { diff --git a/src/main/java/io/github/yezhihao/protostar/schema/ByteBufferSchema.java b/src/main/java/com/dust/tripartite/protostar/schema/ByteBufferSchema.java similarity index 91% rename from src/main/java/io/github/yezhihao/protostar/schema/ByteBufferSchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/ByteBufferSchema.java index d5d0270..7abca0c 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/ByteBufferSchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/ByteBufferSchema.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; import io.netty.buffer.ByteBuf; -import io.github.yezhihao.protostar.Schema; +import com.dust.tripartite.protostar.Schema; import java.nio.ByteBuffer; diff --git a/src/main/java/io/github/yezhihao/protostar/schema/CollectionSchema.java b/src/main/java/com/dust/tripartite/protostar/schema/CollectionSchema.java similarity index 90% rename from src/main/java/io/github/yezhihao/protostar/schema/CollectionSchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/CollectionSchema.java index ec73325..1b7d729 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/CollectionSchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/CollectionSchema.java @@ -1,8 +1,8 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.util.ByteBufUtils; -import io.github.yezhihao.protostar.util.Cache; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.util.ByteBufUtils; +import com.dust.tripartite.protostar.util.Cache; import io.netty.buffer.ByteBuf; import java.util.ArrayList; diff --git a/src/main/java/io/github/yezhihao/protostar/schema/ConvertSchema.java b/src/main/java/com/dust/tripartite/protostar/schema/ConvertSchema.java similarity index 87% rename from src/main/java/io/github/yezhihao/protostar/schema/ConvertSchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/ConvertSchema.java index 051c079..2fd0531 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/ConvertSchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/ConvertSchema.java @@ -1,8 +1,8 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.converter.Converter; -import io.github.yezhihao.protostar.util.Cache; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.converter.Converter; +import com.dust.tripartite.protostar.util.Cache; import io.netty.buffer.ByteBuf; /** diff --git a/src/main/java/io/github/yezhihao/protostar/schema/DateTimeSchema.java b/src/main/java/com/dust/tripartite/protostar/schema/DateTimeSchema.java similarity index 87% rename from src/main/java/io/github/yezhihao/protostar/schema/DateTimeSchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/DateTimeSchema.java index 8965e92..10bfad2 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/DateTimeSchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/DateTimeSchema.java @@ -1,8 +1,8 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; import io.netty.buffer.ByteBuf; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.util.Bcd; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.util.Bcd; import java.time.LocalDateTime; diff --git a/src/main/java/io/github/yezhihao/protostar/schema/NumberSchema.java b/src/main/java/com/dust/tripartite/protostar/schema/NumberSchema.java similarity index 95% rename from src/main/java/io/github/yezhihao/protostar/schema/NumberSchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/NumberSchema.java index e93e385..c7c0937 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/NumberSchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/NumberSchema.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; -import io.github.yezhihao.protostar.DataType; -import io.github.yezhihao.protostar.Schema; +import com.dust.tripartite.protostar.DataType; +import com.dust.tripartite.protostar.Schema; import io.netty.buffer.ByteBuf; public class NumberSchema { diff --git a/src/main/java/io/github/yezhihao/protostar/schema/ObjectSchema.java b/src/main/java/com/dust/tripartite/protostar/schema/ObjectSchema.java similarity index 88% rename from src/main/java/io/github/yezhihao/protostar/schema/ObjectSchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/ObjectSchema.java index 9b6c6fb..9909c5c 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/ObjectSchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/ObjectSchema.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.util.Cache; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.util.Cache; import io.netty.buffer.ByteBuf; public class ObjectSchema implements Schema { diff --git a/src/main/java/io/github/yezhihao/protostar/schema/RuntimeSchema.java b/src/main/java/com/dust/tripartite/protostar/schema/RuntimeSchema.java similarity index 95% rename from src/main/java/io/github/yezhihao/protostar/schema/RuntimeSchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/RuntimeSchema.java index 2017a37..a748606 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/RuntimeSchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/RuntimeSchema.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.field.BasicField; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.field.BasicField; import io.netty.buffer.ByteBuf; import java.lang.reflect.Constructor; diff --git a/src/main/java/io/github/yezhihao/protostar/schema/StringSchema.java b/src/main/java/com/dust/tripartite/protostar/schema/StringSchema.java similarity index 96% rename from src/main/java/io/github/yezhihao/protostar/schema/StringSchema.java rename to src/main/java/com/dust/tripartite/protostar/schema/StringSchema.java index f5e4525..7e082c2 100644 --- a/src/main/java/io/github/yezhihao/protostar/schema/StringSchema.java +++ b/src/main/java/com/dust/tripartite/protostar/schema/StringSchema.java @@ -1,8 +1,8 @@ -package io.github.yezhihao.protostar.schema; +package com.dust.tripartite.protostar.schema; -import io.github.yezhihao.protostar.Schema; -import io.github.yezhihao.protostar.util.Cache; -import io.github.yezhihao.protostar.util.CharsBuilder; +import com.dust.tripartite.protostar.Schema; +import com.dust.tripartite.protostar.util.Cache; +import com.dust.tripartite.protostar.util.CharsBuilder; import io.netty.buffer.ByteBuf; import io.netty.util.internal.StringUtil; import org.slf4j.Logger; diff --git a/src/main/java/io/github/yezhihao/protostar/util/Bcd.java b/src/main/java/com/dust/tripartite/protostar/util/Bcd.java similarity index 98% rename from src/main/java/io/github/yezhihao/protostar/util/Bcd.java rename to src/main/java/com/dust/tripartite/protostar/util/Bcd.java index 04435da..bfa3af9 100644 --- a/src/main/java/io/github/yezhihao/protostar/util/Bcd.java +++ b/src/main/java/com/dust/tripartite/protostar/util/Bcd.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.util; +package com.dust.tripartite.protostar.util; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/io/github/yezhihao/protostar/util/ByteBufUtils.java b/src/main/java/com/dust/tripartite/protostar/util/ByteBufUtils.java similarity index 98% rename from src/main/java/io/github/yezhihao/protostar/util/ByteBufUtils.java rename to src/main/java/com/dust/tripartite/protostar/util/ByteBufUtils.java index 92f9185..922764e 100644 --- a/src/main/java/io/github/yezhihao/protostar/util/ByteBufUtils.java +++ b/src/main/java/com/dust/tripartite/protostar/util/ByteBufUtils.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.util; +package com.dust.tripartite.protostar.util; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/io/github/yezhihao/protostar/util/Cache.java b/src/main/java/com/dust/tripartite/protostar/util/Cache.java similarity index 95% rename from src/main/java/io/github/yezhihao/protostar/util/Cache.java rename to src/main/java/com/dust/tripartite/protostar/util/Cache.java index a99edc5..b1891b9 100644 --- a/src/main/java/io/github/yezhihao/protostar/util/Cache.java +++ b/src/main/java/com/dust/tripartite/protostar/util/Cache.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.util; +package com.dust.tripartite.protostar.util; import java.util.HashMap; import java.util.function.Function; diff --git a/src/main/java/io/github/yezhihao/protostar/util/CharsBuilder.java b/src/main/java/com/dust/tripartite/protostar/util/CharsBuilder.java similarity index 97% rename from src/main/java/io/github/yezhihao/protostar/util/CharsBuilder.java rename to src/main/java/com/dust/tripartite/protostar/util/CharsBuilder.java index e278b79..1822a9a 100644 --- a/src/main/java/io/github/yezhihao/protostar/util/CharsBuilder.java +++ b/src/main/java/com/dust/tripartite/protostar/util/CharsBuilder.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.util; +package com.dust.tripartite.protostar.util; import java.util.Arrays; diff --git a/src/main/java/io/github/yezhihao/protostar/util/ClassUtils.java b/src/main/java/com/dust/tripartite/protostar/util/ClassUtils.java similarity index 98% rename from src/main/java/io/github/yezhihao/protostar/util/ClassUtils.java rename to src/main/java/com/dust/tripartite/protostar/util/ClassUtils.java index 2eb1041..a485af6 100644 --- a/src/main/java/io/github/yezhihao/protostar/util/ClassUtils.java +++ b/src/main/java/com/dust/tripartite/protostar/util/ClassUtils.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.util; +package com.dust.tripartite.protostar.util; import java.io.File; import java.lang.annotation.Annotation; diff --git a/src/main/java/io/github/yezhihao/protostar/util/StrUtils.java b/src/main/java/com/dust/tripartite/protostar/util/StrUtils.java similarity index 98% rename from src/main/java/io/github/yezhihao/protostar/util/StrUtils.java rename to src/main/java/com/dust/tripartite/protostar/util/StrUtils.java index 119ce26..e26bd50 100644 --- a/src/main/java/io/github/yezhihao/protostar/util/StrUtils.java +++ b/src/main/java/com/dust/tripartite/protostar/util/StrUtils.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.util; +package com.dust.tripartite.protostar.util; /** * @author yezhihao diff --git a/src/main/java/io/github/yezhihao/protostar/util/ToStringBuilder.java b/src/main/java/com/dust/tripartite/protostar/util/ToStringBuilder.java similarity index 99% rename from src/main/java/io/github/yezhihao/protostar/util/ToStringBuilder.java rename to src/main/java/com/dust/tripartite/protostar/util/ToStringBuilder.java index e23affa..ea018c3 100644 --- a/src/main/java/io/github/yezhihao/protostar/util/ToStringBuilder.java +++ b/src/main/java/com/dust/tripartite/protostar/util/ToStringBuilder.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.util; +package com.dust.tripartite.protostar.util; import java.beans.Transient; import java.lang.reflect.Array; diff --git a/src/test/java/io/github/yezhihao/protostar/convert/Attr1.java b/src/test/java/com/dust/tripartite/protostar/convert/Attr1.java similarity index 84% rename from src/test/java/io/github/yezhihao/protostar/convert/Attr1.java rename to src/test/java/com/dust/tripartite/protostar/convert/Attr1.java index d65fa64..ac22bfc 100644 --- a/src/test/java/io/github/yezhihao/protostar/convert/Attr1.java +++ b/src/test/java/com/dust/tripartite/protostar/convert/Attr1.java @@ -1,7 +1,7 @@ -package io.github.yezhihao.protostar.convert; +package com.dust.tripartite.protostar.convert; -import io.github.yezhihao.protostar.DataType; -import io.github.yezhihao.protostar.annotation.Field; +import com.dust.tripartite.protostar.DataType; +import com.dust.tripartite.protostar.annotation.Field; public class Attr1 { diff --git a/src/test/java/io/github/yezhihao/protostar/convert/Attr2.java b/src/test/java/com/dust/tripartite/protostar/convert/Attr2.java similarity index 91% rename from src/test/java/io/github/yezhihao/protostar/convert/Attr2.java rename to src/test/java/com/dust/tripartite/protostar/convert/Attr2.java index 88cb819..8743163 100644 --- a/src/test/java/io/github/yezhihao/protostar/convert/Attr2.java +++ b/src/test/java/com/dust/tripartite/protostar/convert/Attr2.java @@ -1,4 +1,4 @@ -package io.github.yezhihao.protostar.convert; +package com.dust.tripartite.protostar.convert; import io.netty.buffer.ByteBuf; @@ -42,7 +42,7 @@ public class Attr2 { return sb.toString(); } - public static class Schema implements io.github.yezhihao.protostar.Schema { + public static class Schema implements com.dust.tripartite.protostar.Schema { public static final Schema INSTANCE = new Schema(); diff --git a/src/test/java/io/github/yezhihao/protostar/convert/AttributeConverter.java b/src/test/java/com/dust/tripartite/protostar/convert/AttributeConverter.java similarity index 72% rename from src/test/java/io/github/yezhihao/protostar/convert/AttributeConverter.java rename to src/test/java/com/dust/tripartite/protostar/convert/AttributeConverter.java index afeb285..f07ca50 100644 --- a/src/test/java/io/github/yezhihao/protostar/convert/AttributeConverter.java +++ b/src/test/java/com/dust/tripartite/protostar/convert/AttributeConverter.java @@ -1,9 +1,9 @@ -package io.github.yezhihao.protostar.convert; +package com.dust.tripartite.protostar.convert; -import io.github.yezhihao.protostar.PrepareLoadStrategy; -import io.github.yezhihao.protostar.converter.MapConverter; -import io.github.yezhihao.protostar.schema.NumberSchema; -import io.github.yezhihao.protostar.schema.StringSchema; +import com.dust.tripartite.protostar.converter.MapConverter; +import com.dust.tripartite.protostar.schema.NumberSchema; +import com.dust.tripartite.protostar.schema.StringSchema; +import com.dust.tripartite.protostar.PrepareLoadStrategy; import io.netty.buffer.ByteBuf; public class AttributeConverter extends MapConverter { diff --git a/src/test/java/io/github/yezhihao/protostar/convert/AttributeConverterV2.java b/src/test/java/com/dust/tripartite/protostar/convert/AttributeConverterV2.java similarity index 72% rename from src/test/java/io/github/yezhihao/protostar/convert/AttributeConverterV2.java rename to src/test/java/com/dust/tripartite/protostar/convert/AttributeConverterV2.java index 51318e1..288c1e6 100644 --- a/src/test/java/io/github/yezhihao/protostar/convert/AttributeConverterV2.java +++ b/src/test/java/com/dust/tripartite/protostar/convert/AttributeConverterV2.java @@ -1,9 +1,9 @@ -package io.github.yezhihao.protostar.convert; +package com.dust.tripartite.protostar.convert; -import io.github.yezhihao.protostar.PrepareLoadStrategy; -import io.github.yezhihao.protostar.converter.MapConverter; -import io.github.yezhihao.protostar.schema.NumberSchema; -import io.github.yezhihao.protostar.schema.StringSchema; +import com.dust.tripartite.protostar.schema.StringSchema; +import com.dust.tripartite.protostar.PrepareLoadStrategy; +import com.dust.tripartite.protostar.converter.MapConverter; +import com.dust.tripartite.protostar.schema.NumberSchema; import io.netty.buffer.ByteBuf; public class AttributeConverterV2 extends MapConverter { diff --git a/src/test/java/io/github/yezhihao/protostar/convert/Test.java b/src/test/java/com/dust/tripartite/protostar/convert/Test.java similarity index 93% rename from src/test/java/io/github/yezhihao/protostar/convert/Test.java rename to src/test/java/com/dust/tripartite/protostar/convert/Test.java index 1774bfd..10bbf49 100644 --- a/src/test/java/io/github/yezhihao/protostar/convert/Test.java +++ b/src/test/java/com/dust/tripartite/protostar/convert/Test.java @@ -1,9 +1,9 @@ -package io.github.yezhihao.protostar.convert; +package com.dust.tripartite.protostar.convert; -import io.github.yezhihao.protostar.DataType; -import io.github.yezhihao.protostar.ProtostarUtil; -import io.github.yezhihao.protostar.annotation.Field; -import io.github.yezhihao.protostar.schema.RuntimeSchema; +import com.dust.tripartite.protostar.DataType; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.ProtostarUtil; +import com.dust.tripartite.protostar.schema.RuntimeSchema; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; diff --git a/src/test/java/io/github/yezhihao/protostar/multiversion/Test.java b/src/test/java/com/dust/tripartite/protostar/multiversion/Test.java similarity index 91% rename from src/test/java/io/github/yezhihao/protostar/multiversion/Test.java rename to src/test/java/com/dust/tripartite/protostar/multiversion/Test.java index d2d36d2..4fec765 100644 --- a/src/test/java/io/github/yezhihao/protostar/multiversion/Test.java +++ b/src/test/java/com/dust/tripartite/protostar/multiversion/Test.java @@ -1,9 +1,9 @@ -package io.github.yezhihao.protostar.multiversion; +package com.dust.tripartite.protostar.multiversion; -import io.github.yezhihao.protostar.DataType; -import io.github.yezhihao.protostar.ProtostarUtil; -import io.github.yezhihao.protostar.annotation.Field; -import io.github.yezhihao.protostar.schema.RuntimeSchema; +import com.dust.tripartite.protostar.DataType; +import com.dust.tripartite.protostar.ProtostarUtil; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.schema.RuntimeSchema; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; diff --git a/src/test/java/io/github/yezhihao/protostar/simple/Test.java b/src/test/java/com/dust/tripartite/protostar/simple/Test.java similarity index 90% rename from src/test/java/io/github/yezhihao/protostar/simple/Test.java rename to src/test/java/com/dust/tripartite/protostar/simple/Test.java index f9bec45..2b203f4 100644 --- a/src/test/java/io/github/yezhihao/protostar/simple/Test.java +++ b/src/test/java/com/dust/tripartite/protostar/simple/Test.java @@ -1,10 +1,10 @@ -package io.github.yezhihao.protostar.simple; +package com.dust.tripartite.protostar.simple; -import io.github.yezhihao.protostar.DataType; -import io.github.yezhihao.protostar.FieldFactory; -import io.github.yezhihao.protostar.ProtostarUtil; -import io.github.yezhihao.protostar.annotation.Field; -import io.github.yezhihao.protostar.schema.RuntimeSchema; +import com.dust.tripartite.protostar.DataType; +import com.dust.tripartite.protostar.FieldFactory; +import com.dust.tripartite.protostar.ProtostarUtil; +import com.dust.tripartite.protostar.annotation.Field; +import com.dust.tripartite.protostar.schema.RuntimeSchema; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled;