From ce640edfa5af8c6272f9709c1890a5afb4da634d Mon Sep 17 00:00:00 2001 From: "j.x" Date: Thu, 26 Dec 2024 14:55:12 +0800 Subject: [PATCH] refactor: adjust project directory structure, upgrade to Spring Boot 3.4.0, and remove unnecessary files and code. --- pom.xml | 390 ++++++++++++++-- uno-ai/pom.xml | 21 - uno-auto/pom.xml | 8 +- uno-bom/pom.xml | 415 ++++++------------ uno-core/pom.xml | 10 +- .../java/cc/allio/uno/core/StringPool.java | 3 +- .../uno/core/annotation/AnnotatedCreator.java | 1 - .../uno/core/annotation/BeanAnnotated.java | 1 - .../java/cc/allio/uno/core/api/Adapter.java | 1 - .../java/cc/allio/uno/core/api/EqualsTo.java | 1 - .../main/java/cc/allio/uno/core/api/Key.java | 1 - .../allio/uno/core/api/OptionalContext.java | 1 - .../main/java/cc/allio/uno/core/api/Self.java | 1 - .../java/cc/allio/uno/core/api/Single.java | 1 - .../main/java/cc/allio/uno/core/api/Step.java | 1 - .../allio/uno/core/bean/BeanInfoWrapper.java | 1 - .../cc/allio/uno/core/bean/BeanWrapper.java | 1 - .../java/cc/allio/uno/core/bean/Empty.java | 1 - .../cc/allio/uno/core/bean/MapWrapper.java | 1 - .../cc/allio/uno/core/bean/ValueWrapper.java | 1 - .../cc/allio/uno/core/bus/AbstractTopic.java | 3 +- .../cc/allio/uno/core/bus/BaseEventBus.java | 1 - .../allio/uno/core/bus/ContextTopicEvent.java | 1 - .../allio/uno/core/bus/DefaultEventBus.java | 1 - .../uno/core/bus/DefaultEventContext.java | 1 - .../java/cc/allio/uno/core/bus/EventBus.java | 3 +- .../allio/uno/core/bus/EventBusFactory.java | 1 - .../cc/allio/uno/core/bus/EventContext.java | 1 - .../cc/allio/uno/core/bus/EventRegistry.java | 1 - .../cc/allio/uno/core/bus/EventTracer.java | 1 - .../java/cc/allio/uno/core/bus/Notice.java | 2 - .../cc/allio/uno/core/bus/NoticeTopic.java | 1 - .../cc/allio/uno/core/bus/Subscription.java | 3 +- .../java/cc/allio/uno/core/bus/Topic.java | 3 +- .../cc/allio/uno/core/bus/TopicEvent.java | 1 - .../java/cc/allio/uno/core/bus/TopicKey.java | 1 - .../java/cc/allio/uno/core/bus/Topics.java | 3 +- .../uno/core/bus/event/AbstractEventNode.java | 1 - .../cc/allio/uno/core/bus/event/BusEvent.java | 1 - .../cc/allio/uno/core/bus/event/Context.java | 1 - .../allio/uno/core/bus/event/EmitEvent.java | 1 - .../allio/uno/core/bus/event/EventNode.java | 7 +- .../allio/uno/core/bus/event/LiftEvent.java | 1 - .../cc/allio/uno/core/bus/event/Listener.java | 2 - .../cc/allio/uno/core/bus/event/Node.java | 3 +- .../uno/core/bus/event/ReactiveEventNode.java | 1 - .../java/cc/allio/uno/core/cache/Cache.java | 1 - .../allio/uno/core/cache/CacheCallable.java | 1 - .../cc/allio/uno/core/cache/CacheKey.java | 1 - .../uno/core/cache/ConcurrentMemoryCache.java | 1 - .../allio/uno/core/cache/InMemoryCache.java | 1 - .../uno/core/cache/InitializationCache.java | 1 - .../java/cc/allio/uno/core/chain/Chain.java | 2 - .../cc/allio/uno/core/chain/ChainContext.java | 1 - .../cc/allio/uno/core/chain/DefaultChain.java | 1 - .../java/cc/allio/uno/core/chain/Node.java | 1 - .../uno/core/concurrent/LockContext.java | 1 - .../allio/uno/core/concurrent/LockResult.java | 2 - .../concurrent/MultiCheckedException.java | 1 - .../tree/BreadthTraversalMode.java | 1 - .../datastructure/tree/ComparableElement.java | 1 - .../datastructure/tree/DeepTraversalMode.java | 1 - .../datastructure/tree/DefaultElement.java | 1 - .../uno/core/datastructure/tree/Element.java | 1 - .../uno/core/datastructure/tree/Expand.java | 1 - .../datastructure/tree/NoneTraversalMode.java | 1 - .../datastructure/tree/TraversalElement.java | 1 - .../datastructure/tree/TraversalMethod.java | 1 - .../core/datastructure/tree/TreeSupport.java | 1 - .../uno/core/datastructure/tree/Visitor.java | 1 - .../main/java/cc/allio/uno/core/env/Env.java | 1 - .../main/java/cc/allio/uno/core/env/Envs.java | 1 - .../java/cc/allio/uno/core/env/SpringEnv.java | 1 - .../java/cc/allio/uno/core/env/SystemEnv.java | 1 - .../uno/core/exception/CaptureException.java | 1 - .../exception/InstantiationException.java | 1 - .../core/exception/InvokeFutureException.java | 3 +- .../exception/SerializationException.java | 1 - .../cc/allio/uno/core/function/Action.java | 1 - .../uno/core/function/ConsumerAction.java | 1 - .../uno/core/function/SupplierAction.java | 1 - .../uno/core/function/TernaryConsumer.java | 1 - .../allio/uno/core/function/VoidConsumer.java | 1 - .../core/function/lambda/LambdaMethod.java | 1 - .../function/lambda/MethodBiConsumer.java | 1 - .../function/lambda/MethodBiFunction.java | 1 - .../function/lambda/MethodBiPredicate.java | 1 - .../core/function/lambda/MethodConsumer.java | 1 - .../core/function/lambda/MethodFunction.java | 1 - .../core/function/lambda/MethodPredicate.java | 1 - .../function/lambda/MethodQueConsumer.java | 1 - .../function/lambda/MethodQueFunction.java | 1 - .../core/function/lambda/MethodReference.java | 1 - .../lambda/MethodReferenceColumn.java | 2 - .../core/function/lambda/MethodSupplier.java | 1 - .../function/lambda/MethodTerConsumer.java | 1 - .../function/lambda/MethodTerFunction.java | 1 - .../function/lambda/MethodTerPredicate.java | 1 - .../uno/core/function/lambda/MethodVoid.java | 1 - .../function/lambda/MethodVoidPredicate.java | 1 - .../function/lambda/SerializedLambda.java | 1 - .../lambda/StaticMethodReference.java | 1 - .../lambda/ThrowingMethodBiConsumer.java | 1 - .../lambda/ThrowingMethodBiFunction.java | 1 - .../lambda/ThrowingMethodBiPredicate.java | 1 - .../lambda/ThrowingMethodConsumer.java | 1 - .../lambda/ThrowingMethodFunction.java | 1 - .../lambda/ThrowingMethodPredicate.java | 1 - .../lambda/ThrowingMethodQueConsumer.java | 1 - .../lambda/ThrowingMethodQueFunction.java | 1 - .../lambda/ThrowingMethodSupplier.java | 1 - .../lambda/ThrowingMethodTerConsumer.java | 1 - .../lambda/ThrowingMethodTerFunction.java | 1 - .../lambda/ThrowingMethodTerPredicate.java | 1 - .../function/lambda/ThrowingMethodVoid.java | 1 - .../lambda/ThrowingMethodVoidPredicate.java | 1 - .../uno/core/metadata/CompositeMetadata.java | 1 - .../allio/uno/core/metadata/JsonMetadata.java | 2 - .../cc/allio/uno/core/metadata/Metadata.java | 13 +- .../convert/AbstractJsonConverter.java | 1 - .../convert/AbstractRichConverter.java | 1 - .../uno/core/metadata/convert/Converter.java | 1 - .../metadata/convert/ConverterFactory.java | 1 - .../core/metadata/convert/RichConverter.java | 1 - .../metadata/endpoint/DefaultEndpoint.java | 1 - .../endpoint/DirectSourceEndpoint.java | 1 - .../uno/core/metadata/endpoint/Endpoint.java | 1 - .../endpoint/FunctionSourceEndpoint.java | 1 - .../metadata/endpoint/SourceEndpoint.java | 1 - .../endpoint/source/AggregationSource.java | 1 - .../endpoint/source/CollectionSource.java | 1 - .../source/DefaultAggregationSource.java | 1 - .../metadata/endpoint/source/JsonSource.java | 1 - .../endpoint/source/ObjectSource.java | 1 - .../metadata/endpoint/source/SinkSource.java | 1 - .../core/metadata/endpoint/source/Source.java | 1 - .../endpoint/source/SourceCollector.java | 1 - .../endpoint/source/SourceConverter.java | 1 - .../DefaultReactiveAggregationSource.java | 1 - .../reactive/ReactiveAggregationSource.java | 1 - .../source/reactive/ReactiveObjectSource.java | 1 - .../source/reactive/ReactiveSinkSource.java | 1 - .../source/reactive/ReactiveSource.java | 1 - .../ArrayStringMappingFieldConverter.java | 1 - .../mapping/BaseMappingFieldConverter.java | 1 - .../mapping/DefaultMappingFieldConverter.java | 1 - .../mapping/DefaultMappingMetadata.java | 1 - .../KeyMappingFieldConverterFactory.java | 1 - .../mapping/MappingFieldConverter.java | 1 - .../metadata/mapping/MappingMetadata.java | 1 - .../java/cc/allio/uno/core/path/Forest.java | 1 - .../cc/allio/uno/core/path/PathManager.java | 1 - .../proxy/ByteBuddyInvocationInterceptor.java | 3 +- .../core/proxy/ByteBuddyProxyInvocation.java | 9 +- .../proxy/CglibInvocationInterceptor.java | 3 +- .../uno/core/proxy/CglibProxyInvocation.java | 3 +- .../ComposableInvocationInterceptor.java | 1 - .../allio/uno/core/proxy/ComposeOrigin.java | 1 - .../allio/uno/core/proxy/ComposeSharable.java | 1 - ...apacityByteBuddyInvocationInterceptor.java | 1 - .../IncapacityCglibInvocationInterceptor.java | 1 - .../IncapacityInvocationInterceptor.java | 1 - .../uno/core/proxy/InvocationInterceptor.java | 3 +- .../uno/core/proxy/JDKProxyInvocation.java | 3 +- .../cc/allio/uno/core/proxy/ProxyContext.java | 3 +- .../cc/allio/uno/core/proxy/ProxyFactory.java | 3 +- .../allio/uno/core/proxy/ProxyInvocation.java | 3 +- .../allio/uno/core/reactive/BufferRate.java | 1 - .../cc/allio/uno/core/reactive/Reactives.java | 1 - .../core/reactive/UnreliableChangeable.java | 1 - .../reactive/UnreliableChangeablePool.java | 1 - .../cc/allio/uno/core/reflect/DrawnClass.java | 1 - .../cc/allio/uno/core/reflect/DrawnField.java | 1 - .../allio/uno/core/reflect/DrawnGeneric.java | 1 - .../allio/uno/core/reflect/DrawnMethod.java | 1 - .../allio/uno/core/reflect/Instantiation.java | 1 - .../core/reflect/InstantiationBuilder.java | 1 - .../core/reflect/InstantiationFeature.java | 1 - .../uno/core/reflect/ParameterizedFinder.java | 1 - .../allio/uno/core/reflect/ReflectTools.java | 1 - .../core/serializer/AbstractSerializer.java | 3 +- .../core/serializer/JacksonSerializer.java | 3 +- .../uno/core/serializer/JsonNodeEnhancer.java | 1 - .../core/serializer/ProtoStuffSerializer.java | 3 +- .../allio/uno/core/serializer/Serializer.java | 3 +- .../uno/core/serializer/SerializerHolder.java | 3 +- .../cc/allio/uno/core/spi/AutoTypeLoader.java | 9 +- .../uno/core/spi/ClassPathServiceLoader.java | 1 - .../allio/uno/core/spi/FactoriesLoader.java | 1 - .../java/cc/allio/uno/core/spi/Loader.java | 1 - .../uno/core/task/AbstractBufferRateTask.java | 1 - .../allio/uno/core/task/AccumulatedTask.java | 1 - .../core/task/BaseComposedComputeTask.java | 1 - .../uno/core/task/BatchComputingTask.java | 1 - .../cc/allio/uno/core/task/Computing.java | 1 - .../java/cc/allio/uno/core/task/CronTask.java | 2 - .../uno/core/task/DefaultBufferRateTask.java | 1 - .../task/ProxyBufferTimerSegmentTask.java | 1 - .../cc/allio/uno/core/task/ReactiveTask.java | 1 - .../java/cc/allio/uno/core/task/Task.java | 1 - .../allio/uno/core/task/TimerSegmentTask.java | 1 - .../uno/core/type/BigDecimalTypeOperator.java | 1 - .../core/type/BooleanCalculateOperator.java | 1 - .../allio/uno/core/type/ByteTypeOperator.java | 1 - .../uno/core/type/CalculateOperator.java | 1 - .../uno/core/type/DateCalculateOperator.java | 1 - .../cc/allio/uno/core/type/DefaultType.java | 1 - .../uno/core/type/DefaultTypeOperator.java | 1 - .../uno/core/type/DoubleTypeOperator.java | 1 - .../allio/uno/core/type/EnumTypeOperator.java | 1 - .../uno/core/type/FloatTypeOperator.java | 1 - .../uno/core/type/IntegerTypeOperator.java | 1 - .../allio/uno/core/type/LongTypeOperator.java | 1 - .../uno/core/type/MemoryTypeManager.java | 1 - .../cc/allio/uno/core/type/RegexType.java | 1 - .../uno/core/type/ShortTypeOperator.java | 1 - .../uno/core/type/StringTypeOperator.java | 1 - .../java/cc/allio/uno/core/type/Type.java | 1 - .../cc/allio/uno/core/type/TypeManager.java | 5 - .../cc/allio/uno/core/type/TypeOperator.java | 1 - .../uno/core/type/TypeOperatorFactory.java | 2 - .../cc/allio/uno/core/type/TypeValue.java | 1 - .../java/cc/allio/uno/core/type/Types.java | 1 - .../type/UnsupportedCalculateOperator.java | 1 - .../cc/allio/uno/core/util/BeanUtils.java | 3 - .../allio/uno/core/util/BigDecimalUtils.java | 1 - .../cc/allio/uno/core/util/CalendarUtils.java | 9 - .../cc/allio/uno/core/util/ClassUtils.java | 3 +- .../allio/uno/core/util/CollectionUtils.java | 3 +- .../cc/allio/uno/core/util/FieldUtils.java | 1 - .../cc/allio/uno/core/util/FileUtils.java | 5 +- .../cc/allio/uno/core/util/JsonUtils.java | 1 - .../cc/allio/uno/core/util/ObjectUtils.java | 1 - .../cc/allio/uno/core/util/RandomUtil.java | 37 ++ .../java/cc/allio/uno/core/util/Requires.java | 3 +- .../cc/allio/uno/core/util/ResourceUtils.java | 1 - .../cc/allio/uno/core/util/StringUtils.java | 30 +- .../java/cc/allio/uno/core/util/Values.java | 1 - .../util/comparator/BigDecimalComparator.java | 1 - .../util/comparator/BooleanComparator.java | 1 - .../core/util/comparator/ByteComparator.java | 1 - .../util/comparator/CollectionComparator.java | 1 - .../uno/core/util/comparator/Comparators.java | 1 - .../util/comparator/DoubleComparator.java | 1 - .../util/comparator/EqualsComparator.java | 1 - .../core/util/comparator/FloatComparator.java | 1 - .../util/comparator/IntegerComparator.java | 1 - .../core/util/comparator/LongComparator.java | 1 - .../util/comparator/ObjectComparator.java | 1 - .../core/util/comparator/ShortComparator.java | 1 - .../util/comparator/StringComparator.java | 1 - .../allio/uno/core/util/id/IdGenerator.java | 1 - .../id/InternalDataCenterIdGenerator.java | 1 - .../util/template/ExpressionTemplate.java | 2 - .../template/ExpressionTemplateNavigator.java | 1 - .../core/util/template/TemplateContext.java | 3 +- .../uno/core/util/template/Tokenizer.java | 3 +- .../core/util/template/VariableResolve.java | 1 - .../template/internal/BaseInterchange.java | 1 - .../template/internal/BeanInterchange.java | 3 +- .../core/util/template/internal/Engine.java | 2 - .../template/internal/GenericTokenParser.java | 1 - .../util/template/internal/Interchange.java | 1 - .../template/internal/KeyInterchange.java | 1 - .../util/template/internal/LangValue.java | 1 - .../core/util/template/internal/Layer.java | 1 - .../template/internal/ListInterchange.java | 1 - .../internal/ListableInterchange.java | 1 - .../template/internal/MapInterchange.java | 1 - .../PlaceholderExpressionTemplate.java | 3 +- .../util/template/internal/SymbolEngine.java | 1 - .../util/template/internal/TokenHandler.java | 1 - .../util/template/internal/TokenParser.java | 2 - .../template/mvel/CharsetOutputStream.java | 1 - .../template/mvel/MVELExpressionTemplate.java | 1 - ...emplateContextVariableResolverFactory.java | 3 +- .../template/mvel/TypeVariableResolver.java | 1 - .../uno/core/bean/BeanInfoWrapperTest.java | 1 - .../allio/uno/core/bus/SubscriptionTest.java | 1 - .../uno/core/cache/InMemoryCacheTest.java | 1 - .../core/cache/InitializationCacheTest.java | 1 - .../uno/core/chain/DefaultChainTest.java | 1 - .../serializer/ProtoStuffSerializerTest.java | 3 +- .../uno/core/spi/FactoriesLoaderTest.java | 1 - .../cc/allio/uno/core/util/DateUtilTest.java | 1 - .../uno/core/util/StringUtilBaseTest.java | 3 +- uno-data/pom.xml | 18 +- uno-data/uno-data-api/pom.xml | 8 +- .../uno/data/orm/annotation/LogicDelete.java | 1 - .../uno/data/orm/dsl/BinaryCondition.java | 1 - .../cc/allio/uno/data/orm/dsl/ColumnDef.java | 1 - .../cc/allio/uno/data/orm/dsl/Condition.java | 1 - .../cc/allio/uno/data/orm/dsl/DSLName.java | 1 - .../uno/data/orm/dsl/DataBaseOperator.java | 1 - .../cc/allio/uno/data/orm/dsl/Database.java | 1 - .../java/cc/allio/uno/data/orm/dsl/Func.java | 1 - .../cc/allio/uno/data/orm/dsl/JDBCTypes.java | 1 - .../cc/allio/uno/data/orm/dsl/JoinTable.java | 1 - .../cc/allio/uno/data/orm/dsl/JoinType.java | 1 - .../uno/data/orm/dsl/JoinTypeAdapter.java | 1 - .../java/cc/allio/uno/data/orm/dsl/Meta.java | 1 - .../allio/uno/data/orm/dsl/MetaAcceptor.java | 1 - .../uno/data/orm/dsl/MetaAcceptorSet.java | 1 - .../cc/allio/uno/data/orm/dsl/Operator.java | 2 - .../allio/uno/data/orm/dsl/OperatorKey.java | 1 - .../uno/data/orm/dsl/OrderCondition.java | 1 - .../uno/data/orm/dsl/PrepareOperator.java | 1 - .../uno/data/orm/dsl/PrepareOperatorImpl.java | 1 - .../allio/uno/data/orm/dsl/PrepareValue.java | 1 - .../uno/data/orm/dsl/SPIOperatorHelper.java | 10 +- .../java/cc/allio/uno/data/orm/dsl/Table.java | 3 +- .../allio/uno/data/orm/dsl/TableOperator.java | 1 - .../java/cc/allio/uno/data/orm/dsl/Token.java | 1 - .../allio/uno/data/orm/dsl/TokenOperator.java | 1 - .../data/orm/dsl/TokenOperatorAdapter.java | 1 - .../allio/uno/data/orm/dsl/UnaryOperator.java | 1 - .../data/orm/dsl/UnrecognizedOperator.java | 1 - .../allio/uno/data/orm/dsl/WhereOperator.java | 1 - .../data/orm/dsl/ddl/AlterTableOperator.java | 1 - .../data/orm/dsl/ddl/CreateTableOperator.java | 1 - .../data/orm/dsl/ddl/DropTableOperator.java | 1 - .../data/orm/dsl/ddl/ExistTableOperator.java | 1 - .../data/orm/dsl/ddl/ShowColumnsOperator.java | 1 - .../data/orm/dsl/ddl/ShowTablesOperator.java | 1 - .../data/orm/dsl/dialect/TypeTranslator.java | 1 - .../uno/data/orm/dsl/dml/DeleteOperator.java | 1 - .../uno/data/orm/dsl/dml/InsertOperator.java | 1 - .../uno/data/orm/dsl/dml/QueryOperator.java | 1 - .../uno/data/orm/dsl/dml/UpdateOperator.java | 1 - .../data/orm/dsl/exception/DDLException.java | 1 - .../data/orm/dsl/exception/DMLException.java | 1 - .../data/orm/dsl/exception/DSLException.java | 1 - .../orm/dsl/helper/ColumnDefListResolve.java | 1 - .../orm/dsl/helper/ColumnDefListResolver.java | 1 - .../data/orm/dsl/helper/ColumnDefResolve.java | 1 - .../orm/dsl/helper/ColumnDefResolver.java | 1 - .../uno/data/orm/dsl/helper/PojoInspect.java | 1 - .../data/orm/dsl/helper/PojoInspection.java | 1 - .../uno/data/orm/dsl/helper/PojoResolver.java | 1 - .../uno/data/orm/dsl/helper/PojoWrapper.java | 1 - .../uno/data/orm/dsl/helper/TableResolve.java | 1 - .../data/orm/dsl/helper/TableResolver.java | 1 - .../uno/data/orm/dsl/logical/BiLogical.java | 1 - .../uno/data/orm/dsl/logical/Logical.java | 1 - .../uno/data/orm/dsl/logical/QueLogical.java | 1 - .../uno/data/orm/dsl/logical/TerLogical.java | 1 - .../MetaAcceptorAlterTableOperator.java | 1 - .../MetaAcceptorCreateTableOperator.java | 1 - .../MetaAcceptorDeleteOperator.java | 1 - .../MetaAcceptorDropTableOperator.java | 1 - .../MetaAcceptorExistTableOperator.java | 1 - .../MetaAcceptorInsertOperator.java | 1 - .../MetaAcceptorQueryOperator.java | 1 - .../MetaAcceptorSetOperatorGroup.java | 1 - .../MetaAcceptorShowColumnsOperator.java | 1 - .../MetaAcceptorShowTablesOperator.java | 1 - .../MetaAcceptorUpdateOperator.java | 1 - .../data/orm/dsl/opeartorgroup/Operators.java | 1 - .../dsl/opeartorgroup/WrapperOperator.java | 1 - .../uno/data/orm/dsl/type/ArrayJavaType.java | 1 - .../uno/data/orm/dsl/type/BeanJavaType.java | 1 - .../data/orm/dsl/type/BigDecimalJavaType.java | 1 - .../data/orm/dsl/type/BooleanJavaType.java | 1 - .../uno/data/orm/dsl/type/ByteJavaType.java | 1 - .../data/orm/dsl/type/CharArrayJavaType.java | 1 - .../allio/uno/data/orm/dsl/type/DBType.java | 1 - .../uno/data/orm/dsl/type/DBTypeAdapter.java | 1 - .../allio/uno/data/orm/dsl/type/DSLType.java | 1 - .../allio/uno/data/orm/dsl/type/DataType.java | 1 - .../data/orm/dsl/type/DataTypeAdapter.java | 1 - .../uno/data/orm/dsl/type/DateJavaType.java | 1 - .../uno/data/orm/dsl/type/DoubleJavaType.java | 1 - .../uno/data/orm/dsl/type/EnumJavaType.java | 1 - .../uno/data/orm/dsl/type/FloatJavaType.java | 1 - .../data/orm/dsl/type/IntegerJavaType.java | 1 - .../allio/uno/data/orm/dsl/type/JavaType.java | 1 - .../uno/data/orm/dsl/type/JavaTypeImpl.java | 1 - .../allio/uno/data/orm/dsl/type/JdbcType.java | 2 - .../uno/data/orm/dsl/type/JdbcTypeImpl.java | 1 - .../uno/data/orm/dsl/type/ListJavaType.java | 1 - .../uno/data/orm/dsl/type/LongJavaType.java | 1 - .../uno/data/orm/dsl/type/MapJavaType.java | 1 - .../uno/data/orm/dsl/type/QueueJavaType.java | 1 - .../uno/data/orm/dsl/type/SetJavaType.java | 1 - .../uno/data/orm/dsl/type/ShortJavaType.java | 1 - .../uno/data/orm/dsl/type/StackJavaType.java | 1 - .../uno/data/orm/dsl/type/StringJavaType.java | 1 - .../uno/data/orm/dsl/type/TypeRegistry.java | 2 - .../data/orm/dsl/type/UnknownJavaType.java | 1 - .../allio/uno/data/orm/dsl/word/Distinct.java | 1 - .../allio/uno/data/orm/dsl/word/KeyWord.java | 1 - .../allio/uno/data/orm/dsl/word/KeyWords.java | 1 - .../orm/executor/AbstractCommandExecutor.java | 1 - .../executor/AggregateCommandExecutor.java | 1 - .../executor/BaseCommandExecutorLoader.java | 1 - .../data/orm/executor/CommandExecutor.java | 1 - .../orm/executor/CommandExecutorAware.java | 1 - .../orm/executor/CommandExecutorFactory.java | 1 - .../orm/executor/CommandExecutorLoader.java | 1 - .../orm/executor/CommandExecutorRegistry.java | 1 - .../executor/CommandExecutorRegistryImpl.java | 1 - .../uno/data/orm/executor/CommandType.java | 1 - .../data/orm/executor/DDLCommandExecutor.java | 1 - .../data/orm/executor/DMLCommandExecutor.java | 1 - .../orm/executor/ExecutorFactoryBean.java | 1 - .../orm/executor/ExecutorInitializer.java | 1 - .../orm/executor/ExecutorOptionsBuilder.java | 1 - .../cc/allio/uno/data/orm/executor/IPage.java | 1 - .../orm/executor/IdMethodReferenceColumn.java | 1 - .../cc/allio/uno/data/orm/executor/Page.java | 1 - .../uno/data/orm/executor/ResultGroup.java | 3 +- .../uno/data/orm/executor/ResultRow.java | 1 - .../uno/data/orm/executor/ResultSet.java | 1 - .../executor/exception/ExecuteException.java | 1 - .../executor/handler/BeanResultHandler.java | 1 - .../handler/BeanResultSetHandler.java | 1 - .../executor/handler/BoolResultHandler.java | 1 - .../handler/CohesionListResultSetHandler.java | 1 - .../ColumnDefListResultSetHandler.java | 1 - .../handler/DefaultListResultSetHandler.java | 1 - .../handler/DefaultResultSetHandler.java | 1 - .../handler/ExecutorOptionsAware.java | 1 - .../handler/ExecutorResultHandlerSet.java | 1 - .../handler/ListBeanResultHandler.java | 1 - .../handler/ListBeanResultSetHandler.java | 1 - .../handler/ListMapResultHandler.java | 1 - .../handler/ListResultSetHandler.java | 1 - .../executor/handler/MapResultSetHandler.java | 1 - .../orm/executor/handler/ResultHandler.java | 1 - .../executor/handler/ResultSetHandler.java | 1 - .../handler/TableListResultSetHandler.java | 1 - .../interceptor/AfterInterceptor.java | 1 - .../interceptor/BeforeInterceptor.java | 1 - .../orm/executor/interceptor/Interceptor.java | 1 - .../interceptor/InterceptorChain.java | 1 - .../interceptor/InterceptorChainContext.java | 1 - .../interceptor/InternalInterceptor.java | 1 - .../internal/ATOInnerCommandExecutor.java | 1 - .../internal/CTOInnerCommandExecutor.java | 1 - .../internal/DOInnerCommandExecutor.java | 1 - .../internal/DTOInnerCommandExecutor.java | 1 - .../internal/ETOInnerCommandExecutor.java | 1 - .../internal/IOInnerCommandExecutor.java | 1 - .../internal/InnerCommandExecutor.java | 2 - .../internal/InnerCommandExecutorManager.java | 1 - .../internal/InnerDefaultCommandExecutor.java | 1 - .../internal/InnerListCommandExecutor.java | 1 - .../internal/QOInnerCommandExecutor.java | 1 - .../internal/SCOInnerCommandExecutor.java | 1 - .../internal/SPIInnerCommandScanner.java | 1 - .../internal/STInnerCommandExecutor.java | 1 - .../internal/UOInnerCommandExecutor.java | 1 - .../internal/UnknownInnerCommandExecutor.java | 1 - .../orm/executor/options/ExecutorKey.java | 1 - .../orm/executor/options/ExecutorOptions.java | 1 - .../executor/options/ExecutorOptionsImpl.java | 1 - .../SPIExecutorOptionsResultHandlerSet.java | 1 - .../allio/uno/data/query/BaseHigherQuery.java | 1 - .../allio/uno/data/query/BaseQueryFilter.java | 1 - .../cc/allio/uno/data/query/HigherQuery.java | 1 - .../java/cc/allio/uno/data/query/Query.java | 1 - .../cc/allio/uno/data/query/QueryFilter.java | 1 - .../cc/allio/uno/data/query/QueryWrapper.java | 1 - .../cc/allio/uno/data/query/param/Action.java | 1 - .../uno/data/query/param/AddDiluteAction.java | 1 - .../uno/data/query/param/DataDilute.java | 1 - .../uno/data/query/param/DateDimension.java | 1 - .../data/query/param/DefaultDiluteAction.java | 1 - .../uno/data/query/param/DiluteAction.java | 1 - .../uno/data/query/param/TimeDimension.java | 1 - .../cc/allio/uno/data/query/param/Window.java | 1 - .../uno/data/query/stream/AsyncStream.java | 1 - .../query/stream/CollectionTimeStream.java | 1 - .../stream/CollectionTimeStreamImpl.java | 1 - .../query/stream/ContemporaneousStream.java | 1 - .../ContemporaneousValueTimeStream.java | 1 - .../uno/data/query/stream/DataStream.java | 1 - .../data/query/stream/DiluentTimeStream.java | 1 - .../query/stream/FunctionalityTimeStream.java | 1 - .../stream/OutliersIgnoreTimeStream.java | 1 - .../stream/SQLCommandExecutorStream.java | 1 - .../allio/uno/data/query/stream/Sampling.java | 1 - .../uno/data/query/stream/SortStream.java | 1 - .../uno/data/query/stream/StreamBuilder.java | 1 - .../query/stream/SupplementTimeStream.java | 1 - .../uno/data/query/stream/TimeStream.java | 1 - .../uno/data/query/stream/ValueTime.java | 1 - .../data/query/stream/ValueTimeStream.java | 1 - .../uno/data/tx/BaseTransactionBehavior.java | 1 - .../uno/data/tx/BoolTransactionBehavior.java | 1 - .../cc/allio/uno/data/tx/Transaction.java | 1 - .../allio/uno/data/tx/TransactionAction.java | 1 - .../allio/uno/data/tx/TransactionContext.java | 1 - .../cc/allio/uno/data/tx/TxDefinition.java | 1 - .../allio/uno/data/tx/TxDefinitionImpl.java | 1 - .../uno/data/tx/VoidTransactionAction.java | 1 - .../uno/data/tx/VoidTransactionBehavior.java | 1 - uno-data/uno-data-db/pom.xml | 12 +- .../orm/config/db/DbAutoConfiguration.java | 3 +- .../uno/data/orm/config/db/DbProperties.java | 1 - .../orm/executor/db/DataSourceHelper.java | 1 - .../orm/executor/db/DbCommandExecutor.java | 1 - .../executor/db/DbCommandExecutorAspect.java | 1 - .../executor/db/DbCommandExecutorAware.java | 1 - .../executor/db/DbCommandExecutorLoader.java | 1 - .../db/DbCommandExecutorProcessor.java | 1 - .../executor/db/DbMybatisConfiguration.java | 1 - .../executor/db/DbStatementSetHandler.java | 1 - .../ColumnDefListResultHandlerDelegate.java | 1 - .../H2ColumnDefListResultSetHandler.java | 1 - .../MySQLColumnDefListResultHandler.java | 1 - ...stgreSQLColumnDefListResultSetHandler.java | 1 - .../db/UnoDataMybatisAutoConfiguration.java | 1 - .../uno/data/query/db/mapper/QueryMapper.java | 1 - ...ousForValueTimeQueryMethodInterceptor.java | 1 - ...ContemporaneousQueryMethodInterceptor.java | 1 - .../query/interceptor/QueryInterceptor.java | 1 - ...istForValueTimeQueryMethodInterceptor.java | 1 - .../QueryListQueryMethodInterceptor.java | 1 - .../interceptor/QueryMethodInterceptor.java | 1 - .../QueryMethodInterceptorDelegate.java | 1 - .../QueryMethodInterceptorFactory.java | 1 - .../query/db/query/stream/MybatisStream.java | 1 - .../db/type/DateDimensionTypeHandler.java | 1 - uno-data/uno-data-elasticsearch/pom.xml | 10 +- .../ElasticSearchProperties.java | 1 - .../UnoElasticSearchAutoConfiguration.java | 1 - .../ddl/EsCreateIndexOperator.java | 1 - .../ddl/EsDropIndexOperator.java | 1 - .../ddl/EsExistIndexOperator.java | 3 +- .../elasticsearch/ddl/EsPropertyAdapter.java | 1 - .../ddl/EsShowColumnsOperator.java | 1 - .../elasticsearch/dml/EsDeleteOperator.java | 1 - .../elasticsearch/dml/EsInsertOperator.java | 1 - .../elasticsearch/dml/EsQueryOperator.java | 1 - .../elasticsearch/dml/EsUpdateOperator.java | 6 +- .../dml/EsWhereOperatorImpl.java | 7 +- .../elasticsearch/EsCommandExecutor.java | 1 - .../EsCommandExecutorAspect.java | 1 - .../elasticsearch/EsCommandExecutorAware.java | 1 - .../EsCommandExecutorLoader.java | 1 - .../EsCommandExecutorProcessor.java | 1 - .../elasticsearch/internal/AggrResultSet.java | 1 - .../EsCreateTableCommandExecutor.java | 1 - .../internal/EsDeleteCommandExecutor.java | 1 - .../EsDeleteTableCommandExecutor.java | 1 - .../internal/EsExistTableCommandExecutor.java | 1 - .../internal/EsInsertCommandExecutor.java | 1 - .../internal/EsQueryCommandExecutor.java | 1 - .../elasticsearch/internal/EsResultGroup.java | 1 - .../elasticsearch/internal/EsResultSet.java | 1 - .../internal/EsShowColumnCommandExecutor.java | 1 - .../internal/EsUpdateCommandExecutor.java | 1 - uno-data/uno-data-influxdb/pom.xml | 12 +- .../config/influxdb/InfluxdbProperties.java | 1 - .../UnoInfluxdbAutoConfiguration.java | 1 - .../dsl/influxdb/InfluxDbTableAcceptor.java | 1 - .../ddl/InfluxdbAlterBucketOperator.java | 1 - .../ddl/InfluxdbCreateBucketOperator.java | 1 - .../ddl/InfluxdbDropBucketOperator.java | 1 - .../ddl/InfluxdbExistBucketOperator.java | 1 - .../ddl/InfluxdbShowBucketsOperator.java | 1 - .../influxdb/dml/InfluxdbDeleteOperator.java | 1 - .../influxdb/dml/InfluxdbInsertOperator.java | 1 - .../influxdb/dml/InfluxdbQueryOperator.java | 1 - .../dml/InfluxdbSQLWhereOperatorImpl.java | 1 - .../influxdb/dml/InfluxdbUpdateOperator.java | 1 - .../influxdb/InfluxdbCommandExecutor.java | 1 - .../InfluxdbCommandExecutorAspect.java | 1 - .../InfluxdbCommandExecutorAware.java | 1 - .../InfluxdbCommandExecutorLoader.java | 1 - .../InfluxdbCommandExecutorProcessor.java | 1 - .../InfluxdbAlterBucketCommandExecutor.java | 1 - .../InfluxdbCommandExecutorAdaptation.java | 1 - .../InfluxdbCreateBucketCommandExecutor.java | 1 - .../InfluxdbDeleteCommandExecutor.java | 1 - .../InfluxdbDropBucketCommandExecutor.java | 1 - .../InfluxdbExistBucketCommandExecutor.java | 1 - .../InfluxdbInsertCommandExecutor.java | 1 - .../InfluxdbQueryCommandExecutor.java | 1 - .../InfluxdbShowBucketsCommandExecutor.java | 1 - .../InfluxdbUpdateCommandExecutor.java | 1 - uno-data/uno-data-mongodb/pom.xml | 10 +- .../orm/config/mongodb/MongodbProperties.java | 1 - .../mongodb/UnoMongodbAutoConfiguration.java | 1 - .../data/orm/dsl/mongodb/MongodbSupport.java | 1 - .../ddl/MongodbAlterCollectionOperator.java | 1 - .../ddl/MongodbCreateCollectionOperator.java | 1 - .../ddl/MongodbDropCollectionOperator.java | 1 - .../ddl/MongodbExistCollectionOperator.java | 1 - .../ddl/MongodbShowCollectionsOperator.java | 1 - .../mongodb/dml/MongodbDeleteOperator.java | 1 - .../mongodb/dml/MongodbInsertOperator.java | 1 - .../dsl/mongodb/dml/MongodbQueryOperator.java | 1 - .../mongodb/dml/MongodbUpdateOperator.java | 1 - .../mongodb/dml/MongodbWhereOperatorImpl.java | 1 - .../mongodb/MongodbCommandExecutor.java | 1 - .../mongodb/MongodbCommandExecutorAspect.java | 1 - .../mongodb/MongodbCommandExecutorAware.java | 1 - .../mongodb/MongodbCommandExecutorLoader.java | 1 - .../MongodbCommandExecutorProcessor.java | 1 - ...MongodbAlterCollectionCommandExecutor.java | 1 - ...ongodbCreateCollectionCommandExecutor.java | 1 - .../MongodbDeleteCommandExecutor.java | 1 - .../MongodbDropCollectionCommandExecutor.java | 1 - ...MongodbExistCollectionCommandExecutor.java | 1 - .../MongodbInsertCommandExecutor.java | 1 - .../internal/MongodbQueryCommandExecutor.java | 1 - .../MongodbShowCollectionCommandExecutor.java | 1 - .../MongodbUpdateCommandExecutor.java | 1 - uno-data/uno-data-neo4j/pom.xml | 10 +- uno-data/uno-data-redis/pom.xml | 10 +- uno-data/uno-data-sql/pom.xml | 10 +- .../uno/data/orm/dsl/sql/SQLSupport.java | 1 - .../orm/dsl/sql/UnoSQLExprTableSource.java | 1 - .../data/orm/dsl/sql/ddl/DDLSQLSupport.java | 1 - .../dsl/sql/ddl/SQLAlterTableOperator.java | 1 - .../dsl/sql/ddl/SQLCreateTableOperator.java | 1 - .../orm/dsl/sql/ddl/SQLDropTableOperator.java | 1 - .../dsl/sql/ddl/SQLExistTableOperator.java | 1 - .../dsl/sql/ddl/SQLShowColumnsOperator.java | 1 - .../orm/dsl/sql/dialect/H2TypeTranslator.java | 1 - .../dsl/sql/dialect/type/DSLTypeDelegate.java | 1 - .../sql/dialect/type/H2SQLTypeDelegate.java | 1 - .../sql/dialect/type/MySQLTypeDelegate.java | 1 - .../dialect/type/PostgreSQLTypeDelegate.java | 1 - .../orm/dsl/sql/dml/DruidJoinTypeAdapter.java | 1 - .../sql/dml/DruidTokenOperatorAdapter.java | 1 - .../orm/dsl/sql/dml/SQLDeleteOperator.java | 1 - .../orm/dsl/sql/dml/SQLInsertOperator.java | 1 - .../orm/dsl/sql/dml/SQLQueryOperator.java | 1 - .../orm/dsl/sql/dml/SQLUpdateOperator.java | 1 - .../orm/dsl/sql/dml/SQLWhereOperatorImpl.java | 1 - .../orm/dsl/type/DruidDataTypeAdapter.java | 1 - .../data/orm/dsl/type/DruidDbTypeAdapter.java | 1 - uno-data/uno-data-test/pom.xml | 10 +- .../executor/CommandExecutorInjectRunner.java | 3 +- .../test/executor/CommandExecutorSetter.java | 1 - .../testcontainers/InfluxdbPrelude.java | 1 - .../ContainerExecutorOptionsTranslator.java | 1 - .../translator/InfluxdbTranslator.java | 1 - .../executor/translator/MSSQLTranslator.java | 1 - .../translator/MongodbTranslator.java | 1 - .../executor/translator/MySQLTranslator.java | 1 - .../translator/PostgreSQLTranslator.java | 1 - .../executor/translator/RDBTranslator.java | 1 - .../allio/uno/data/test/model/DataSets.java | 1 - uno-demo/pom.xml | 18 - uno-demo/uno-websocket-demo/pom.xml | 27 -- .../demo/DemoWebSocketApplication.java | 12 - .../websocket/demo/DemoWebSocketEndpoint.java | 48 -- uno-gis/pom.xml | 16 +- .../java/cc/allio/uno/gis/GeometryTypes.java | 1 - .../main/java/cc/allio/uno/gis/GisUtil.java | 1 - .../src/main/java/cc/allio/uno/gis/SRID.java | 1 - .../geojson/annotation/GeoJsonTransform.java | 1 - .../jackson/geojson/collection/Feature.java | 5 - .../geojson/collection/FeatureCollection.java | 5 - .../collection/GeometryCollection.java | 5 - .../deserializer/GeoJsonDeserializer.java | 5 - .../IgnoreJsonTypeInfoIntrospector.java | 5 - .../BaseIgnoreDeserializerObjectMapper.java | 5 - .../FeatureCollectionGeoJsonParser.java | 5 - .../geojson/parser/FeatureGeoJsonParser.java | 5 - .../geojson/parser/GeoJsonBaseParser.java | 5 - .../GeometryCollectionGeoJsonParser.java | 5 - .../type/GeometryCollectionJavaType.java | 1 - .../uno/gis/local/type/GeometryJavaType.java | 1 - .../gis/local/type/LineStringJavaType.java | 1 - .../gis/local/type/LinearRingJavaType.java | 1 - .../local/type/MultiLineStringJavaType.java | 1 - .../gis/local/type/MultiPointJavaType.java | 1 - .../gis/local/type/MultiPolygonJavaType.java | 1 - .../uno/gis/local/type/PointJavaType.java | 1 - .../uno/gis/local/type/PolygonJavaType.java | 1 - .../uno/gis/mybatis/MybatisTransform.java | 1 - .../type/AbstractGeometryTypeHandler.java | 4 +- .../uno/gis/transform/AnnoTransform.java | 1 - .../allio/uno/gis/transform/CrsTransform.java | 1 - .../gis/transform/CrsTransformBuilder.java | 1 - .../cc/allio/uno/gis/transform/FromTo.java | 3 +- .../uno/gis/transform/JTSCrsTransform.java | 1 - .../cc/allio/uno/gis/transform/ReadWrite.java | 1 - .../gis/transform/ReadWriteCrsTransform.java | 1 - .../gis/transform/ReadableCrsTransform.java | 1 - .../gis/transform/WritableCrsTransform.java | 1 - .../cc/allio/uno/gis/jackson/JacksonTest.java | 6 - uno-http/pom.xml | 12 +- .../uno/http/metadata/BaseHttpRequest.java | 3 +- .../http/metadata/ClientResponseWrapper.java | 9 +- .../DefaultHttpConfigurationMetadata.java | 3 +- .../uno/http/metadata/DeleteHttpRequest.java | 3 +- .../uno/http/metadata/GetHttpRequest.java | 3 +- .../uno/http/metadata/HeadHttpRequest.java | 3 +- .../metadata/HttpConfigurationMetadata.java | 3 +- .../allio/uno/http/metadata/HttpHeader.java | 3 +- .../uno/http/metadata/HttpHeaderMetadata.java | 1 - .../allio/uno/http/metadata/HttpMetadata.java | 3 +- .../http/metadata/HttpRequestMetadata.java | 3 +- .../metadata/HttpRequestMetadataFactory.java | 3 +- .../http/metadata/HttpResponseAdapter.java | 1 - .../http/metadata/HttpResponseMetadata.java | 3 +- .../allio/uno/http/metadata/HttpSwapper.java | 3 +- .../uno/http/metadata/OptionsHttpRequest.java | 3 +- .../cc/allio/uno/http/metadata/Parameter.java | 1 - .../uno/http/metadata/PatchHttpRequest.java | 3 +- .../uno/http/metadata/PostHttpRequest.java | 3 +- .../uno/http/metadata/PutHttpRequest.java | 3 +- .../uno/http/metadata/TraceHttpRequest.java | 3 +- .../body/FormDataHttpRequestBody.java | 1 - .../body/FormUrlencodedHttpRequestBody.java | 1 - .../http/metadata/body/HttpRequestBody.java | 1 - .../body/HttpRequestBodyRegistry.java | 1 - .../metadata/body/JsonHttpRequestBody.java | 1 - .../metadata/exception/SwapperException.java | 1 - .../interceptor/DefaultHttpChainContext.java | 1 - .../interceptor/DefaultTokenManager.java | 1 - .../interceptor/ExchangeInterceptor.java | 3 +- .../interceptor/HttpChainContext.java | 1 - .../metadata/interceptor/Interceptor.java | 1 - .../interceptor/TokenInterceptor.java | 1 - .../metadata/interceptor/TokenManager.java | 1 - .../metadata/interceptor/TokenRequest.java | 1 - .../interceptor/TokenRequestBuilder.java | 1 - .../http/openapi/AbstractPrimaryParser.java | 3 +- .../http/openapi/DefaultParserContext.java | 3 +- .../uno/http/openapi/HttpRequestAssembly.java | 3 +- .../uno/http/openapi/OpenApiConverter.java | 3 +- .../openapi/OpenApiSpecificationParser.java | 3 +- .../uno/http/openapi/OpenApiV3Assembly.java | 3 +- .../cc/allio/uno/http/openapi/Parser.java | 3 +- .../allio/uno/http/openapi/ParserContext.java | 3 +- .../uno/http/openapi/ParserExecution.java | 3 +- .../uno/http/openapi/v3/OpenApiParser.java | 3 +- .../uno/http/openapi/v3/SchemaParser.java | 3 +- .../openapi/v3/SecuritySchemeInParser.java | 3 +- .../openapi/v3/SecuritySchemeTypeParser.java | 3 +- .../uno/http/openapi/v3/StyleEnumParser.java | 3 +- .../uno/http/api/OpenApiV3AssemblyTest.java | 3 +- .../uno/http/metadata/HttpSwapperTest.java | 3 +- .../allio/uno/http/metadata/HttpTestCase.java | 1 - .../interceptor/ExchangeInterceptorTest.java | 1 - .../interceptor/TokenInterceptorTest.java | 1 - .../uno/http/openapi/OpenApi3ParserTest.java | 3 +- .../uno/http/openapi/ParserExecutionTest.java | 3 +- uno-kafka/pom.xml | 10 +- .../allio/uno/kafka/UnoKafkaManagement.java | 1 - .../allio/uno/kafka/UnoKafkaProperties.java | 1 - .../cc/allio/uno/kafka/UnoKafkaReceiver.java | 1 - .../cc/allio/uno/kafka/UnoKafkaSender.java | 1 - .../allio/uno/kafka/endpoint/KafkaSource.java | 1 - .../kafka/endpoint/ReactiveKafkaSource.java | 1 - uno-netty/pom.xml | 10 +- .../cc/allio/uno/netty/AbstractInvoker.java | 3 +- .../allio/uno/netty/AbstractNettyService.java | 3 +- .../java/cc/allio/uno/netty/ChannelGroup.java | 3 +- .../java/cc/allio/uno/netty/Connector.java | 3 +- .../main/java/cc/allio/uno/netty/Invoker.java | 3 +- .../uno/netty/NettyAbstractConnector.java | 3 +- .../java/cc/allio/uno/netty/NettyClient.java | 3 +- .../java/cc/allio/uno/netty/NettyServer.java | 5 +- .../cc/allio/uno/netty/NonAckScanner.java | 2 +- .../java/cc/allio/uno/netty/Protocol.java | 2 +- .../cc/allio/uno/netty/RemoteService.java | 3 +- .../concurrent/AbstractInvokeFuture.java | 2 +- .../allio/uno/netty/concurrent/Callback.java | 3 +- .../uno/netty/concurrent/FutureListener.java | 3 +- .../uno/netty/concurrent/InvokeFuture.java | 3 +- .../netty/concurrent/InvokeFutureContext.java | 3 +- .../netty/concurrent/NamedThreadFactory.java | 3 +- .../uno/netty/config/NettyClientConfig.java | 3 +- .../uno/netty/config/NettyServerConfig.java | 3 +- .../cc/allio/uno/netty/event/BaseEvent.java | 3 +- .../uno/netty/event/ConnectionEvent.java | 3 +- .../java/cc/allio/uno/netty/event/Event.java | 1 - .../cc/allio/uno/netty/event/Observable.java | 3 +- .../cc/allio/uno/netty/event/Observer.java | 3 +- .../netty/exception/ConnectionException.java | 3 +- .../netty/exception/ExceptionTraceStack.java | 3 +- .../exception/InvokeFutureException.java | 3 +- .../uno/netty/exception/RemoteException.java | 3 +- .../netty/exception/RemoteSendException.java | 3 +- .../exception/RemoteTimeoutException.java | 3 +- .../uno/netty/filter/AbstractFilter.java | 3 +- .../uno/netty/filter/DefaultFilterChain.java | 3 +- .../cc/allio/uno/netty/filter/Filter.java | 3 +- .../allio/uno/netty/filter/FilterChain.java | 3 +- .../uno/netty/filter/FilterChainLoader.java | 3 +- .../allio/uno/netty/filter/FilterContext.java | 3 +- .../netty/filter/ProcessRequestFilter.java | 3 +- .../netty/filter/ProcessResponseFilter.java | 3 +- .../uno/netty/handler/ClientIdleTrigger.java | 2 +- .../uno/netty/handler/ConnectorWatchDog.java | 3 +- .../uno/netty/handler/ServerIdleTrigger.java | 3 +- .../uno/netty/metadata/RegisterMetadata.java | 3 +- .../uno/netty/metadata/ServiceMetadata.java | 3 +- .../java/cc/allio/uno/netty/model/Byte.java | 3 +- .../cc/allio/uno/netty/model/HeartBeats.java | 2 +- .../allio/uno/netty/model/MessageNonAck.java | 3 +- .../allio/uno/netty/model/RemotePromisor.java | 3 +- .../uno/netty/processor/NettyProcessor.java | 3 +- .../uno/netty/processor/NettyProcessors.java | 3 +- .../uno/netty/transport/RemoteAddress.java | 3 +- .../netty/transport/UnresolvedAddress.java | 3 +- .../netty/transport/body/AbstractBody.java | 3 +- .../netty/transport/body/AcknowledgeBody.java | 3 +- .../allio/uno/netty/transport/body/Body.java | 3 +- .../uno/netty/transport/body/FailBody.java | 3 +- .../uno/netty/transport/body/MonitorBody.java | 3 +- .../uno/netty/transport/body/OfflineBody.java | 3 +- .../uno/netty/transport/body/PublishBody.java | 3 +- .../netty/transport/body/RegisterBody.java | 5 +- .../uno/netty/transport/body/RequestBody.java | 3 +- .../netty/transport/body/ResponseBody.java | 3 +- .../netty/transport/body/SubscribeBody.java | 5 +- uno-plugins/README.md | 12 - ...44\273\266\346\236\266\346\236\204.drawio" | 1 - ...6\350\256\241\346\226\271\346\241\210.pdf" | Bin 252094 -> 0 bytes .../doc/images/image-20211210175645297.png | Bin 64323 -> 0 bytes uno-plugins/pom.xml | 19 - uno-plugins/uno-plugins-manager/pom.xml | 15 - uno-plugins/uno-plugins-platform/pom.xml | 15 - uno-rule/pom.xml | 12 +- .../cc/allio/uno/rule/RuleEngineFactory.java | 1 - .../java/cc/allio/uno/rule/api/Action.java | 1 - .../allio/uno/rule/api/DefaultRuleResult.java | 1 - .../uno/rule/api/EventBusRuleEngine.java | 1 - .../main/java/cc/allio/uno/rule/api/Fact.java | 1 - .../java/cc/allio/uno/rule/api/FactImpl.java | 1 - .../cc/allio/uno/rule/api/LogicPredicate.java | 1 - .../cc/allio/uno/rule/api/MatchIndex.java | 1 - .../main/java/cc/allio/uno/rule/api/OP.java | 1 - .../main/java/cc/allio/uno/rule/api/Rule.java | 1 - .../java/cc/allio/uno/rule/api/RuleAttr.java | 1 - .../allio/uno/rule/api/RuleAttrBuilder.java | 1 - .../uno/rule/api/RuleAttrBuilderImpl.java | 1 - .../cc/allio/uno/rule/api/RuleAttrImpl.java | 1 - .../cc/allio/uno/rule/api/RuleBuilder.java | 1 - .../allio/uno/rule/api/RuleBuilderImpl.java | 1 - .../cc/allio/uno/rule/api/RuleEngine.java | 1 - .../java/cc/allio/uno/rule/api/RuleImpl.java | 1 - .../cc/allio/uno/rule/api/RuleResult.java | 1 - .../allio/uno/rule/api/event/BaseEvent.java | 1 - .../allio/uno/rule/api/event/ErrorEvent.java | 1 - .../allio/uno/rule/api/event/EventAction.java | 1 - .../allio/uno/rule/api/event/FireEvent.java | 1 - .../cc/allio/uno/rule/api/event/Listener.java | 1 - .../allio/uno/rule/api/event/MatchEvent.java | 1 - .../uno/rule/api/event/NoMatchEvent.java | 1 - .../allio/uno/rule/api/event/RuleContext.java | 1 - .../uno/rule/api/vistor/AttrElement.java | 1 - .../uno/rule/api/vistor/CompilationRule.java | 1 - .../api/vistor/DefaultCompilationRule.java | 1 - .../uno/rule/api/vistor/GroupElement.java | 1 - .../uno/rule/api/vistor/LiteralElement.java | 1 - .../allio/uno/rule/api/vistor/LogicGroup.java | 1 - .../allio/uno/rule/config/RuleProperties.java | 1 - .../uno/rule/drools/DroolsRuleDescr.java | 1 - .../uno/rule/drools/DroolsRuleEngine.java | 3 +- .../uno/rule/drools/DroolsRuleManager.java | 1 - .../uno/rule/easyrules/EasyRulesEngine.java | 1 - .../rule/exception/RuleBuilderException.java | 1 - .../exception/RuleResultRuntimeException.java | 1 - .../exception/RuleResultTimeoutException.java | 1 - uno-sequential/pom.xml | 14 +- .../sequnetial/BaseCompositeSequential.java | 1 - .../uno/sequnetial/CompositeSequential.java | 1 - .../cc/allio/uno/sequnetial/Sequential.java | 3 +- .../sequnetial/SubscriptionProperties.java | 1 - .../SubscriptionPropertiesTypeManager.java | 1 - .../sequnetial/bus/SequentialEventBus.java | 3 +- .../allio/uno/sequnetial/compute/Compute.java | 1 - .../sequnetial/compute/ComputedManager.java | 1 - .../context/DefaultSequentialContext.java | 3 +- .../sequnetial/context/SequentialContext.java | 2 - .../dispatch/DispatchDispatcher.java | 1 - .../dispatch/DispatchSourceCollector.java | 1 - .../uno/sequnetial/dispatch/Dispatcher.java | 3 +- .../exception/ProcessHandlerException.java | 1 - .../process/DefaultProcessPipeline.java | 3 +- .../sequnetial/process/DefaultProcessor.java | 3 +- .../sequnetial/process/ProcessPipeline.java | 3 +- .../uno/sequnetial/process/Processor.java | 3 +- .../handle/AbstractProcessHandler.java | 3 +- .../process/handle/AppendProcessHandler.java | 1 - .../process/handle/ProcessHandler.java | 3 +- .../process/handle/ProcessHandlerChain.java | 3 +- .../uno/sequnetial/transform/Transducer.java | 1 - .../transform/TransformBuilder.java | 1 - .../uno/sequnetial/washer/DefaultWasher.java | 1 - .../uno/sequnetial/washer/FilterWasher.java | 1 - .../washer/MandatoryTypeWasher.java | 1 - .../uno/sequnetial/washer/WashMachine.java | 1 - .../allio/uno/sequnetial/washer/Washer.java | 1 - .../sequnetial/washer/WasherAssembler.java | 1 - .../allio/uno/sequential/TypeSequential.java | 1 - .../bus/SequentialEventBusTest.java | 1 - .../sequential/wash/DefaultWasherTest.java | 1 - .../sequential/wash/WasherAssemblerTest.java | 1 - uno-starters/pom.xml | 10 +- uno-starters/uno-starter-core/pom.xml | 8 +- .../core/UnoCoreAutoConfiguration.java | 1 - uno-starters/uno-starter-kafka/pom.xml | 8 +- .../kafka/UnoKafkaAutoConfiguration.java | 1 - uno-starters/uno-starter-sequential/pom.xml | 8 +- uno-starters/uno-starter-websocket/pom.xml | 10 +- .../websocket/WebSocketAutoConfiguration.java | 1 - uno-test/pom.xml | 10 +- .../cc/allio/uno/test/BaseSpringTest.java | 3 +- .../java/cc/allio/uno/test/BaseTestCase.java | 1 - .../java/cc/allio/uno/test/BenchmarkTest.java | 3 +- .../main/java/cc/allio/uno/test/CoreTest.java | 1 - .../cc/allio/uno/test/ExecutableCoreTest.java | 1 - .../main/java/cc/allio/uno/test/Inject.java | 1 - .../java/cc/allio/uno/test/Parameter.java | 1 - .../allio/uno/test/PrintTimingListener.java | 1 - .../main/java/cc/allio/uno/test/RunTest.java | 1 - .../cc/allio/uno/test/RunTestAttributes.java | 1 - .../cc/allio/uno/test/TestComponentScan.java | 1 - .../allio/uno/test/TestComponentScanner.java | 1 - .../java/cc/allio/uno/test/TestContext.java | 1 - .../java/cc/allio/uno/test/TestManager.java | 1 - .../java/cc/allio/uno/test/UnoExtension.java | 1 - .../uno/test/env/DataSourceEnvironment.java | 1 - .../test/env/ElasticSearchEnvironment.java | 1 - .../allio/uno/test/env/EmptyEnvironment.java | 1 - .../cc/allio/uno/test/env/Environment.java | 1 - .../allio/uno/test/env/EnvironmentFacade.java | 1 - .../cc/allio/uno/test/env/JpaEnvironment.java | 1 - .../uno/test/env/MybatisEnvironment.java | 1 - .../uno/test/env/MybatisPlusEnvironment.java | 1 - .../allio/uno/test/env/PropertiesVisitor.java | 1 - .../allio/uno/test/env/RedisEnvironment.java | 1 - .../uno/test/env/ServletWebEnvironment.java | 1 - .../uno/test/env/TransactionEnvironment.java | 1 - .../java/cc/allio/uno/test/env/Visitor.java | 1 - .../uno/test/env/VisitorEnvironment.java | 1 - .../test/env/annotation/AnnoConfigure.java | 1 - .../test/env/annotation/DynamicConfigure.java | 1 - .../cc/allio/uno/test/env/annotation/Env.java | 1 - .../uno/test/env/annotation/EnvConfigure.java | 1 - .../uno/test/env/annotation/Extractor.java | 1 - .../annotation/ImportAutoConfiguration.java | 1 - .../env/annotation/ImportAutoConfigure.java | 1 - .../test/env/annotation/MybatisConfigure.java | 3 +- .../uno/test/env/annotation/MybatisEnv.java | 1 - .../env/annotation/MybatisPlusConfigure.java | 3 +- .../test/env/annotation/MybatisPlusEnv.java | 1 - .../uno/test/env/annotation/RedisEnv.java | 1 - .../env/annotation/ServletWebConfigure.java | 1 - .../test/env/annotation/ServletWebEnv.java | 1 - .../properties/AnnoPropertiesParser.java | 1 - .../properties/DataSourceProperties.java | 1 - .../DefaultAnnoPropertiesParser.java | 1 - .../annotation/properties/EsProperties.java | 1 - .../LettuceClusterRefreshProperties.java | 1 - .../properties/LettucePoolProperties.java | 1 - .../LoadBalancerRetryProperties.java | 1 - .../properties/MybatisPlusProperties.java | 1 - .../properties/MybatisProperties.java | 2 - .../env/annotation/properties/Properties.java | 1 - .../annotation/properties/PropertiesName.java | 1 - .../annotation/properties/PropertiesType.java | 1 - .../properties/RedisClusterProperties.java | 1 - .../properties/RedisLettuceProperties.java | 1 - .../properties/RedisProperties.java | 1 - .../properties/RedisSentinelProperties.java | 1 - .../properties/RibbonEagerLoadProperties.java | 1 - .../ServerIntrospectorProperties.java | 1 - .../properties/ServerProperties.java | 1 - .../properties/TransactionProperties.java | 1 - .../uno/test/listener/CoreTestListener.java | 1 - .../cc/allio/uno/test/listener/Listener.java | 1 - .../allio/uno/test/listener/WebListener.java | 1 - .../cc/allio/uno/test/mock/BooleanMock.java | 3 +- .../cc/allio/uno/test/mock/DoubleMock.java | 3 +- .../cc/allio/uno/test/mock/IntegerMock.java | 3 +- .../java/cc/allio/uno/test/mock/LongMock.java | 3 +- .../java/cc/allio/uno/test/mock/Mock.java | 3 +- .../java/cc/allio/uno/test/mock/MockTest.java | 3 +- .../uno/test/runner/AnnoMetadataRunner.java | 1 - .../cc/allio/uno/test/runner/CloseRunner.java | 1 - .../cc/allio/uno/test/runner/CoreRunner.java | 1 - .../allio/uno/test/runner/InjectRunner.java | 1 - .../test/runner/RefreshCompleteRunner.java | 1 - .../allio/uno/test/runner/RegisterRunner.java | 1 - .../java/cc/allio/uno/test/runner/Runner.java | 1 - .../allio/uno/test/runner/RunnerCenter.java | 1 - .../cc/allio/uno/test/runner/Running.java | 1 - .../uno/test/testcontainers/Container.java | 1 - .../test/testcontainers/ContainerType.java | 1 - .../uno/test/testcontainers/LogPrelude.java | 1 - .../uno/test/testcontainers/Prelude.java | 1 - .../uno/test/testcontainers/RunContainer.java | 1 - .../test/testcontainers/SetupContainer.java | 1 - .../testcontainers/ShutdownContainer.java | 1 - .../allio/uno/test/ConfigDataLoaderTest.java | 1 - .../env/TestSpringEnvironmentFacadeTest.java | 1 - uno-web/pom.xml | 12 +- .../cc/allio/uno/web/source/HttpSource.java | 1 - .../uno/web/source/ReactiveHttpSource.java | 1 - .../allio/uno/web/source/WebHttpSource.java | 1 - .../reactive/WebHttpReactiveSource.java | 1 - uno-websocket/pom.xml | 10 +- .../allio/uno/websocket/Authentication.java | 1 - .../uno/websocket/BaseWebsocketEndpoint.java | 1 - .../websocket/ConnectionAuthenticator.java | 1 - .../uno/websocket/ConnectionContext.java | 1 - .../uno/websocket/EndpointAuthenticator.java | 1 - .../allio/uno/websocket/EndpointContext.java | 1 - .../cc/allio/uno/websocket/EndpointKey.java | 1 - .../allio/uno/websocket/EndpointManager.java | 1 - .../java/cc/allio/uno/websocket/Globe.java | 1 - .../uno/websocket/GlobeAuthenticator.java | 1 - .../MessagePublishAuthenticator.java | 1 - .../MessageReceiveAuthenticator.java | 1 - .../UnicastMessageAuthenticator.java | 1 - .../websocket/UnicastWebSocketEndpoint.java | 1 - .../uno/websocket/WebSocketEndpoint.java | 1 - 1019 files changed, 863 insertions(+), 1910 deletions(-) delete mode 100644 uno-ai/pom.xml create mode 100644 uno-core/src/main/java/cc/allio/uno/core/util/RandomUtil.java delete mode 100644 uno-demo/pom.xml delete mode 100644 uno-demo/uno-websocket-demo/pom.xml delete mode 100644 uno-demo/uno-websocket-demo/src/main/java/cc/allio/uno/websocket/demo/DemoWebSocketApplication.java delete mode 100644 uno-demo/uno-websocket-demo/src/main/java/cc/allio/uno/websocket/demo/DemoWebSocketEndpoint.java delete mode 100644 uno-plugins/README.md delete mode 100644 "uno-plugins/design/Uno\346\217\222\344\273\266\346\236\266\346\236\204.drawio" delete mode 100644 "uno-plugins/design/\351\235\236\344\276\265\345\205\245\345\274\217\346\217\222\344\273\266\350\256\276\350\256\241\346\226\271\346\241\210.pdf" delete mode 100644 uno-plugins/doc/images/image-20211210175645297.png delete mode 100644 uno-plugins/pom.xml delete mode 100644 uno-plugins/uno-plugins-manager/pom.xml delete mode 100644 uno-plugins/uno-plugins-platform/pom.xml diff --git a/pom.xml b/pom.xml index 2095f270..d350db4e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,14 +2,34 @@ - 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.0 + + - cc.allio - uno + cc.allio.uno + uno-parent pom - 1.1.9 - 构建大型应用需要的基本能力 --- all in one - https://github.com/ClearXs/uno + 1.2.0 + 4.0.0 + Utility for large applications (Systematic use of Spring) + ${official.url} + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + ${scm.connection} + ${scm.developerConnection} + ${scm.url} + ${scm.tag} + @@ -19,12 +39,9 @@ - uno-bom uno-core - uno-plugins uno-test uno-starters - uno-demo uno-auto uno-web uno-data @@ -35,38 +52,96 @@ uno-netty uno-sequential uno-websocket - uno-ai + https://github.com/ClearXs/uno + scm:git:https://github.com/ClearXs/uno.git + scm:git:ssh://github.com/ClearXs/uno.git + HEAD + https://github.com/ClearXs/uno + 21 9.44.0.Final - 2023.0.9 - 3.3.2 - 0.8.1-SNAPSHOT - 3.2.1 - 3.8.1 - 3.1.0 + 2024.0.0 + 3.4.0 UTF-8 + 2.0.16 + 2.1.3 + 2.1.1 + + + 1.2.0 + + 1.5.9 + + 1.1.0 + + 1.12.2 + 3.3.0 + + 5.11.0 + 5.12.0 + + 0.4.6 + 33.0.0-jre + + 2.0.1 + + 2.2.17 + 3.0.4 + 3.5.9 + + 1.2.23 + 8.0.33 + 42.7.3 + 8.4.1.jre8 + 4.3.0 + + 32.0 + 3.8.0 + 2024.1.0 + + 8.12.2 + + 7.2.0 + + 5.1.3 + + 5.22.0 + + 3.34.1 + 2.5.0.Final + + + 0.6.0 + 3.6.3 + 3.3.0 + 3.2.4 + 3.13.0 + 3.1.0 org.projectlombok lombok - provided + compile org.slf4j slf4j-api + ${slf4j.version} jakarta.json jakarta.json-api + ${jakarta-json.version} jakarta.annotation jakarta.annotation-api + ${jakarta-annotation.version} @@ -79,13 +154,6 @@ pom import - - cc.allio - uno-bom - ${project.version} - pom - import - io.projectreactor reactor-bom @@ -101,12 +169,194 @@ import - org.springframework.ai - spring-ai-bom - ${spring-ai.version} + com.baomidou + mybatis-plus-bom + ${mybatis-plus-boot.version} pom import + + cc.allio.uno + uno-bom + ${uno.version} + pom + import + + + + com.google.guava + guava + ${guava.version} + + + + cglib + cglib + ${cglib.version} + + + + + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockito.version} + test + + + net.jodah + concurrentunit + ${concurrentunit.version} + test + + + + com.google.auto.service + auto-service + ${auto-service.version} + + + + io.protostuff + protostuff-core + ${protostuff.version} + + + io.protostuff + protostuff-runtime + ${protostuff.version} + + + + io.swagger.core.v3 + swagger-models + ${swagger-v3.version} + provided + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis-spring-boot.version} + provided + + + org.mybatis.spring.boot + mybatis-spring-boot-starter-test + ${mybatis-spring-boot.version} + test + + + + com.alibaba + druid + ${druid.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + provided + + + + mysql + mysql-connector-java + ${mysql-connector.version} + provided + + + + org.postgresql + postgresql + ${postgresql-connector.version} + provided + + + + com.microsoft.sqlserver + mssql-jdbc + ${sqlserver-connector.version} + provided + + + com.h2database + h2 + ${h2.version} + test + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${mybatis-plus-dynamic.version} + provided + + + org.geotools + gt-geojson + ${geotools.version} + + + org.geotools + gt-epsg-extension + ${geotools.version} + + + org.geotools + gt-epsg-wkt + ${geotools.version} + + + net.postgis + postgis-jdbc + ${postgis-jdbc.version} + + + com.influxdb + influxdb-client-java + ${influxdb-client.version} + + + org.gdal + gdal + ${gdal.version} + + + jakarta.json + jakarta.json-api + ${jakarta.version} + + + org.mongodb + mongodb-driver-sync + ${mongodb.version} + + + org.neo4j.driver + neo4j-java-driver + ${neo4j.version} + + + org.redisson + redisson + ${redisson.version} + + + org.mvel + mvel2 + ${mvel.version} + @@ -130,14 +380,28 @@ - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + + false + + true + true + + + + + + src/main/resources @@ -165,12 +429,24 @@ + - develop + release - + + + org.sonatype.central + central-publishing-maven-plugin + ${maven-central-publishing.version} + true + + central + true + + + org.apache.maven.plugins maven-source-plugin @@ -181,27 +457,45 @@ compile + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-java-doc.version} + + + attach-javadocs jar + + none + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpp-verson} + + + sign-artifacts + verify + + sign + + + - - - - rdc-releases - User Project Release - https://packages.aliyun.com/maven/repository/2300285-release-cAc7WJ/ - - - rdc-snapshots - User ProjectSNAPSHOTS - https://packages.aliyun.com/maven/repository/2300285-snapshot-JAW5GT/ - - diff --git a/uno-ai/pom.xml b/uno-ai/pom.xml deleted file mode 100644 index 29b264d9..00000000 --- a/uno-ai/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - 4.0.0 - - cc.allio - uno - 1.1.9 - - - uno-ai - Through the capabilities of Spring AI, one can delve into artificial intelligence and endow abilities. - - - 21 - 21 - UTF-8 - - - diff --git a/uno-auto/pom.xml b/uno-auto/pom.xml index afe309e9..f17ab40d 100644 --- a/uno-auto/pom.xml +++ b/uno-auto/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - uno - cc.allio - 1.1.9 + uno-parent + cc.allio.uno + 1.2.0 4.0.0 @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/uno-bom/pom.xml b/uno-bom/pom.xml index 1bca8a4c..d0b090fb 100644 --- a/uno-bom/pom.xml +++ b/uno-bom/pom.xml @@ -2,398 +2,257 @@ - - org.springframework.boot - spring-boot-starter-parent - 3.3.2 - - - 4.0.0 - cc.allio + cc.allio.uno uno-bom - 1.1.9 pom + 1.2.0 + Bill of material of uno + 4.0.0 + ${official.url} + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + ${scm.connection} + ${scm.developerConnection} + ${scm.url} + ${scm.tag} + + + + + j.x + jiangw1027@gmail.com + + - - 1.1.9 - - 1.5.9 - - 1.1.0 - - 1.12.2 - 3.3.0 - 1.18.22 - - 5.11.0 - 5.12.0 - - 0.4.6 - 33.0.0-jre - - 4.0.0 - - 2.0.1 - - 2.2.17 - 3.0.3 - 3.5.5 - - 1.2.23 - 8.0.33 - 42.7.3 - 8.4.1.jre8 - 4.3.0 - - 30.2 - 3.8.0 - 2.5.1 - - 8.12.2 - - 7.2.0 - - 5.1.3 - - 5.22.0 - - 3.34.1 - 2.5.0.Final + https://github.com/ClearXs/uno + scm:git:https://github.com/ClearXs/uno.git + scm:git:ssh://github.com/ClearXs/uno.git + HEAD + https://github.com/ClearXs/uno + + 1.2.0 + 21 + 21 + UTF-8 + + + 0.6.0 + 3.6.3 + 3.3.0 + 3.2.4 + 3.13.0 + 3.1.0 - cc.allio + cc.allio.uno uno-core ${uno.version} - cc.allio + cc.allio.uno uno-auto ${uno.version} - cc.allio + cc.allio.uno uno-test ${uno.version} test - cc.allio + cc.allio.uno uno-http ${uno.version} - cc.allio + cc.allio.uno uno-websocket ${uno.version} - cc.allio + cc.allio.uno uno-sequential ${uno.version} - cc.allio + cc.allio.uno uno-kafka ${uno.version} - cc.allio + cc.allio.uno uno-netty ${uno.version} - cc.allio + cc.allio.uno uno-starter-core ${uno.version} - cc.allio + cc.allio.uno uno-starter-kafka ${uno.version} - cc.allio + cc.allio.uno uno-starter-websocket ${uno.version} - cc.allio + cc.allio.uno uno-starter-sequential ${uno.version} - cc.allio + cc.allio.uno uno-data ${uno.version} - cc.allio + cc.allio.uno uno-data-test ${uno.version} - cc.allio + cc.allio.uno uno-data-api ${uno.version} - cc.allio + cc.allio.uno uno-data-db ${uno.version} - cc.allio + cc.allio.uno uno-data-elasticsearch ${uno.version} - cc.allio + cc.allio.uno uno-data-influxdb ${uno.version} - cc.allio + cc.allio.uno uno-data-mongodb ${uno.version} - cc.allio + cc.allio.uno uno-data-neo4j ${uno.version} - cc.allio + cc.allio.uno uno-data-redis ${uno.version} - cc.allio + cc.allio.uno uno-data-sql ${uno.version} - cc.allio + cc.allio.uno uno-web ${uno.version} - cc.allio + cc.allio.uno uno-gis ${uno.version} - cc.allio + cc.allio.uno uno-rule ${uno.version} - - - com.google.guava - guava - ${guava.version} - - - org.springframework.statemachine - spring-statemachine-core - ${spring-statemachine.version} - - - - cglib - cglib - ${cglib.version} - - - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - test - - - net.jodah - concurrentunit - ${concurrentunit.version} - test - - - - com.google.auto.service - auto-service - ${auto-service.version} - - - - io.protostuff - protostuff-core - ${protostuff.version} - - - io.protostuff - protostuff-runtime - ${protostuff.version} - - - - io.swagger.core.v3 - swagger-models - ${swagger-v3.version} - provided - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis-spring-boot.version} - provided - - - org.mybatis.spring.boot - mybatis-spring-boot-starter-test - ${mybatis-spring-boot.version} - test - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus-boot.version} - provided - - - - - com.alibaba - druid - ${druid.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - provided - - - - mysql - mysql-connector-java - ${mysql-connector.version} - provided - - - - org.postgresql - postgresql - ${postgresql-connector.version} - provided - - - - com.microsoft.sqlserver - mssql-jdbc - ${sqlserver-connector.version} - provided - - - com.h2database - h2 - ${h2.version} - test - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${mybatis-plus-dynamic.version} - provided - - - org.geotools - gt-geojson - ${geotools.version} - - - org.geotools - gt-epsg-extension - ${geotools.version} - - - org.geotools - gt-epsg-wkt - ${geotools.version} - - - net.postgis - postgis-jdbc - ${postgis-jdbc.version} - - - com.influxdb - influxdb-client-java - ${influxdb-client.version} - - - org.gdal - gdal - ${gdal.version} - - - jakarta.json - jakarta.json-api - ${jakarta.version} - - - org.mongodb - mongodb-driver-sync - ${mongodb.version} - - - org.neo4j.driver - neo4j-java-driver - ${neo4j.version} - - - org.redisson - redisson - ${redisson.version} - - - org.mvel - mvel2 - ${mvel.version} - - - - rdc-releases - User Project Release - https://packages.aliyun.com/maven/repository/2300285-release-cAc7WJ/ - - - rdc-snapshots - User ProjectSNAPSHOTS - https://packages.aliyun.com/maven/repository/2300285-snapshot-JAW5GT/ - - + + + release + + + + + org.sonatype.central + central-publishing-maven-plugin + ${maven-central-publishing.version} + true + + central + true + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + true + + + + compile + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-java-doc.version} + + + attach-javadocs + + jar + + + + + none + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpp-verson} + + + sign-artifacts + verify + + sign + + + + + + + + diff --git a/uno-core/pom.xml b/uno-core/pom.xml index 1a230d01..87f769ed 100644 --- a/uno-core/pom.xml +++ b/uno-core/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - uno - cc.allio - 1.1.9 + uno-parent + cc.allio.uno + 1.2.0 4.0.0 @@ -39,10 +39,6 @@ org.aspectj aspectjweaver - - org.projectlombok - lombok - org.apache.commons commons-lang3 diff --git a/uno-core/src/main/java/cc/allio/uno/core/StringPool.java b/uno-core/src/main/java/cc/allio/uno/core/StringPool.java index 7ddae6be..027903d4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/StringPool.java +++ b/uno-core/src/main/java/cc/allio/uno/core/StringPool.java @@ -3,8 +3,7 @@ /** * 一些常用的字符串 * - * @author jiangw - * @date 2020/12/7 20:58 + * @author j.x * @since 1.0 */ public interface StringPool { diff --git a/uno-core/src/main/java/cc/allio/uno/core/annotation/AnnotatedCreator.java b/uno-core/src/main/java/cc/allio/uno/core/annotation/AnnotatedCreator.java index 5465c4bc..afe587af 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/annotation/AnnotatedCreator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/annotation/AnnotatedCreator.java @@ -13,7 +13,6 @@ * {@link Annotated}生成器 * * @author j.x - * @date 2022/12/9 15:47 * @since 1.1.2 */ public interface AnnotatedCreator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/annotation/BeanAnnotated.java b/uno-core/src/main/java/cc/allio/uno/core/annotation/BeanAnnotated.java index ea952aa3..da0cf0f3 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/annotation/BeanAnnotated.java +++ b/uno-core/src/main/java/cc/allio/uno/core/annotation/BeanAnnotated.java @@ -24,7 +24,6 @@ * 从给定的annotationClasses获取{@link Annotated}实体 * * @author j.x - * @date 2022/12/9 15:34 * @since 1.1.2 */ public class BeanAnnotated implements AnnotatedCreator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/api/Adapter.java b/uno-core/src/main/java/cc/allio/uno/core/api/Adapter.java index 38fcc79d..4458879f 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/api/Adapter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/api/Adapter.java @@ -4,7 +4,6 @@ * 通用适配器定义 * * @author j.x - * @date 2024/1/9 16:04 * @since 1.1.7 */ public interface Adapter { diff --git a/uno-core/src/main/java/cc/allio/uno/core/api/EqualsTo.java b/uno-core/src/main/java/cc/allio/uno/core/api/EqualsTo.java index 2fff871e..bc5df2d2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/api/EqualsTo.java +++ b/uno-core/src/main/java/cc/allio/uno/core/api/EqualsTo.java @@ -8,7 +8,6 @@ *

另外一个目的是提供显示的接口来实现{@code equals}方法，避免在调试环节不知道为何两个对象相等。

* * @author j.x - * @date 2024/2/16 20:17 * @since 1.1.7 */ public interface EqualsTo { diff --git a/uno-core/src/main/java/cc/allio/uno/core/api/Key.java b/uno-core/src/main/java/cc/allio/uno/core/api/Key.java index ecc5e23b..3f6720e2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/api/Key.java +++ b/uno-core/src/main/java/cc/allio/uno/core/api/Key.java @@ -4,7 +4,6 @@ * 定义关键字接口 * * @author j.x - * @date 2023/4/19 11:09 * @since 1.1.4 */ public interface Key { diff --git a/uno-core/src/main/java/cc/allio/uno/core/api/OptionalContext.java b/uno-core/src/main/java/cc/allio/uno/core/api/OptionalContext.java index 1da8f619..4420e39e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/api/OptionalContext.java +++ b/uno-core/src/main/java/cc/allio/uno/core/api/OptionalContext.java @@ -14,7 +14,6 @@ * 定义Uno上下文模版方法 * * @author j.x - * @date 2022/3/30 14:08 * @since 1.0.6 */ public interface OptionalContext { diff --git a/uno-core/src/main/java/cc/allio/uno/core/api/Self.java b/uno-core/src/main/java/cc/allio/uno/core/api/Self.java index 40000941..71bdadb1 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/api/Self.java +++ b/uno-core/src/main/java/cc/allio/uno/core/api/Self.java @@ -4,7 +4,6 @@ * 数据操作接口 * * @author j.x - * @date 2023/1/5 10:37 * @since 1.1.4 */ public interface Self> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/api/Single.java b/uno-core/src/main/java/cc/allio/uno/core/api/Single.java index cdc0fc0e..a766db98 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/api/Single.java +++ b/uno-core/src/main/java/cc/allio/uno/core/api/Single.java @@ -14,7 +14,6 @@ * description 'single' value transfer and filter. * * @author j.x - * @date 2024/7/6 17:57 * @since 0.1.1 * @see Stream */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/api/Step.java b/uno-core/src/main/java/cc/allio/uno/core/api/Step.java index 6636ee03..733b3d19 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/api/Step.java +++ b/uno-core/src/main/java/cc/allio/uno/core/api/Step.java @@ -9,7 +9,6 @@ * 执行步骤。步骤将会按照{@link #then(Supplier)}一步一步执行下去，直到获取的值不为null或者走完步骤。 * * @author j.x - * @date 2024/2/6 23:38 * @since 1.1.7 */ public interface Step { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bean/BeanInfoWrapper.java b/uno-core/src/main/java/cc/allio/uno/core/bean/BeanInfoWrapper.java index 45c1e4e7..5faab13a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bean/BeanInfoWrapper.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bean/BeanInfoWrapper.java @@ -31,7 +31,6 @@ * * * @author j.x - * @date 2021/12/17 0:05 * @since 1.0.0 */ @Getter diff --git a/uno-core/src/main/java/cc/allio/uno/core/bean/BeanWrapper.java b/uno-core/src/main/java/cc/allio/uno/core/bean/BeanWrapper.java index d9ee147b..37497d3a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bean/BeanWrapper.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bean/BeanWrapper.java @@ -17,7 +17,6 @@ * Object包装器，作用是反射设置获取该对象的字段值，并可以获取这个类中所有方法等 * * @author j.x - * @date 2022/5/21 10:17 * @since 1.0 */ public class BeanWrapper implements ValueWrapper { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bean/Empty.java b/uno-core/src/main/java/cc/allio/uno/core/bean/Empty.java index da1c9228..8fdd2594 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bean/Empty.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bean/Empty.java @@ -4,7 +4,6 @@ * 标识空对象 * * @author j.x - * @date 2024/1/9 18:56 * @since 1.1.7 */ public final class Empty { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bean/MapWrapper.java b/uno-core/src/main/java/cc/allio/uno/core/bean/MapWrapper.java index f2b01143..428fdbd4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bean/MapWrapper.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bean/MapWrapper.java @@ -15,7 +15,6 @@ * value = map的wrapper * * @author j.x - * @date 2023/4/17 18:43 * @since 1.1.4 */ public class MapWrapper implements ValueWrapper { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bean/ValueWrapper.java b/uno-core/src/main/java/cc/allio/uno/core/bean/ValueWrapper.java index 918d82d0..27413d8d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bean/ValueWrapper.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bean/ValueWrapper.java @@ -20,7 +20,6 @@ * 定义值 wrapper对象 * * @author j.x - * @date 2023/4/17 18:39 * @see BeanInfoWrapper 根据{@link BeanInfo}提取bean对象的属性进而实现值提取动作 * @see BeanWrapper 接收某个具体的对象（一般为pojo） * @see MapWrapper 基于{@link Map}实现 diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/AbstractTopic.java b/uno-core/src/main/java/cc/allio/uno/core/bus/AbstractTopic.java index f47f2dc3..2c6d3d38 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/AbstractTopic.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/AbstractTopic.java @@ -7,8 +7,7 @@ /** * 事件总线中某个消息主题，抽象某些公共的方法 * - * @author jw - * @date 2021/12/17 22:52 + * @author j.x */ public abstract class AbstractTopic implements Topic { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/BaseEventBus.java b/uno-core/src/main/java/cc/allio/uno/core/bus/BaseEventBus.java index 23b24f19..c511a007 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/BaseEventBus.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/BaseEventBus.java @@ -12,7 +12,6 @@ * 基础EventBus，使用{@link Topic}作为消息传递。实现{@link #subscribe(Subscription)}、{@link #unSubscribe(Long, String)} * * @author j.x - * @date 2022/12/12 16:03 * @since 1.1.2 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/ContextTopicEvent.java b/uno-core/src/main/java/cc/allio/uno/core/bus/ContextTopicEvent.java index a556d5d2..7e932c96 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/ContextTopicEvent.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/ContextTopicEvent.java @@ -6,7 +6,6 @@ * 上下文{@link EventContext}的抽象类 * * @author j.x - * @date 2023/4/28 14:01 * @since 1.1.4 */ public abstract class ContextTopicEvent implements TopicEvent { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/DefaultEventBus.java b/uno-core/src/main/java/cc/allio/uno/core/bus/DefaultEventBus.java index ef9a589c..5c6ac0db 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/DefaultEventBus.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/DefaultEventBus.java @@ -4,7 +4,6 @@ * 默认事件总线，消息上下文使用{@link DefaultEventContext} * * @author j.x - * @date 2022/12/12 16:07 * @since 1.1.3 */ public class DefaultEventBus extends BaseEventBus { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/DefaultEventContext.java b/uno-core/src/main/java/cc/allio/uno/core/bus/DefaultEventContext.java index a67cf5c8..0f1e8065 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/DefaultEventContext.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/DefaultEventContext.java @@ -13,7 +13,6 @@ * EventBus上下文对象 * * @author j.x - * @date 2022/12/12 16:27 * @since 1.1.2 */ public class DefaultEventContext implements EventContext { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/EventBus.java b/uno-core/src/main/java/cc/allio/uno/core/bus/EventBus.java index 589cd898..a3c2735d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/EventBus.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/EventBus.java @@ -13,7 +13,6 @@ * 事件总线，定义于不同组件之间进行通信，设计是基于Topic-Event，即主题事件。 * * @author j.x - * @date 2021/12/15 15:44 * @see BusEvent * @see DefaultEventBus */ @@ -292,4 +291,6 @@ default Flux> subThenPub(TopicEvent topicEvent) { * @return true 存在 false 不存在 */ Mono contains(String topic); + + // ================= static method ================= } diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/EventBusFactory.java b/uno-core/src/main/java/cc/allio/uno/core/bus/EventBusFactory.java index 477d209d..12ae929f 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/EventBusFactory.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/EventBusFactory.java @@ -4,7 +4,6 @@ * {@link EventBus}Factory。L * * @author j.x - * @date 2023/4/28 13:22 * @since 1.1.4 */ public class EventBusFactory { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/EventContext.java b/uno-core/src/main/java/cc/allio/uno/core/bus/EventContext.java index 16bdd891..3856ed59 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/EventContext.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/EventContext.java @@ -6,7 +6,6 @@ * 消息上下文 * * @author j.x - * @date 2022/12/14 09:17 * @since 1.1.2 */ public interface EventContext extends OptionalContext { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/EventRegistry.java b/uno-core/src/main/java/cc/allio/uno/core/bus/EventRegistry.java index 155cd913..b7676e0e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/EventRegistry.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/EventRegistry.java @@ -10,7 +10,6 @@ * 事件注册中心 * * @author j.x - * @date 2023/4/25 13:42 * @since 1.1.4 */ public class EventRegistry implements Map, TopicEvent> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/EventTracer.java b/uno-core/src/main/java/cc/allio/uno/core/bus/EventTracer.java index eaa27ed6..1673f3d3 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/EventTracer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/EventTracer.java @@ -8,7 +8,6 @@ * 基于事件总线的{@link TopicEvent}事件追踪器 * * @author j.x - * @date 2023/5/4 17:22 * @since 1.1.4 */ public class EventTracer { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/Notice.java b/uno-core/src/main/java/cc/allio/uno/core/bus/Notice.java index 913bbea7..7dd05e2e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/Notice.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/Notice.java @@ -10,7 +10,6 @@ * * @param 通知者通知泛型 * @author j.x - * @date 2021/12/19 12:41 PM * @since 1.0 */ public class Notice { @@ -39,7 +38,6 @@ public synchronized void releaseListener(Long listenerId) { * 当发布者向事件总线发布数据，某个Topic订阅该数据时，触发这个事件 * * @param supplier 事件总线传递的数据 - * @see Topic#exchange(C) */ public Mono notify(Supplier supplier) { return load(EmitEvent.class, supplier.get()); diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/NoticeTopic.java b/uno-core/src/main/java/cc/allio/uno/core/bus/NoticeTopic.java index 6b379f0f..939ea880 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/NoticeTopic.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/NoticeTopic.java @@ -12,7 +12,6 @@ * 基于事件通知机制实现的Topic * * @author j.x - * @date 2022/1/26 11:37 * @since 1.0 */ public class NoticeTopic extends AbstractTopic implements Comparable> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/Subscription.java b/uno-core/src/main/java/cc/allio/uno/core/bus/Subscription.java index 88a567d4..6b5f74a1 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/Subscription.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/Subscription.java @@ -16,8 +16,7 @@ /** * 订阅信息 * - * @author jw - * @date 2021/12/17 14:32 + * @author j.x */ @Data @AllArgsConstructor(staticName = "of") diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/Topic.java b/uno-core/src/main/java/cc/allio/uno/core/bus/Topic.java index ab197dff..1680c73a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/Topic.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/Topic.java @@ -17,8 +17,7 @@ /** * 消息主题，订阅者与数据源之间的联系，他是一个桥接器 * - * @author jw - * @date 2021/12/15 15:44 + * @author j.x */ public interface Topic { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/TopicEvent.java b/uno-core/src/main/java/cc/allio/uno/core/bus/TopicEvent.java index 65ea2a78..15f343e4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/TopicEvent.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/TopicEvent.java @@ -4,7 +4,6 @@ * 主题事件 * * @author j.x - * @date 2023/4/25 14:30 * @since 1.1.4 */ public interface TopicEvent { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/TopicKey.java b/uno-core/src/main/java/cc/allio/uno/core/bus/TopicKey.java index ee6482f7..d7aee886 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/TopicKey.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/TopicKey.java @@ -12,7 +12,6 @@ * topic key * * @author j.x - * @date 2023/4/25 13:31 * @since 1.1.4 */ public interface TopicKey { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/Topics.java b/uno-core/src/main/java/cc/allio/uno/core/bus/Topics.java index 2200fdfe..251bffa0 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/Topics.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/Topics.java @@ -11,8 +11,7 @@ /** * 消息主题 * - * @author jw - * @date 2021/12/16 10:50 + * @author j.x */ @Slf4j public final class Topics extends ConcurrentSkipListMap> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/AbstractEventNode.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/AbstractEventNode.java index 7c4a29d3..7167c12a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/AbstractEventNode.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/AbstractEventNode.java @@ -18,7 +18,6 @@ * 抽象的基于事件的主题Node * * @author j.x - * @date 2021/12/19 12:21 PM * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/BusEvent.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/BusEvent.java index b48eda3e..c9c61231 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/BusEvent.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/BusEvent.java @@ -4,7 +4,6 @@ * 总线主题事件标识接口，定义于在消息队列中发生的事件 * * @author j.x - * @date 2021/12/19 12:13 PM * @since 1.0 */ public interface BusEvent { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/Context.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/Context.java index 0f72e991..07043b5e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/Context.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/Context.java @@ -8,7 +8,6 @@ * 事件上下文 * * @author j.x - * @date 2022/8/5 09:11 * @since 1.0 */ @Data diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/EmitEvent.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/EmitEvent.java index 585c6643..c8127df7 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/EmitEvent.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/EmitEvent.java @@ -4,7 +4,6 @@ * 数据发出事件 * * @author j.x - * @date 2021/12/19 21:14 * @since 1.0 */ public interface EmitEvent extends BusEvent { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/EventNode.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/EventNode.java index 29a3ff92..5f0ad50e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/EventNode.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/EventNode.java @@ -11,19 +11,18 @@ /** * 主题中事件节点 * - * @author jw - * @date 2021/12/17 9:40 + * @author j.x */ @Slf4j public abstract class EventNode extends AbstractEventNode { /** - * 当前Node唯一订阅id，由{@link Subscription#getSubscribeId()}定义 + * 当前Node唯一订阅id */ protected final Long subscriberId; /** - * 当前Node订阅的Topic，由{@link Subscription#getPath()}定义 + * 当前Node订阅的Topic */ protected final String topic; diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/LiftEvent.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/LiftEvent.java index fc916615..d19bb8c7 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/LiftEvent.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/LiftEvent.java @@ -4,7 +4,6 @@ * 解除事件 * * @author j.x - * @date 2021/12/19 22:40 * @since 1.0 */ public interface LiftEvent extends BusEvent { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/Listener.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/Listener.java index c16a5313..f86845e4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/Listener.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/Listener.java @@ -8,7 +8,6 @@ * 监听事件 * * @author j.x - * @date 2021/12/19 12:27 PM * @since 1.0 */ public interface Listener { @@ -18,7 +17,6 @@ public interface Listener { * * @param event 监听的事件对象 * @param obj 监听参数 - * @throws Throwable 监听回调过程发生异常抛出 */ void listen(Node event, C obj) ; diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/Node.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/Node.java index c0e49744..f493dee7 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/Node.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/Node.java @@ -14,8 +14,7 @@ /** * 定义为事件总线上订阅的节点信息 * - * @author jw - * @date 2021/12/16 19:56 + * @author j.x */ public interface Node { diff --git a/uno-core/src/main/java/cc/allio/uno/core/bus/event/ReactiveEventNode.java b/uno-core/src/main/java/cc/allio/uno/core/bus/event/ReactiveEventNode.java index d474abbd..23e33bf3 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/bus/event/ReactiveEventNode.java +++ b/uno-core/src/main/java/cc/allio/uno/core/bus/event/ReactiveEventNode.java @@ -8,7 +8,6 @@ * 基于 reactive 事件处理 * * @author j.x - * @date 2023/5/19 13:24 * @since 1.1.4 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/cache/Cache.java b/uno-core/src/main/java/cc/allio/uno/core/cache/Cache.java index 93e6e1df..2f4e3535 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/cache/Cache.java +++ b/uno-core/src/main/java/cc/allio/uno/core/cache/Cache.java @@ -13,7 +13,6 @@ * 缓存 * * @author j.x - * @date 2022/1/5 00:55 * @see InMemoryCache * @see ConcurrentMemoryCache * @since 1.0 diff --git a/uno-core/src/main/java/cc/allio/uno/core/cache/CacheCallable.java b/uno-core/src/main/java/cc/allio/uno/core/cache/CacheCallable.java index 3577d155..ea99b76f 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/cache/CacheCallable.java +++ b/uno-core/src/main/java/cc/allio/uno/core/cache/CacheCallable.java @@ -6,7 +6,6 @@ * 缓存回调 * * @author j.x - * @date 2022/2/9 15:53 * @since 1.0 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/cache/CacheKey.java b/uno-core/src/main/java/cc/allio/uno/core/cache/CacheKey.java index 0832f2bd..e2753303 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/cache/CacheKey.java +++ b/uno-core/src/main/java/cc/allio/uno/core/cache/CacheKey.java @@ -7,7 +7,6 @@ * 缓存key对象 * * @author j.x - * @date 2022/2/10 17:04 * @since 1.0 */ @Data diff --git a/uno-core/src/main/java/cc/allio/uno/core/cache/ConcurrentMemoryCache.java b/uno-core/src/main/java/cc/allio/uno/core/cache/ConcurrentMemoryCache.java index 3a958260..15acffe2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/cache/ConcurrentMemoryCache.java +++ b/uno-core/src/main/java/cc/allio/uno/core/cache/ConcurrentMemoryCache.java @@ -12,7 +12,6 @@ * 需要放入的缓存实现{@link Object#equals(Object)} * * @author j.x - * @date 2022/2/9 15:15 * @since 1.0 */ public class ConcurrentMemoryCache implements Cache { diff --git a/uno-core/src/main/java/cc/allio/uno/core/cache/InMemoryCache.java b/uno-core/src/main/java/cc/allio/uno/core/cache/InMemoryCache.java index c5253989..dff73541 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/cache/InMemoryCache.java +++ b/uno-core/src/main/java/cc/allio/uno/core/cache/InMemoryCache.java @@ -10,7 +10,6 @@ * 基于内存的缓存 * * @author j.x - * @date 2022/2/9 14:25 * @since 1.0 */ public class InMemoryCache implements Cache { diff --git a/uno-core/src/main/java/cc/allio/uno/core/cache/InitializationCache.java b/uno-core/src/main/java/cc/allio/uno/core/cache/InitializationCache.java index 7d948cf2..91bfef6d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/cache/InitializationCache.java +++ b/uno-core/src/main/java/cc/allio/uno/core/cache/InitializationCache.java @@ -8,7 +8,6 @@ * 委托{@link Cache}进行初始化的回调 * * @author j.x - * @date 2022/2/9 15:51 * @see CacheCallable * @since 1.0 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/chain/Chain.java b/uno-core/src/main/java/cc/allio/uno/core/chain/Chain.java index 4befaccb..793a84d6 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/chain/Chain.java +++ b/uno-core/src/main/java/cc/allio/uno/core/chain/Chain.java @@ -10,7 +10,6 @@ * @param 进入链中元素的范型 * @param 出链元素的范型 * @author j.x - * @date 2022/8/22 18:47 * @since 1.0 */ public interface Chain { @@ -20,7 +19,6 @@ public interface Chain { * * @param context 入链元素 * @return 出链数据 - * @throws Throwable 链中发生异常时抛出 */ Mono proceed(ChainContext context); diff --git a/uno-core/src/main/java/cc/allio/uno/core/chain/ChainContext.java b/uno-core/src/main/java/cc/allio/uno/core/chain/ChainContext.java index 4857e770..084dbf5b 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/chain/ChainContext.java +++ b/uno-core/src/main/java/cc/allio/uno/core/chain/ChainContext.java @@ -8,7 +8,6 @@ * * @param 进入链中元素的范型 * @author j.x - * @date 2022/8/24 16:25 * @since 1.0 */ public interface ChainContext { diff --git a/uno-core/src/main/java/cc/allio/uno/core/chain/DefaultChain.java b/uno-core/src/main/java/cc/allio/uno/core/chain/DefaultChain.java index a6f2ceb5..19ddfd74 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/chain/DefaultChain.java +++ b/uno-core/src/main/java/cc/allio/uno/core/chain/DefaultChain.java @@ -10,7 +10,6 @@ * 默认实现链，参考自Spring构建网关过滤器链 * * @author j.x - * @date 2022/8/22 18:51 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/chain/Node.java b/uno-core/src/main/java/cc/allio/uno/core/chain/Node.java index 6843106b..6ee0a0fa 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/chain/Node.java +++ b/uno-core/src/main/java/cc/allio/uno/core/chain/Node.java @@ -18,7 +18,6 @@ * @param 进入链中元素的范型 * @param 出链元素的范型 * @author j.x - * @date 2022/8/22 18:46 * @see org.springframework.core.annotation.Order * @see jakarta.annotation.Priority * @see org.springframework.core.Ordered diff --git a/uno-core/src/main/java/cc/allio/uno/core/concurrent/LockContext.java b/uno-core/src/main/java/cc/allio/uno/core/concurrent/LockContext.java index b286b614..ea33150a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/concurrent/LockContext.java +++ b/uno-core/src/main/java/cc/allio/uno/core/concurrent/LockContext.java @@ -28,7 +28,6 @@ *

值得注意的是：{@link #thenApply(ThrowingMethodSupplier)}返回的值优先级是最高的

* * @author j.x - * @date 2024/2/6 20:17 * @since 1.1.7 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/concurrent/LockResult.java b/uno-core/src/main/java/cc/allio/uno/core/concurrent/LockResult.java index 3c6e794f..8afab63a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/concurrent/LockResult.java +++ b/uno-core/src/main/java/cc/allio/uno/core/concurrent/LockResult.java @@ -15,7 +15,6 @@ *

非常重要的是，如果通过{@link LockContext#release()}不是立即释放值的话，只有调用终止操作（即获取值的操作）才能获取值

* * @author j.x - * @date 2024/2/29 23:45 * @since 1.1.7 */ @Slf4j @@ -48,7 +47,6 @@ void init(LockContext lockContext) { * * @param acceptor acceptor * @return self - * @ */ public LockResult ok(ThrowingMethodBiConsumer acceptor) { tryReleaseValue(); diff --git a/uno-core/src/main/java/cc/allio/uno/core/concurrent/MultiCheckedException.java b/uno-core/src/main/java/cc/allio/uno/core/concurrent/MultiCheckedException.java index 306240f2..71716d64 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/concurrent/MultiCheckedException.java +++ b/uno-core/src/main/java/cc/allio/uno/core/concurrent/MultiCheckedException.java @@ -9,7 +9,6 @@ * 多受检查异常 * * @author j.x - * @date 2024/2/29 23:56 * @since 1.1.7 */ public class MultiCheckedException extends Exception { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/BreadthTraversalMode.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/BreadthTraversalMode.java index 24bd0d0b..26868759 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/BreadthTraversalMode.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/BreadthTraversalMode.java @@ -9,7 +9,6 @@ * 树广度优先 * * @author j.x - * @date 2023/4/27 09:17 * @since 1.1.4 */ public class BreadthTraversalMode implements TraversalMethod { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/ComparableElement.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/ComparableElement.java index 6ef80571..90b9aad4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/ComparableElement.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/ComparableElement.java @@ -7,7 +7,6 @@ * comparable tree element base on {@link Comparator} * * @author j.x - * @date 2023/4/11 22:21 * @since 1.1.4 */ public class ComparableElement> extends DefaultElement { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/DeepTraversalMode.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/DeepTraversalMode.java index ebb2a791..d0236e38 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/DeepTraversalMode.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/DeepTraversalMode.java @@ -10,7 +10,6 @@ * 深度优先 * * @author j.x - * @date 2023/4/27 09:16 * @since 1.1.4 */ public class DeepTraversalMode implements TraversalMethod { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/DefaultElement.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/DefaultElement.java index 6dec2072..22b60825 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/DefaultElement.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/DefaultElement.java @@ -11,7 +11,6 @@ * 默认树结点 * * @author j.x - * @date 2023/11/9 11:36 * @since 1.1.5 */ @Getter diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Element.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Element.java index 1e161eea..9ecd8e91 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Element.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Element.java @@ -9,7 +9,6 @@ * 抽象树结点定义 * * @author j.x - * @date 2023/4/26 11:31 * @since 1.1.4 */ public interface Element> extends Serializable { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Expand.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Expand.java index 703bf651..35c18e16 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Expand.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Expand.java @@ -6,7 +6,6 @@ * 树平展结点 * * @author j.x - * @date 2023/11/9 11:32 * @since 1.1.5 */ public interface Expand extends Serializable { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/NoneTraversalMode.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/NoneTraversalMode.java index 158d54e3..68c45a4b 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/NoneTraversalMode.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/NoneTraversalMode.java @@ -4,7 +4,6 @@ * 优先访问枝干 * * @author j.x - * @date 2023/4/27 09:13 * @since 1.1.4 */ public class NoneTraversalMode implements TraversalMethod { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TraversalElement.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TraversalElement.java index 850afcdb..ff0ba905 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TraversalElement.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TraversalElement.java @@ -4,7 +4,6 @@ * 遍历元素原则实现.{@link Traversal} * * @author j.x - * @date 2023/4/26 15:18 * @since 1.1.4 */ public abstract class TraversalElement> implements Element { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TraversalMethod.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TraversalMethod.java index e050e7da..30010ffd 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TraversalMethod.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TraversalMethod.java @@ -6,7 +6,6 @@ * 定义树遍历模式 * * @author j.x - * @date 2023/4/27 09:12 * @since 1.1.4 */ public interface TraversalMethod { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TreeSupport.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TreeSupport.java index d7ceddc6..879c4105 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TreeSupport.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/TreeSupport.java @@ -15,7 +15,6 @@ * 提供树相关操作 * * @author j.x - * @date 2023/11/9 11:34 * @since 1.1.5 */ public final class TreeSupport { diff --git a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Visitor.java b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Visitor.java index 3d0a4947..92b24853 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Visitor.java +++ b/uno-core/src/main/java/cc/allio/uno/core/datastructure/tree/Visitor.java @@ -4,7 +4,6 @@ * 树节点访问器 * * @author j.x - * @date 2023/4/26 11:58 * @since 1.1.4 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/env/Env.java b/uno-core/src/main/java/cc/allio/uno/core/env/Env.java index ad536089..36d1b06d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/env/Env.java +++ b/uno-core/src/main/java/cc/allio/uno/core/env/Env.java @@ -11,7 +11,6 @@ * * * @author j.x - * @date 2023/4/27 13:59 * @since 1.1.4 */ public interface Env { diff --git a/uno-core/src/main/java/cc/allio/uno/core/env/Envs.java b/uno-core/src/main/java/cc/allio/uno/core/env/Envs.java index 75c71ec2..c14623ce 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/env/Envs.java +++ b/uno-core/src/main/java/cc/allio/uno/core/env/Envs.java @@ -6,7 +6,6 @@ * 环境工具类 * * @author j.x - * @date 2023/4/27 14:39 * @since 1.1.4 */ public class Envs { diff --git a/uno-core/src/main/java/cc/allio/uno/core/env/SpringEnv.java b/uno-core/src/main/java/cc/allio/uno/core/env/SpringEnv.java index d7bfeba2..b1ff3d24 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/env/SpringEnv.java +++ b/uno-core/src/main/java/cc/allio/uno/core/env/SpringEnv.java @@ -8,7 +8,6 @@ * 基于Spring{@link Environment}的Env * * @author j.x - * @date 2023/4/27 14:10 * @since 1.1.4 */ public class SpringEnv implements Env { diff --git a/uno-core/src/main/java/cc/allio/uno/core/env/SystemEnv.java b/uno-core/src/main/java/cc/allio/uno/core/env/SystemEnv.java index d85ac518..ba0b6d53 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/env/SystemEnv.java +++ b/uno-core/src/main/java/cc/allio/uno/core/env/SystemEnv.java @@ -10,7 +10,6 @@ * 基于本地系统默认实现 * * @author j.x - * @date 2023/4/27 14:02 * @since 1.1.4 */ public class SystemEnv implements Env { diff --git a/uno-core/src/main/java/cc/allio/uno/core/exception/CaptureException.java b/uno-core/src/main/java/cc/allio/uno/core/exception/CaptureException.java index afa426a9..b8226804 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/exception/CaptureException.java +++ b/uno-core/src/main/java/cc/allio/uno/core/exception/CaptureException.java @@ -4,7 +4,6 @@ * 定义需要可以捕获的异常皆转换为当前异常对象 * * @author j.x - * @date 2021/12/31 14:12 * @since 1.0 */ public class CaptureException extends RuntimeException { diff --git a/uno-core/src/main/java/cc/allio/uno/core/exception/InstantiationException.java b/uno-core/src/main/java/cc/allio/uno/core/exception/InstantiationException.java index e8ff5294..dd77db3d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/exception/InstantiationException.java +++ b/uno-core/src/main/java/cc/allio/uno/core/exception/InstantiationException.java @@ -4,7 +4,6 @@ * 实例化过程中异常 * * @author j.x - * @date 2023/3/6 10:33 * @since 1.1.4 */ public class InstantiationException extends RuntimeException { diff --git a/uno-core/src/main/java/cc/allio/uno/core/exception/InvokeFutureException.java b/uno-core/src/main/java/cc/allio/uno/core/exception/InvokeFutureException.java index edbe19ff..7e8d5886 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/exception/InvokeFutureException.java +++ b/uno-core/src/main/java/cc/allio/uno/core/exception/InvokeFutureException.java @@ -3,8 +3,7 @@ /** * 调用Future产生的异常 * - * @author jiangw - * @date 2020/12/8 18:00 + * @author j.x * @since 1.0 */ public class InvokeFutureException extends Exception { diff --git a/uno-core/src/main/java/cc/allio/uno/core/exception/SerializationException.java b/uno-core/src/main/java/cc/allio/uno/core/exception/SerializationException.java index 05b14e70..501cc70e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/exception/SerializationException.java +++ b/uno-core/src/main/java/cc/allio/uno/core/exception/SerializationException.java @@ -4,7 +4,6 @@ * 序列化时产生异常 * * @author j.x - * @date 2022/8/1 12:36 * @since 1.0 */ public class SerializationException extends RuntimeException { diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/Action.java b/uno-core/src/main/java/cc/allio/uno/core/function/Action.java index 2c97eb70..8c00b903 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/Action.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/Action.java @@ -4,7 +4,6 @@ * 标识接口，表示一系列函数式行为。 * * @author j.x - * @date 2024/1/9 15:54 * @since 1.1.7 */ public interface Action { diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/ConsumerAction.java b/uno-core/src/main/java/cc/allio/uno/core/function/ConsumerAction.java index 8bf8a0e4..07d2b7b6 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/ConsumerAction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/ConsumerAction.java @@ -6,7 +6,6 @@ * consumer action * * @author j.x - * @date 2024/1/9 16:00 * @since 1.1.7 */ public interface ConsumerAction extends Consumer, Action { diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/SupplierAction.java b/uno-core/src/main/java/cc/allio/uno/core/function/SupplierAction.java index bc98c01b..5705162b 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/SupplierAction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/SupplierAction.java @@ -6,7 +6,6 @@ * supplier 动作 * * @author j.x - * @date 2024/1/9 15:58 * @since 1.1.7 */ public interface SupplierAction extends Supplier, Action { diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/TernaryConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/TernaryConsumer.java index 60310d10..b8e2179c 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/TernaryConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/TernaryConsumer.java @@ -4,7 +4,6 @@ * 拓展Consumer函数式接口，用于接收三元参数 * * @author j.x - * @date 2024/1/9 15:51 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/VoidConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/VoidConsumer.java index e636bd45..db54d3e8 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/VoidConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/VoidConsumer.java @@ -6,7 +6,6 @@ * 不接收如何参数的消费者 * * @author j.x - * @date 2024/1/9 15:57 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/LambdaMethod.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/LambdaMethod.java index b079e67d..baac3e0b 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/LambdaMethod.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/LambdaMethod.java @@ -4,7 +4,6 @@ * 继承或实现都需要实现{@link java.io.Serializable}，{@link java.io.NotSerializableException} 当实体没有实现{@link java.io.Serializable}时抛出 * * @author j.x - * @date 2024/1/26 18:26 * @since 1.1.7 */ public interface LambdaMethod { diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiConsumer.java index 2372f356..fc673ada 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiConsumer.java @@ -7,7 +7,6 @@ *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* * @author j.x - * @date 2024/1/26 18:34 * @see java.util.function.BiConsumer * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiFunction.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiFunction.java index cb667567..73fc0518 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiFunction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiFunction.java @@ -6,7 +6,6 @@ * 基于函数式接口的Lambda实现 *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* @author j.x - * @date 2024/1/26 18:39 * @see java.util.function.BiFunction * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiPredicate.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiPredicate.java index bd97ed8a..d22649d4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiPredicate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodBiPredicate.java @@ -7,7 +7,6 @@ *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* * @author j.x - * @date 2024/2/11 10:48 * @see BiPredicate * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodConsumer.java index 52cdc9de..c8828e30 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodConsumer.java @@ -6,7 +6,6 @@ * 基于函数式接口的Lambda实现，如this::getName *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* @author j.x - * @date 2024/1/26 18:26 * @see java.util.function.Consumer * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodFunction.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodFunction.java index d4c28514..cdc7e359 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodFunction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodFunction.java @@ -8,7 +8,6 @@ * 基于函数式接口的Lambda实现，如this::getName *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* @author j.x - * @date 2024/1/26 18:31 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodPredicate.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodPredicate.java index 555485df..70fa71cb 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodPredicate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodPredicate.java @@ -7,7 +7,6 @@ *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* * @author j.x - * @date 2024/2/11 10:44 * @see Predicate * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodQueConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodQueConsumer.java index a87f5dfe..7889be2c 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodQueConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodQueConsumer.java @@ -6,7 +6,6 @@ * 基于函数式接口的Lambda实现，四元消费者 *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* @author j.x - * @date 2024/1/26 18:37 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodQueFunction.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodQueFunction.java index 268f5d23..53a5ddca 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodQueFunction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodQueFunction.java @@ -6,7 +6,6 @@ * 基于函数式接口的Lambda实现，四元函数 *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* @author j.x - * @date 2024/1/26 18:41 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodReference.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodReference.java index a7ce01a4..400753fc 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodReference.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodReference.java @@ -11,7 +11,6 @@ * * * @author j.x - * @date 2023/1/5 15:07 * @since 1.1.4 */ public interface MethodReference extends Supplier, Serializable { diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodReferenceColumn.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodReferenceColumn.java index 96ad3a1d..8caf429a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodReferenceColumn.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodReferenceColumn.java @@ -12,7 +12,6 @@ * * * @author j.x - * @date 2023/1/5 15:36 * @since 1.1.4 */ public interface MethodReferenceColumn extends StaticMethodReference { @@ -37,7 +36,6 @@ default Class getEntityType() { * 获取Column名称 * * @return Column名称 - * @throws java.io.NotSerializableException 当实体没有实现{@link java.io.Serializable}时抛出 */ default String getColumn() { return SerializedLambda.of(this).getFieldName(); diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodSupplier.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodSupplier.java index 9d9393b0..5a9d15c3 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodSupplier.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodSupplier.java @@ -8,7 +8,6 @@ * 基于函数式接口的Lambda实现，如this::setName *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* @author j.x - * @date 2024/1/26 18:29 * @see java.util.function.Supplier * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerConsumer.java index fca3e88b..0367b301 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerConsumer.java @@ -6,7 +6,6 @@ * 基于函数式接口的Lambda实现，三元消费者 *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* @author j.x - * @date 2024/1/26 18:36 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerFunction.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerFunction.java index 0d4bb3f5..8e4ab745 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerFunction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerFunction.java @@ -6,7 +6,6 @@ * 基于函数式接口的Lambda实现，三元函数 *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* @author j.x - * @date 2024/1/26 18:40 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerPredicate.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerPredicate.java index 55ca0886..2a7ad859 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerPredicate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodTerPredicate.java @@ -5,7 +5,6 @@ *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* * @author j.x - * @date 2024/2/11 10:48 * @since 1.1.7 */ public interface MethodTerPredicate extends LambdaMethod { diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodVoid.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodVoid.java index 8574baab..9b110799 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodVoid.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodVoid.java @@ -7,7 +7,6 @@ *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* * @author j.x - * @date 2024/2/11 10:46 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodVoidPredicate.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodVoidPredicate.java index ccd8f32a..bbac8baf 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodVoidPredicate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/MethodVoidPredicate.java @@ -5,7 +5,6 @@ *

该接口包含能够获取Lambda方法名、字段名、Lambda方法的序列化信息等。

* * @author j.x - * @date 2024/2/11 10:53 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/SerializedLambda.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/SerializedLambda.java index 93f43131..3efb5349 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/SerializedLambda.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/SerializedLambda.java @@ -14,7 +14,6 @@ * 参考自{@link java.lang.invoke.SerializedLambda} * * @author j.x - * @date 2023/1/5 15:04 * @see MethodReference * @see StaticMethodReference * @since 1.1.4 diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/StaticMethodReference.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/StaticMethodReference.java index 5b85c386..1e42a96a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/StaticMethodReference.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/StaticMethodReference.java @@ -10,7 +10,6 @@ * * * @author j.x - * @date 2023/1/5 15:06 * @since 1.1.4 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiConsumer.java index a435c027..97d34f9d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiConsumer.java @@ -6,7 +6,6 @@ * exception for bi consumer accept method * * @author j.x - * @date 2024/2/18 15:46 * @see MethodBiConsumer * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiFunction.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiFunction.java index ec08ef4a..403dafab 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiFunction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiFunction.java @@ -6,7 +6,6 @@ * exception for bi function apply method * * @author j.x - * @date 2024/2/18 15:49 * @see MethodBiFunction * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiPredicate.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiPredicate.java index c7be439a..4c38d364 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiPredicate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodBiPredicate.java @@ -6,7 +6,6 @@ * exception for predicate test method * * @author j.x - * @date 2024/2/18 15:53 * @see MethodBiPredicate * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodConsumer.java index c3667656..9b9a4bf1 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodConsumer.java @@ -6,7 +6,6 @@ * exception for consumer accept method * * @author j.x - * @date 2024/2/18 15:54 * @see MethodConsumer * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodFunction.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodFunction.java index fd6ae761..f0a63550 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodFunction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodFunction.java @@ -6,7 +6,6 @@ * exception for function apply method * * @author j.x - * @date 2024/2/18 15:56 * @see MethodFunction * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodPredicate.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodPredicate.java index 2b65d042..b90e628d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodPredicate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodPredicate.java @@ -6,7 +6,6 @@ * exception for predicate test method * * @author j.x - * @date 2024/2/18 15:57 * @see MethodPredicate * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodQueConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodQueConsumer.java index 77acc2bd..27ffc8b2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodQueConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodQueConsumer.java @@ -6,7 +6,6 @@ * exception for que consumer accept method * * @author j.x - * @date 2024/2/18 15:57 * @see MethodQueConsumer * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodQueFunction.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodQueFunction.java index 6c6e8725..54a14fee 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodQueFunction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodQueFunction.java @@ -6,7 +6,6 @@ * exception for que function apply method * * @author j.x - * @date 2024/2/18 15:58 * @see MethodQueFunction * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodSupplier.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodSupplier.java index d56439cc..0c62baca 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodSupplier.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodSupplier.java @@ -6,7 +6,6 @@ * exception for supplier get method * * @author j.x - * @date 2024/2/18 15:59 * @see MethodSupplier * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerConsumer.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerConsumer.java index 8fe573b3..8be470b0 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerConsumer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerConsumer.java @@ -6,7 +6,6 @@ * exception for ter consumer accept method * * @author j.x - * @date 2024/2/18 16:00 * @see MethodTerConsumer * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerFunction.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerFunction.java index d10913d6..dae05fac 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerFunction.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerFunction.java @@ -6,7 +6,6 @@ * exception for ter function apply method * * @author j.x - * @date 2024/2/18 16:01 * @see MethodTerFunction * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerPredicate.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerPredicate.java index c56d6e61..9a06e65c 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerPredicate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodTerPredicate.java @@ -6,7 +6,6 @@ * exception for ter predicate test method * * @author j.x - * @date 2024/2/18 16:02 * @see MethodTerPredicate * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodVoid.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodVoid.java index b0ce5889..e1931731 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodVoid.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodVoid.java @@ -6,7 +6,6 @@ * exception for void method * * @author j.x - * @date 2024/2/18 16:03 * @see MethodVoid * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodVoidPredicate.java b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodVoidPredicate.java index 5b980271..d4c2683e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodVoidPredicate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/function/lambda/ThrowingMethodVoidPredicate.java @@ -6,7 +6,6 @@ * exception for predicate test method * * @author j.x - * @date 2024/2/18 16:04 * @see MethodVoidPredicate * @since 1.1.7 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/CompositeMetadata.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/CompositeMetadata.java index 4eb3a24d..9de0a008 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/CompositeMetadata.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/CompositeMetadata.java @@ -6,7 +6,6 @@ * 复合型元数据接口，实现类可以包含于多个{@link Metadata}实例 * * @author j.x - * @date 2022/11/21 22:38 * @since 1.1.1 */ public interface CompositeMetadata extends Metadata { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/JsonMetadata.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/JsonMetadata.java index d955ce8a..1dbe795d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/JsonMetadata.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/JsonMetadata.java @@ -13,8 +13,6 @@ * JSON 源数据 * * @author j.x - * @date 2023/4/11 16:37 - * @since SWP-2.0.1 */ public class JsonMetadata implements Metadata { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/Metadata.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/Metadata.java index d86cd90f..c75fcd47 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/Metadata.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/Metadata.java @@ -10,7 +10,6 @@ * 元数据接口定义 * * @author j.x - * @date 2022/11/21 22:25 * @since 1.1.1 */ public interface Metadata { @@ -34,7 +33,7 @@ public interface Metadata { * * @param fieldName 字段名称 * @param value 映射值 - * @return Mono值 + * @return {@link Mono} */ default Mono putMappingValue(String fieldName, Object value) { return putMappingValue(MappingField.builder().name(fieldName).build(), value); @@ -45,7 +44,7 @@ default Mono putMappingValue(String fieldName, Object value) { * * @param mappingField 映射字段 * @param value 映射值 - * @return Mono值 + * @return {@link Mono} */ default Mono putMappingValue(MappingField mappingField, Object value) { return Mono.just(value); @@ -55,7 +54,7 @@ default Mono putMappingValue(MappingField mappingField, Object value) { * 获取MappingValue * * @param fieldName 目标映射字段 - * @return Mono + * @return {@link Mono} */ default Mono getMappingValue(String fieldName) { return getMappingValue(MappingField.builder().name(fieldName).build(), Object.class); @@ -65,7 +64,7 @@ default Mono getMappingValue(String fieldName) { * 获取MappingValue * * @param mappingField MappingField - * @return Mono + * @return {@link Mono} */ default Mono getMappingValue(MappingField mappingField) { return getMappingValue(mappingField, Object.class); @@ -77,7 +76,7 @@ default Mono getMappingValue(MappingField mappingField) { * @param fieldName 目标映射字段 * @param type 字段类型 * @param 字段泛型 - * @return Mono + * @return {@link Mono} * @see #getMappingValue(MappingField, Class) */ default Mono getMappingValue(String fieldName, Class type) { @@ -90,7 +89,7 @@ default Mono getMappingValue(String fieldName, Class type) { * @param mappingField MappingField * @param type 字段类型 * @param 字段泛型 - * @return Mono + * @return {@link Mono} * @throws NullPointerException 当mappingField or type为空时抛出 * @throws ClassCastException 当type转换失败时抛出 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/AbstractJsonConverter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/AbstractJsonConverter.java index 266c3967..1a62c6df 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/AbstractJsonConverter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/AbstractJsonConverter.java @@ -18,7 +18,6 @@ * 抽象JSON转换器，提供JSON方式转换 * * @author j.x - * @date 2022/9/13 11:36 * @since 1.1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/AbstractRichConverter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/AbstractRichConverter.java index 01cb36c3..5d471a2b 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/AbstractRichConverter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/AbstractRichConverter.java @@ -15,7 +15,6 @@ * 抽象 * * @author j.x - * @date 2022/9/13 11:25 * @since 1.1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/Converter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/Converter.java index 57c9fafc..372de81b 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/Converter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/Converter.java @@ -6,7 +6,6 @@ * 时序数据转换器 * * @author j.x - * @date 2022/9/13 11:16 * @see ConverterFactory * @since 1.1.0 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/ConverterFactory.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/ConverterFactory.java index 9b52f74c..2e95eae2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/ConverterFactory.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/ConverterFactory.java @@ -10,7 +10,6 @@ * 转换器工厂 * * @author j.x - * @date 2022/9/27 23:07 * @since 1.1.0 */ public class ConverterFactory { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/RichConverter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/RichConverter.java index 59fe2c79..2658c0df 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/RichConverter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/convert/RichConverter.java @@ -6,7 +6,6 @@ * rich Converter操作. * * @author j.x - * @date 2022/9/13 11:28 * @since 1.1.0 */ public interface RichConverter extends Converter { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/DefaultEndpoint.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/DefaultEndpoint.java index e3d86c58..beae9012 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/DefaultEndpoint.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/DefaultEndpoint.java @@ -17,7 +17,6 @@ * 默认实现端点 * * @author j.x - * @date 2022/9/27 17:46 * @since 1.1.0 */ public class DefaultEndpoint implements Endpoint { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/DirectSourceEndpoint.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/DirectSourceEndpoint.java index d25ad69f..2c760b05 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/DirectSourceEndpoint.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/DirectSourceEndpoint.java @@ -12,7 +12,6 @@ * {@link Source}数据源包装类。直接进行处理获取 * * @author j.x - * @date 2022/9/27 15:55 * @since 1.1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/Endpoint.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/Endpoint.java index 6a7a8517..20ccb559 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/Endpoint.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/Endpoint.java @@ -16,7 +16,6 @@ *

* * @author j.x - * @date 2022/9/27 15:14 * @since 1.1.0 */ public interface Endpoint extends AggregationSource, InitializingBean, DisposableBean, ApplicationContextAware { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/FunctionSourceEndpoint.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/FunctionSourceEndpoint.java index 87c6ecb4..25f670f9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/FunctionSourceEndpoint.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/FunctionSourceEndpoint.java @@ -11,7 +11,6 @@ * 数据源函数接收 * * @author j.x - * @date 2023/4/11 12:34 * @since 1.1.4 */ public class FunctionSourceEndpoint implements SourceEndpoint { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/SourceEndpoint.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/SourceEndpoint.java index b2c0f5eb..166e70e4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/SourceEndpoint.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/SourceEndpoint.java @@ -6,7 +6,6 @@ * 数据源端点定义 * * @author j.x - * @date 2023/4/11 12:35 * @since 1.1.4 */ public interface SourceEndpoint { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/AggregationSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/AggregationSource.java index 9d2283d4..cd3f91cb 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/AggregationSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/AggregationSource.java @@ -9,7 +9,6 @@ * 可批量订阅数据源 * * @author j.x - * @date 2023/4/27 17:24 * @since 1.1.4 */ public interface AggregationSource> extends Source { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/CollectionSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/CollectionSource.java index 96525b31..a14b2cd3 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/CollectionSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/CollectionSource.java @@ -9,7 +9,6 @@ * 集合数据源 * * @author j.x - * @date 2022/9/27 18:16 * @since 1.1.0 */ public class CollectionSource extends JsonSource { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/DefaultAggregationSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/DefaultAggregationSource.java index 7ca97fbb..2e0750cd 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/DefaultAggregationSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/DefaultAggregationSource.java @@ -12,7 +12,6 @@ * 默认聚合数据源 * * @author j.x - * @date 2023/4/27 17:34 * @since 1.1.4 */ public class DefaultAggregationSource implements AggregationSource> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/JsonSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/JsonSource.java index fbfcde54..0e8ea9aa 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/JsonSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/JsonSource.java @@ -9,7 +9,6 @@ * 数据源封装为Json数据 * * @author j.x - * @date 2022/9/27 16:52 * @since 1.1.0 */ public abstract class JsonSource implements Source { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/ObjectSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/ObjectSource.java index 70656b65..b63dc32b 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/ObjectSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/ObjectSource.java @@ -7,7 +7,6 @@ * 对象数据源 * * @author j.x - * @date 2022/10/12 16:52 * @since 1.1.0 */ public class ObjectSource extends JsonSource { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SinkSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SinkSource.java index 40677a89..e35a6097 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SinkSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SinkSource.java @@ -8,7 +8,6 @@ * 基于{@link reactor.core.publisher.FluxSink}的数据源 * * @author j.x - * @date 2022/12/6 17:42 * @since 1.1.2 */ public class SinkSource extends JsonSource { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/Source.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/Source.java index 8a0e9a83..03e638b9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/Source.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/Source.java @@ -8,7 +8,6 @@ * Sequential数据源 * * @author j.x - * @date 2022/9/13 16:28 * @since 1.1.0 */ public interface Source { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SourceCollector.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SourceCollector.java index 6fe81bcc..0898b262 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SourceCollector.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SourceCollector.java @@ -6,7 +6,6 @@ * 数据源收集器 * * @author j.x - * @date 2022/9/27 15:18 * @since 1.1.0 */ public interface SourceCollector { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SourceConverter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SourceConverter.java index 23bee149..5928cfb5 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SourceConverter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/SourceConverter.java @@ -10,7 +10,6 @@ * 数据源转换 * * @author j.x - * @date 2022/9/27 15:13 * @since 1.0 */ public interface SourceConverter extends Converter { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/DefaultReactiveAggregationSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/DefaultReactiveAggregationSource.java index f234a9f3..0fdc86c3 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/DefaultReactiveAggregationSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/DefaultReactiveAggregationSource.java @@ -13,7 +13,6 @@ * aggregation default impl * * @author j.x - * @date 2023/4/27 18:00 * @since 1.1.4 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveAggregationSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveAggregationSource.java index 4b075fd6..14321e02 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveAggregationSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveAggregationSource.java @@ -9,7 +9,6 @@ * 可批量订阅数据源 * * @author j.x - * @date 2023/4/27 17:59 * @since 1.1.4 */ public interface ReactiveAggregationSource> extends ReactiveSource { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveObjectSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveObjectSource.java index 0c4552c8..bdd1aae0 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveObjectSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveObjectSource.java @@ -6,7 +6,6 @@ * 对象 source * * @author j.x - * @date 2023/4/27 18:04 * @since 1.1.4 */ public class ReactiveObjectSource extends ReactiveSinkSource { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveSinkSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveSinkSource.java index 9ca5e64c..de75788a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveSinkSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveSinkSource.java @@ -7,7 +7,6 @@ * reactive sink * * @author j.x - * @date 2023/4/27 17:50 * @since 1.1.4 */ public abstract class ReactiveSinkSource implements ReactiveSource { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveSource.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveSource.java index 60002af1..ddae4ab1 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveSource.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/endpoint/source/reactive/ReactiveSource.java @@ -8,7 +8,6 @@ * 如果不产生订阅数据源时不会进行产生 * * @author j.x - * @date 2023/4/27 17:43 * @since 1.1.4 */ public interface ReactiveSource { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/ArrayStringMappingFieldConverter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/ArrayStringMappingFieldConverter.java index a7a4093d..81609aaf 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/ArrayStringMappingFieldConverter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/ArrayStringMappingFieldConverter.java @@ -16,7 +16,6 @@ * 进行转换的数据可能是否Collection、可能是[{...}]的json形式。通过处理这两种形式，使最终返回一个String数据 * * @author j.x - * @date 2022/12/14 13:36 * @since 1.1.3 */ public class ArrayStringMappingFieldConverter extends BaseMappingFieldConverter { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/BaseMappingFieldConverter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/BaseMappingFieldConverter.java index e9d3dae2..175465cc 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/BaseMappingFieldConverter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/BaseMappingFieldConverter.java @@ -4,7 +4,6 @@ * 基础MappingField转换器 * * @author j.x - * @date 2022/12/14 13:13 * @since 1.1.3 */ public abstract class BaseMappingFieldConverter implements MappingFieldConverter { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/DefaultMappingFieldConverter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/DefaultMappingFieldConverter.java index 604dfc49..66c7d1dc 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/DefaultMappingFieldConverter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/DefaultMappingFieldConverter.java @@ -6,7 +6,6 @@ * 通用映射字段转换器，直接返回原始对象 * * @author j.x - * @date 2022/12/14 13:00 * @since 1.1.2 */ public class DefaultMappingFieldConverter extends BaseMappingFieldConverter { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/DefaultMappingMetadata.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/DefaultMappingMetadata.java index 4bc721f7..a3b0d759 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/DefaultMappingMetadata.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/DefaultMappingMetadata.java @@ -12,7 +12,6 @@ * 默认实现 * * @author j.x - * @date 2022/9/13 13:30 * @since 1.1.0 */ public class DefaultMappingMetadata extends LinkedHashMap implements MappingMetadata { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/KeyMappingFieldConverterFactory.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/KeyMappingFieldConverterFactory.java index edcfd30e..74e49682 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/KeyMappingFieldConverterFactory.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/KeyMappingFieldConverterFactory.java @@ -8,7 +8,6 @@ * 按照{@link MappingFieldConverter#keyConverter}的{@link MappingFieldConverter}工厂 * * @author j.x - * @date 2023/1/3 11:20 * @since 1.1.4 */ public class KeyMappingFieldConverterFactory { diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/MappingFieldConverter.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/MappingFieldConverter.java index 6aff0cff..4b811e70 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/MappingFieldConverter.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/MappingFieldConverter.java @@ -6,7 +6,6 @@ * 映射字段转换器 * * @author j.x - * @date 2022/12/14 12:55 * @see DefaultMappingFieldConverter * @see ArrayStringMappingFieldConverter * @since 1.1.3 diff --git a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/MappingMetadata.java b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/MappingMetadata.java index 5461b6fe..1b9b757e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/MappingMetadata.java +++ b/uno-core/src/main/java/cc/allio/uno/core/metadata/mapping/MappingMetadata.java @@ -9,7 +9,6 @@ * 映射关系元数据，定义模版方法 * * @author j.x - * @date 2022/9/13 13:27 * @since 1.1.0 */ public interface MappingMetadata extends Map { diff --git a/uno-core/src/main/java/cc/allio/uno/core/path/Forest.java b/uno-core/src/main/java/cc/allio/uno/core/path/Forest.java index dff53800..34a76a84 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/path/Forest.java +++ b/uno-core/src/main/java/cc/allio/uno/core/path/Forest.java @@ -22,7 +22,6 @@ * 构建一颗主题订阅森林 * * @author j.x - * @date 2022/6/27 10:39 * @since 1.0 */ @EqualsAndHashCode(of = "part") diff --git a/uno-core/src/main/java/cc/allio/uno/core/path/PathManager.java b/uno-core/src/main/java/cc/allio/uno/core/path/PathManager.java index d102f5dd..30da88f4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/path/PathManager.java +++ b/uno-core/src/main/java/cc/allio/uno/core/path/PathManager.java @@ -4,7 +4,6 @@ * WebSocket推送路径管理器 * * @author j.x - * @date 2022/6/27 15:52 * @since 1.0 */ public class PathManager { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/ByteBuddyInvocationInterceptor.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/ByteBuddyInvocationInterceptor.java index 28f3471f..a5767c56 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/ByteBuddyInvocationInterceptor.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/ByteBuddyInvocationInterceptor.java @@ -6,8 +6,7 @@ /** * 针对子类继承的拦截器 * - * @author jiangw - * @date 2021/8/13 10:56 + * @author j.x * @since 1.0 */ public interface ByteBuddyInvocationInterceptor extends InvocationInterceptor { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/ByteBuddyProxyInvocation.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/ByteBuddyProxyInvocation.java index febb39ae..5ac94e68 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/ByteBuddyProxyInvocation.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/ByteBuddyProxyInvocation.java @@ -18,8 +18,7 @@ /** * Byte Buddy是一款Java字节码增强框架，可以动态生成Java字节码文件，它他屏蔽了底层细节，提供统一易上手的api，简化字节码增加的难度，性能要强于jdk与cglib * - * @author jiangw - * @date 2021/8/12 17:46 + * @author j.x * @since 1.1 */ class ByteBuddyProxyInvocation implements ProxyInvocation { @@ -78,8 +77,7 @@ public T proxyInstance(ClassLoader classLoader, /** * byte buddy方法拦截器，代理对象方法调用时进行拦截，针对接口类型进行拦截 * - * @author jiangw - * @date 2021/8/13 14:38 + * @author j.x * @since 1.1 */ public static class ByteBuddyInterfaceMethodInterceptor { @@ -102,8 +100,7 @@ public static Object intercept(@FieldValue("interceptor") InvocationInterceptor /** * byte buddy方法拦截器，代理对象方法调用时进行拦截 * - * @author jiangw - * @date 2021/8/13 10:33 + * @author j.x * @since 1.1 */ public static class ByteBuddyMethodInterceptor { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/CglibInvocationInterceptor.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/CglibInvocationInterceptor.java index afcb9f58..9950fcf1 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/CglibInvocationInterceptor.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/CglibInvocationInterceptor.java @@ -8,8 +8,7 @@ /** * cglib的代理实现 * - * @author jiangw - * @date 2021/8/12 16:53 + * @author j.x * @since 1.1 */ public interface CglibInvocationInterceptor extends InvocationInterceptor { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/CglibProxyInvocation.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/CglibProxyInvocation.java index 62d317d4..82c46fd8 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/CglibProxyInvocation.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/CglibProxyInvocation.java @@ -10,8 +10,7 @@ /** * cglib代理实现 * - * @author jiangw - * @date 2021/8/12 16:53 + * @author j.x * @since 1.1 */ public class CglibProxyInvocation implements ProxyInvocation { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposableInvocationInterceptor.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposableInvocationInterceptor.java index e8c8bd3f..c2c20b24 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposableInvocationInterceptor.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposableInvocationInterceptor.java @@ -17,7 +17,6 @@ * 将会追踪他的调用栈，获取调用栈的类Class对象，判断他的方法上是否有使用到这个注解，只要调用栈里有一个使用就判定调用原声对象的方法。
* * @author j.x - * @date 2021/12/28 12:32 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposeOrigin.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposeOrigin.java index 781ec8ab..1ffb73dc 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposeOrigin.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposeOrigin.java @@ -22,7 +22,6 @@ * * * @author j.x - * @date 2021/12/28 12:27 * @see ComposeSharable * @see ComposableInvocationInterceptor * @since 1.0 diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposeSharable.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposeSharable.java index 8028f8a4..380d84d0 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposeSharable.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/ComposeSharable.java @@ -21,7 +21,6 @@ * * * @author j.x - * @date 2021/12/27 23:57 * @see ComposableInvocationInterceptor * @since 1.0 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityByteBuddyInvocationInterceptor.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityByteBuddyInvocationInterceptor.java index ce061d6b..1c6fcab9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityByteBuddyInvocationInterceptor.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityByteBuddyInvocationInterceptor.java @@ -7,7 +7,6 @@ * 不产生任何Bytebuddy反射能力的方法拦截器 * * @author j.x - * @date 2022/3/31 18:52 * @since 1.0.6 */ public class IncapacityByteBuddyInvocationInterceptor implements ByteBuddyInvocationInterceptor { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityCglibInvocationInterceptor.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityCglibInvocationInterceptor.java index 3626d638..be823fbe 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityCglibInvocationInterceptor.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityCglibInvocationInterceptor.java @@ -8,7 +8,6 @@ * 不产生任何Cglib反射能力的方法调用拦截器 * * @author j.x - * @date 2022/3/31 18:50 * @since 1.0.6 */ public class IncapacityCglibInvocationInterceptor implements CglibInvocationInterceptor { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityInvocationInterceptor.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityInvocationInterceptor.java index 7c9441f6..8d79ab67 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityInvocationInterceptor.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/IncapacityInvocationInterceptor.java @@ -7,7 +7,6 @@ * 不产生任何jdk反射能力的方法调用拦截器 * * @author j.x - * @date 2022/3/31 18:54 * @since 1.0.6 */ public class IncapacityInvocationInterceptor implements InvocationInterceptor { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/InvocationInterceptor.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/InvocationInterceptor.java index 4a607af8..ee4a8962 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/InvocationInterceptor.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/InvocationInterceptor.java @@ -7,8 +7,7 @@ * InvocationInterceptor是统一代理的具体实现 *

实现jdk、cglib、byte-buddy的代理实现

* - * @author jiangw - * @date 2021/8/12 16:06 + * @author j.x * @since 1.1 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/JDKProxyInvocation.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/JDKProxyInvocation.java index 9e1e8d8f..bc0be96e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/JDKProxyInvocation.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/JDKProxyInvocation.java @@ -5,8 +5,7 @@ /** * jdk代理对象实现 * - * @author jiangw - * @date 2021/8/12 16:37 + * @author j.x * @since 1.1 */ class JDKProxyInvocation implements ProxyInvocation { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyContext.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyContext.java index 9894d1ec..6467e722 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyContext.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyContext.java @@ -6,8 +6,7 @@ /** * 代理策略的上下文类，用来管理不同代理实现 * - * @author jiangw - * @date 2021/8/13 11:10 + * @author j.x * @since 1.1 */ class ProxyContext { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyFactory.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyFactory.java index 8e4e3418..dafae358 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyFactory.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyFactory.java @@ -3,8 +3,7 @@ /** * 代理实例的创建工厂 * - * @author jiangw - * @date 2021/8/13 11:11 + * @author j.x * @since 1.0 */ public class ProxyFactory { diff --git a/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyInvocation.java b/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyInvocation.java index 12425341..f9f8b043 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyInvocation.java +++ b/uno-core/src/main/java/cc/allio/uno/core/proxy/ProxyInvocation.java @@ -3,8 +3,7 @@ /** * 代理策略 * - * @author jiangw - * @date 2021/8/12 16:33 + * @author j.x * @since 1.0 */ interface ProxyInvocation { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reactive/BufferRate.java b/uno-core/src/main/java/cc/allio/uno/core/reactive/BufferRate.java index 4f23b1ff..cd2817c0 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reactive/BufferRate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reactive/BufferRate.java @@ -21,7 +21,6 @@ * 缓冲速率控制 * * @author j.x - * @date 2023/5/6 19:01 * @since 1.1.4 */ public abstract class BufferRate { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reactive/Reactives.java b/uno-core/src/main/java/cc/allio/uno/core/reactive/Reactives.java index 09c64b3c..476c88b6 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reactive/Reactives.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reactive/Reactives.java @@ -8,7 +8,6 @@ * {@link Mono}、{@link Flux}使用方法 * * @author j.x - * @date 2023/5/19 18:43 * @since 1.1.4 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/reactive/UnreliableChangeable.java b/uno-core/src/main/java/cc/allio/uno/core/reactive/UnreliableChangeable.java index ccb8c2db..54b5a4cf 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reactive/UnreliableChangeable.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reactive/UnreliableChangeable.java @@ -12,7 +12,6 @@ * 指定两个数据进行比较，判断值是否发生变化，它是不可靠的.他会创建一个原子变量来表示这个数据发生变化与否 * * @author j.x - * @date 2022/7/7 19:31 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/reactive/UnreliableChangeablePool.java b/uno-core/src/main/java/cc/allio/uno/core/reactive/UnreliableChangeablePool.java index a97af25c..73a5ffd4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reactive/UnreliableChangeablePool.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reactive/UnreliableChangeablePool.java @@ -10,7 +10,6 @@ * 数据资源池 * * @author j.x - * @date 2022/7/8 09:49 * @since 1.0 */ public class UnreliableChangeablePool { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnClass.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnClass.java index 888ae275..da163b12 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnClass.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnClass.java @@ -11,7 +11,6 @@ * Drawn to class * * @author j.x - * @date 2024/4/4 17:59 * @since 1.1.8 */ public class DrawnClass implements DrawnGeneric> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnField.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnField.java index d088b4a3..367f8505 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnField.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnField.java @@ -11,7 +11,6 @@ * Drawn to {@link Field} * * @author j.x - * @date 2024/4/4 18:00 * @since 1.1.8 */ public class DrawnField implements DrawnGeneric { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnGeneric.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnGeneric.java index 866b8e49..e1610244 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnGeneric.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnGeneric.java @@ -7,7 +7,6 @@ * drawn reflection type to actual generic type * * @author j.x - * @date 2024/4/4 17:58 * @since 1.1.8 */ public interface DrawnGeneric { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnMethod.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnMethod.java index 3505eac2..cea76f26 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnMethod.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/DrawnMethod.java @@ -12,7 +12,6 @@ * Drawn to method * * @author j.x - * @date 2024/4/4 18:00 * @since 1.1.8 */ public class DrawnMethod implements DrawnGeneric { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/Instantiation.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/Instantiation.java index 228b17af..31b09a00 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/Instantiation.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/Instantiation.java @@ -29,7 +29,6 @@ *

* * @author j.x - * @date 2024/3/15 09:43 * @since 1.1.7 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/InstantiationBuilder.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/InstantiationBuilder.java index 7317ee5c..d6e57a55 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/InstantiationBuilder.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/InstantiationBuilder.java @@ -9,7 +9,6 @@ * Instantiation Builder * * @author j.x - * @date 2024/3/15 09:49 * @since 1.1.7 */ public class InstantiationBuilder implements Self> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/InstantiationFeature.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/InstantiationFeature.java index 2c941497..a2791423 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/InstantiationFeature.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/InstantiationFeature.java @@ -9,7 +9,6 @@ * instantiation strategy * * @author j.x - * @date 2024/3/15 09:44 * @since 1.1.7 */ public interface InstantiationFeature { diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/ParameterizedFinder.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/ParameterizedFinder.java index 0ecd225d..d0a8a7e2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/ParameterizedFinder.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/ParameterizedFinder.java @@ -11,7 +11,6 @@ * definition how to find {@link ParameterizedType}. and by rawType({@link Class}) and by index and else... * * @author j.x - * @date 2024/4/4 17:58 * @since 1.1.8 */ @Getter diff --git a/uno-core/src/main/java/cc/allio/uno/core/reflect/ReflectTools.java b/uno-core/src/main/java/cc/allio/uno/core/reflect/ReflectTools.java index d21c10bb..951ae7d2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/reflect/ReflectTools.java +++ b/uno-core/src/main/java/cc/allio/uno/core/reflect/ReflectTools.java @@ -16,7 +16,6 @@ * 反射相关的工具集合 * * @author j.x - * @date 2023/11/30 11:57 * @since 1.0.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/serializer/AbstractSerializer.java b/uno-core/src/main/java/cc/allio/uno/core/serializer/AbstractSerializer.java index 3af2a80c..482646f4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/serializer/AbstractSerializer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/serializer/AbstractSerializer.java @@ -10,8 +10,7 @@ /** * 增加抽象序列化层，抽出共用方法 * - * @author jw - * @date 2021/12/4 21:18 + * @author j.x */ public abstract class AbstractSerializer implements Serializer { diff --git a/uno-core/src/main/java/cc/allio/uno/core/serializer/JacksonSerializer.java b/uno-core/src/main/java/cc/allio/uno/core/serializer/JacksonSerializer.java index 87949233..8fd36af9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/serializer/JacksonSerializer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/serializer/JacksonSerializer.java @@ -16,8 +16,7 @@ /** * Jackson序列化器，要求反序列化的对象有默认构造器 * - * @author jw - * @date 2021/12/3 11:10 + * @author j.x */ @AutoService(Serializer.class) public class JacksonSerializer extends AbstractSerializer { diff --git a/uno-core/src/main/java/cc/allio/uno/core/serializer/JsonNodeEnhancer.java b/uno-core/src/main/java/cc/allio/uno/core/serializer/JsonNodeEnhancer.java index 1ad63da5..e1ce83c0 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/serializer/JsonNodeEnhancer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/serializer/JsonNodeEnhancer.java @@ -15,7 +15,6 @@ * Http Json数据增强 * * @author j.x - * @date 2022/6/17 19:52 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/serializer/ProtoStuffSerializer.java b/uno-core/src/main/java/cc/allio/uno/core/serializer/ProtoStuffSerializer.java index 29655d3e..38c7691e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/serializer/ProtoStuffSerializer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/serializer/ProtoStuffSerializer.java @@ -12,8 +12,7 @@ /** * ProtoStuff序列化器 - * @author jw - * @date 2021/12/3 11:10 + * @author j.x */ @AutoService(Serializer.class) public class ProtoStuffSerializer extends AbstractSerializer> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/serializer/Serializer.java b/uno-core/src/main/java/cc/allio/uno/core/serializer/Serializer.java index 125227d0..2db7ec11 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/serializer/Serializer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/serializer/Serializer.java @@ -9,8 +9,7 @@ /** * 序列化器接口，通过spi进行获取实例对象，目前可以支持protostuff与jackson两种方式 * - * @author jw - * @date 2021/12/2 16:05 + * @author j.x */ public interface Serializer { diff --git a/uno-core/src/main/java/cc/allio/uno/core/serializer/SerializerHolder.java b/uno-core/src/main/java/cc/allio/uno/core/serializer/SerializerHolder.java index 84d3bc27..9af7b036 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/serializer/SerializerHolder.java +++ b/uno-core/src/main/java/cc/allio/uno/core/serializer/SerializerHolder.java @@ -7,8 +7,7 @@ /** * 序列化对象持有者，通过使用spi来获取对象。 * - * @author jw - * @date 2021/12/2 16:23 + * @author j.x */ public class SerializerHolder { diff --git a/uno-core/src/main/java/cc/allio/uno/core/spi/AutoTypeLoader.java b/uno-core/src/main/java/cc/allio/uno/core/spi/AutoTypeLoader.java index fdbecf58..3cf19088 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/spi/AutoTypeLoader.java +++ b/uno-core/src/main/java/cc/allio/uno/core/spi/AutoTypeLoader.java @@ -13,7 +13,6 @@ * {@link AutoService}与{@link Type}数据类型加载单例对象，提供的静态方法获取实例数据不做缓存 * * @author j.x - * @date 2022/5/20 10:42 * @since 1.0 */ public abstract class AutoTypeLoader extends Loader { @@ -23,7 +22,7 @@ public abstract class AutoTypeLoader extends Loader { * * @param typeClass 期望的类型 * @param 返回数据格式的范型 - * @return 以范型为Key，范型为value的数据 + * @return 以范型K为Key，范型T为value的数据 * @throws NullPointerException 提供的入参没有被{@link AutoService}注解注释抛出该异常 */ public static Map> loadByTypeToMap(Class typeClass) { @@ -39,7 +38,7 @@ public static Map> loadByTypeToMap(Class typ * * @param typeClass 期望的类型 * @param 返回数据格式的范型 - * @return 以范型为Key，范型为value的数据 + * @return 以范型K为Key，范型T为value的数据 * @throws NullPointerException 提供的入参没有被{@link AutoService}注解注释抛出该异常 */ public static List loadToList(Class typeClass) { @@ -53,7 +52,7 @@ public static List loadToList(Class typeClass) { * * @param typeClass 期望的类型 * @param 返回数据格式的范型 - * @return 以范型为Key，范型为value的数据 + * @return 以范型K为Key，范型tz为value的数据 * @throws NullPointerException 提供的入参没有被{@link AutoService}注解注释抛出该异常 */ public static Flux> loadByTypeToGroupFlux(Class typeClass) { @@ -67,7 +66,7 @@ public static Flux> loadByTypeToGroupFlu * * @param typeClass 期望的类型 * @param 返回数据格式的范型 - * @return 以范型为Key，范型为value的数据 + * @return 以范型K为Key，范型T为value的数据 * @throws NullPointerException 提供的入参没有被{@link AutoService}注解注释抛出该异常 */ public static Flux loadToFlux(Class typeClass) { diff --git a/uno-core/src/main/java/cc/allio/uno/core/spi/ClassPathServiceLoader.java b/uno-core/src/main/java/cc/allio/uno/core/spi/ClassPathServiceLoader.java index 208b6bcd..230642fd 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/spi/ClassPathServiceLoader.java +++ b/uno-core/src/main/java/cc/allio/uno/core/spi/ClassPathServiceLoader.java @@ -21,7 +21,6 @@ * enhanced create instance by constructor create service instance * * @author j.x - * @date 2024/3/15 08:54 * @since 1.1.7 */ public class ClassPathServiceLoader implements Iterator> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/spi/FactoriesLoader.java b/uno-core/src/main/java/cc/allio/uno/core/spi/FactoriesLoader.java index a6915794..6a92c869 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/spi/FactoriesLoader.java +++ b/uno-core/src/main/java/cc/allio/uno/core/spi/FactoriesLoader.java @@ -22,7 +22,6 @@ * cc.allio.uno.core.spi.Demo2Impl
* * @author j.x - * @date 2022/3/31 19:32 * @since 1.0.6 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/spi/Loader.java b/uno-core/src/main/java/cc/allio/uno/core/spi/Loader.java index f6c9f1a4..b6526989 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/spi/Loader.java +++ b/uno-core/src/main/java/cc/allio/uno/core/spi/Loader.java @@ -11,7 +11,6 @@ * SPI加载器 * * @author j.x - * @date 2022/11/1 17:40 * @since 1.0 */ public abstract class Loader { diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/AbstractBufferRateTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/AbstractBufferRateTask.java index 760a58ef..239de502 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/AbstractBufferRateTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/AbstractBufferRateTask.java @@ -11,7 +11,6 @@ * 基于Reactor背压特性的任务 * * @author j.x - * @date 2021/12/22 16:41 * @since 1.0 */ public abstract class AbstractBufferRateTask implements ReactiveTask> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/AccumulatedTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/AccumulatedTask.java index c3685d81..5dbd1268 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/AccumulatedTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/AccumulatedTask.java @@ -19,7 +19,6 @@ * 数据堆积于缓存中，当达到指定的阈值时弹出回调计算。类似于window * * @author j.x - * @date 2022/2/9 09:30 * @see Cache * @see Computing * @since 1.0 diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/BaseComposedComputeTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/BaseComposedComputeTask.java index 8903316f..aa24ffab 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/BaseComposedComputeTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/BaseComposedComputeTask.java @@ -6,7 +6,6 @@ * 组合的计算任务 * * @author j.x - * @date 2021/12/22 15:30 * @since 1.0 */ public abstract class BaseComposedComputeTask implements BatchComputingTask { diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/BatchComputingTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/BatchComputingTask.java index 1e507275..bc8120a5 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/BatchComputingTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/BatchComputingTask.java @@ -7,7 +7,6 @@ * 使用{@link Computing}批量计算任务 * * @author j.x - * @date 2022/2/21 13:44 * @since 1.0 */ public interface BatchComputingTask extends Task { diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/Computing.java b/uno-core/src/main/java/cc/allio/uno/core/task/Computing.java index 37a97051..978cf275 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/Computing.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/Computing.java @@ -10,7 +10,6 @@ * 计算任务 * * @author j.x - * @date 2021/12/22 15:31 * @since 1.0 */ @FunctionalInterface diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/CronTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/CronTask.java index a7492529..a59d4f6f 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/CronTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/CronTask.java @@ -6,11 +6,9 @@ /** * Cron表达式是一个字符串，字符串为5个空格隔开，分为6个域，每个域代表一个含义 - *

* CronTask使用Cron表达式来指定任务在什么时段定时执行。 * * @author j.x - * @date 2021/12/30 15:41 * @see CronExpression * @since 1.0 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/DefaultBufferRateTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/DefaultBufferRateTask.java index bc60efde..d3950197 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/DefaultBufferRateTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/DefaultBufferRateTask.java @@ -11,7 +11,6 @@ * 默认实现 * * @author j.x - * @date 2023/4/28 18:27 * @since 1.1.4 */ public class DefaultBufferRateTask extends AbstractBufferRateTask { diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/ProxyBufferTimerSegmentTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/ProxyBufferTimerSegmentTask.java index eca87a62..405c3424 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/ProxyBufferTimerSegmentTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/ProxyBufferTimerSegmentTask.java @@ -12,7 +12,6 @@ * 采用Flux作为数据源发布,可缓存的Cron定时任务，计算任务采用代理进行实现。 * * @author j.x - * @date 2021/12/22 20:45 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/ReactiveTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/ReactiveTask.java index 71043fdd..9a59b025 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/ReactiveTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/ReactiveTask.java @@ -5,7 +5,6 @@ * * @param 类型参数 * @author j.x - * @date 2023/4/28 18:25 * @since 1.1.4 */ public interface ReactiveTask { diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/Task.java b/uno-core/src/main/java/cc/allio/uno/core/task/Task.java index 910e9513..46903b86 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/Task.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/Task.java @@ -4,7 +4,6 @@ * 任务 * * @author j.x - * @date 2021/12/22 15:17 * @since 1.0 */ public interface Task { diff --git a/uno-core/src/main/java/cc/allio/uno/core/task/TimerSegmentTask.java b/uno-core/src/main/java/cc/allio/uno/core/task/TimerSegmentTask.java index abc41466..c5872a4c 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/task/TimerSegmentTask.java +++ b/uno-core/src/main/java/cc/allio/uno/core/task/TimerSegmentTask.java @@ -13,7 +13,6 @@ * 时间段任务，每隔多少时间执行一次这个任务。内部采用Netty时间轮实现 * * @author j.x - * @date 2021/12/22 15:20 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/BigDecimalTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/BigDecimalTypeOperator.java index 1af45471..5ac69116 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/BigDecimalTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/BigDecimalTypeOperator.java @@ -7,7 +7,6 @@ * BigDecimal类型转换器，可能抛出NumberFormatException异常 * * @author j.x - * @date 2021/12/23 20:18 * @since 1.0 */ public class BigDecimalTypeOperator implements TypeOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/BooleanCalculateOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/BooleanCalculateOperator.java index 2b36e674..a2e6a8f3 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/BooleanCalculateOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/BooleanCalculateOperator.java @@ -4,7 +4,6 @@ * Boolean类型转换器，可能抛出NumberFormatException异常 * * @author j.x - * @date 2021/12/23 20:10 * @since 1.0 */ public class BooleanCalculateOperator extends UnsupportedCalculateOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/ByteTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/ByteTypeOperator.java index be4e0d50..58dbef7d 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/ByteTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/ByteTypeOperator.java @@ -4,7 +4,6 @@ * Byte类型转换器，可能抛出NumberFormatException异常 * * @author j.x - * @date 2021/12/23 20:16 * @since 1.0 */ public class ByteTypeOperator extends UnsupportedCalculateOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/CalculateOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/CalculateOperator.java index 3ff709f7..52979adb 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/CalculateOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/CalculateOperator.java @@ -4,7 +4,6 @@ * 计算操作 * * @author j.x - * @date 2022/10/10 22:19 * @since 1.1.0 */ public interface CalculateOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/DateCalculateOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/DateCalculateOperator.java index 7d8abba1..d628c915 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/DateCalculateOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/DateCalculateOperator.java @@ -9,7 +9,6 @@ * Date类型转换器，以yyyy-MM-dd HH:mm:ss解析 * * @author j.x - * @date 2021/12/23 20:24 * @since 1.0 */ public class DateCalculateOperator extends UnsupportedCalculateOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/DefaultType.java b/uno-core/src/main/java/cc/allio/uno/core/type/DefaultType.java index a214e999..019f0753 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/DefaultType.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/DefaultType.java @@ -7,7 +7,6 @@ * 默认类型实现 * * @author j.x - * @date 2023/4/12 09:23 * @since 1.1.4 */ @Data diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/DefaultTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/DefaultTypeOperator.java index ff105f01..0a29aad9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/DefaultTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/DefaultTypeOperator.java @@ -4,7 +4,6 @@ * 默认转换器 * * @author j.x - * @date 2021/12/23 20:32 * @since 1.0 */ public class DefaultTypeOperator extends UnsupportedCalculateOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/DoubleTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/DoubleTypeOperator.java index 6167784c..a25c6968 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/DoubleTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/DoubleTypeOperator.java @@ -4,7 +4,6 @@ * Double类型转换器，可能抛出NumberFormatException异常 * * @author j.x - * @date 2021/12/23 20:15 * @since 1.0 */ public class DoubleTypeOperator implements TypeOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/EnumTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/EnumTypeOperator.java index cde7d6fe..61badcdc 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/EnumTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/EnumTypeOperator.java @@ -15,7 +15,6 @@ * * * @author j.x - * @date 2021/12/24 00:59 * @since 1.0 */ public class EnumTypeOperator> extends UnsupportedCalculateOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/FloatTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/FloatTypeOperator.java index 77203579..3f2c9ee8 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/FloatTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/FloatTypeOperator.java @@ -4,7 +4,6 @@ * Float类型转换器，可能抛出NumberFormatException异常 * * @author j.x - * @date 2021/12/23 20:11 * @since 1.0 */ public class FloatTypeOperator implements TypeOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/IntegerTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/IntegerTypeOperator.java index fdcf471c..9d65bf58 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/IntegerTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/IntegerTypeOperator.java @@ -4,7 +4,6 @@ * Integer类型转换器，可能抛出NumberFormatException异常 * * @author j.x - * @date 2021/12/23 20:08 * @since 1.0 */ public class IntegerTypeOperator implements TypeOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/LongTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/LongTypeOperator.java index 137fa795..ef7e6ce5 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/LongTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/LongTypeOperator.java @@ -4,7 +4,6 @@ * Long类型转换器，可能抛出NumberFormatException异常 * * @author j.x - * @date 2021/12/24 15:42 * @since 1.0 */ public class LongTypeOperator implements TypeOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/MemoryTypeManager.java b/uno-core/src/main/java/cc/allio/uno/core/type/MemoryTypeManager.java index e9ad394f..bc374e51 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/MemoryTypeManager.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/MemoryTypeManager.java @@ -12,7 +12,6 @@ * 基于内存的类型管理器 * * @author j.x - * @date 2023/4/11 19:57 * @since 1.1.4 */ public class MemoryTypeManager implements TypeManager { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/RegexType.java b/uno-core/src/main/java/cc/allio/uno/core/type/RegexType.java index 11b869b9..65126af4 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/RegexType.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/RegexType.java @@ -4,7 +4,6 @@ * 模糊匹配类型 * * @author j.x - * @date 2023/4/12 13:13 * @since 1.1.4 */ public class RegexType implements Type { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/ShortTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/ShortTypeOperator.java index 6bfbd582..c4fe32ee 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/ShortTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/ShortTypeOperator.java @@ -4,7 +4,6 @@ * Short类型的转换器。可能抛出NumberFormatException异常 * * @author j.x - * @date 2021/12/23 20:11 * @since 1.0 */ public class ShortTypeOperator implements TypeOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/StringTypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/StringTypeOperator.java index ed3b841b..b3d3af39 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/StringTypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/StringTypeOperator.java @@ -4,7 +4,6 @@ * String类型转换器 * * @author j.x - * @date 2021/12/23 20:14 * @since 1.0 */ public class StringTypeOperator extends UnsupportedCalculateOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/Type.java b/uno-core/src/main/java/cc/allio/uno/core/type/Type.java index a027b58f..b4948e41 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/Type.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/Type.java @@ -8,7 +8,6 @@ * * * @author j.x - * @date 2022/5/20 10:26 * @since 1.0 */ public interface Type { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/TypeManager.java b/uno-core/src/main/java/cc/allio/uno/core/type/TypeManager.java index 21e7475f..e7cd6810 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/TypeManager.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/TypeManager.java @@ -12,7 +12,6 @@ * 时序数据的类型管理器，针对不同类型的数据，不同类型的来源管理并查询 * * @author j.x - * @date 2023/4/11 19:52 * @see MemoryTypeManager * @since 1.1.4 */ @@ -85,7 +84,6 @@ default boolean match(Type t1, Type t2) { * 类型Matchers * * @author j.x - * @date 2023/4/12 13:28 * @since 1.1.4 */ class Matchers { @@ -118,7 +116,6 @@ private static TypeMatcher getMatcher(Type type) { * 类型匹配器定义 * * @author j.x - * @date 2023/4/12 13:14 * @since 1.1.4 */ interface TypeMatcher { @@ -145,7 +142,6 @@ interface TypeMatcher { * 简单的类型匹配器，通过{@link Object#equals(Object)}进行匹配 * * @author j.x - * @date 2023/4/12 13:18 * @since 1.1.4 */ class DefaultTypeMatcher implements TypeMatcher { @@ -171,7 +167,6 @@ public int order() { * 通配符类型匹配器 * * @author j.x - * @date 2023/4/12 13:19 * @since 1.1.4 */ class PatternTypeMatcher implements TypeMatcher { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/TypeOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/TypeOperator.java index fe732c48..95434210 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/TypeOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/TypeOperator.java @@ -5,7 +5,6 @@ * * @param 具体操作的类型实体 * @author j.x - * @date 2021/12/23 20:06 * @since 1.0 */ public interface TypeOperator extends CalculateOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/TypeOperatorFactory.java b/uno-core/src/main/java/cc/allio/uno/core/type/TypeOperatorFactory.java index f432e9e6..a7495f59 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/TypeOperatorFactory.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/TypeOperatorFactory.java @@ -10,8 +10,6 @@ /** * @author j.x - * @date 2021/12/23 20:35 - * @modifyDate 2024/01/13 18:32 * @since 1.1.0 */ public class TypeOperatorFactory { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/TypeValue.java b/uno-core/src/main/java/cc/allio/uno/core/type/TypeValue.java index 057950bc..e9883623 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/TypeValue.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/TypeValue.java @@ -24,7 +24,6 @@ * Type-Value * * @author j.x - * @date 2023/1/3 16:32 * @since 1.1.4 */ @Data diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/Types.java b/uno-core/src/main/java/cc/allio/uno/core/type/Types.java index e84b3bc6..a54fb0ea 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/Types.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/Types.java @@ -12,7 +12,6 @@ * 类型公共方法集 * * @author j.x - * @date 2022/12/3 17:25 * @since 1.1.2 */ public class Types { diff --git a/uno-core/src/main/java/cc/allio/uno/core/type/UnsupportedCalculateOperator.java b/uno-core/src/main/java/cc/allio/uno/core/type/UnsupportedCalculateOperator.java index 8ba13826..ec155861 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/type/UnsupportedCalculateOperator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/type/UnsupportedCalculateOperator.java @@ -4,7 +4,6 @@ * 不受支持的计算操作 * * @author j.x - * @date 2022/10/10 22:21 * @since 1.1.0 */ public abstract class UnsupportedCalculateOperator implements TypeOperator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/BeanUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/BeanUtils.java index 483f2f0e..28a2d3ae 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/BeanUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/BeanUtils.java @@ -26,7 +26,6 @@ * Bean实用的工具方法 * * @author j.x - * @date 2022/1/29 16:05 * @since 1.0 */ @Slf4j @@ -236,11 +235,9 @@ public static T clone(@Nullable T source) { *

* 支持 map bean copy *

- * * * 复制的目标对象的CLass不能是匿名类 * - * * * @param source 源对象 * @param clazz 类名 diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/BigDecimalUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/BigDecimalUtils.java index be18a034..221a596f 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/BigDecimalUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/BigDecimalUtils.java @@ -8,7 +8,6 @@ * BigDecimal相关数据工具类 * * @author j.x - * @date 2022/6/17 20:05 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/CalendarUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/CalendarUtils.java index 2f899a9f..500c7ccd 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/CalendarUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/CalendarUtils.java @@ -8,7 +8,6 @@ * 常用时间工具 * * @author j.x - * @date 2022/7/6 14:18 * @since 1.0 */ public class CalendarUtils { @@ -451,8 +450,6 @@ public static Date formatMinuteDate(final Date date) { /** * 给指定日期加上指定天数 - * - * @param */ public static String addDay(String date, int day, String pattern) { SimpleDateFormat dateFormat = new SimpleDateFormat(pattern); @@ -472,8 +469,6 @@ public static String addDay(String date, int day, String pattern) { /** * 给指定日期加上指定月 - * - * @param */ public static String addMonth(String date, int month, String pattern) { SimpleDateFormat dateFormat = new SimpleDateFormat(pattern); @@ -493,8 +488,6 @@ public static String addMonth(String date, int month, String pattern) { /** * 给指定日期加上指定年 - * - * @param */ public static String addYear(String date, int year, String pattern) { SimpleDateFormat dateFormat = new SimpleDateFormat(pattern); @@ -530,8 +523,6 @@ public static int getDaysAboutMonth(int year, int month) { /** * 把日期类转换为字符串 - * - * @param */ public static String switchDate(Date date, String pattern) { SimpleDateFormat dateFormat = new SimpleDateFormat(pattern); diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/ClassUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/ClassUtils.java index 325c9cfe..685a612e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/ClassUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/ClassUtils.java @@ -21,8 +21,7 @@ /** * 与{@link Class}有关的工具集 * - * @author jw - * @date 2021/12/5 11:00 + * @author j.x */ @Slf4j public class ClassUtils extends org.springframework.util.ClassUtils { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/CollectionUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/CollectionUtils.java index 6f7b5686..2196d3a9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/CollectionUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/CollectionUtils.java @@ -7,8 +7,7 @@ /** * 集合常用工具方法 * - * @author jw - * @date 2021/12/5 11:02 + * @author j.x */ public class CollectionUtils extends org.springframework.util.CollectionUtils { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/FieldUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/FieldUtils.java index 394672ee..41f60361 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/FieldUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/FieldUtils.java @@ -9,7 +9,6 @@ * field util * * @author j.x - * @date 2024/1/9 16:12 * @since 1.1.7 */ public class FieldUtils extends org.apache.commons.lang3.reflect.FieldUtils { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/FileUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/FileUtils.java index 8b4ba979..091c90e9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/FileUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/FileUtils.java @@ -20,8 +20,7 @@ /** * 文件相关的工具集合 * - * @author jw - * @date 2021/12/4 22:54 + * @author j.x */ public class FileUtils { @@ -109,7 +108,6 @@ public static List readFileForce(String path) { * * @param classPath 类文件路径 * @return FileReadResult mono - * @throws FileNotFoundException 文件找不到时抛出 */ public static Mono readSingleClassFile(String classPath) { return readSingleFile(CLASS_PATH + classPath); @@ -120,7 +118,6 @@ public static Mono readSingleClassFile(String classPath) { * * @param path 文件路径 * @return FileReadResult mono - * @throws FileNotFoundException 文件找不到时抛出 */ public static Mono readSingleFile(String path) { // 判断是否包含 diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/JsonUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/JsonUtils.java index e7461f3e..338388b9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/JsonUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/JsonUtils.java @@ -29,7 +29,6 @@ * Json转换的实用工具类 * * @author j.x - * @date 2022 /1/29 17:02 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/ObjectUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/ObjectUtils.java index 5ffd404d..bf13441a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/ObjectUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/ObjectUtils.java @@ -6,7 +6,6 @@ * Object的实用方法，基于{@link org.springframework.util.ObjectUtils} * * @author j.x - * @date 2022/1/29 16:02 * @since 1.0 */ public class ObjectUtils extends org.springframework.util.ObjectUtils { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/RandomUtil.java b/uno-core/src/main/java/cc/allio/uno/core/util/RandomUtil.java new file mode 100644 index 00000000..7797de56 --- /dev/null +++ b/uno-core/src/main/java/cc/allio/uno/core/util/RandomUtil.java @@ -0,0 +1,37 @@ +package cc.allio.uno.core.util; + +import java.util.concurrent.ThreadLocalRandom; + +/** + * random util + * + * @author j.x + * @since 1.1.9 + */ +public class RandomUtil { + + /** + * 用于随机选的字符和数字 + */ + public static final String BASE_CHAR_NUMBER = "abcdefghijklmnopqrstuvwxyz0123456789"; + + /** + * 获得一个随机的字符串 + * + * @param length 字符串的长度 + * @return 指定长度的随机字符串 + */ + public static String randomString(int length) { + final StringBuilder sb = new StringBuilder(length); + + if (length < 1) { + length = 1; + } + int baseLength = BASE_CHAR_NUMBER.length(); + for (int i = 0; i < length; i++) { + int number = ThreadLocalRandom.current().nextInt(baseLength); + sb.append(BASE_CHAR_NUMBER.charAt(number)); + } + return sb.toString(); + } +} diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/Requires.java b/uno-core/src/main/java/cc/allio/uno/core/util/Requires.java index c2eb162e..c6c9777a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/Requires.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/Requires.java @@ -7,8 +7,7 @@ /** * 一些关于请求验证的方法 * - * @author jw - * @date 2021/12/6 13:57 + * @author j.x */ public final class Requires { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/ResourceUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/ResourceUtils.java index edfba62e..f2ff52a5 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/ResourceUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/ResourceUtils.java @@ -4,7 +4,6 @@ * 用于将资源位置解析为文件系统中文件的实用方法，基于{@link org.springframework.util.ResourceUtils} * * @author j.x - * @date 2022/1/29 16:21 * @since 1.0 */ public class ResourceUtils extends org.springframework.util.ResourceUtils { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/StringUtils.java b/uno-core/src/main/java/cc/allio/uno/core/util/StringUtils.java index 04516747..a986a41c 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/StringUtils.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/StringUtils.java @@ -14,6 +14,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -24,8 +25,7 @@ /** * 字符串工具 * - * @author jw - * @date 2021/12/5 10:59 + * @author j.x */ public class StringUtils extends org.springframework.util.StringUtils { @@ -68,7 +68,7 @@ public static String cropUrl(String url) { /** * 裁剪带有请求参数的url。
- * example：https://passport.baidu.com/passApi/js/wrapper.js?cdnversion=1638804235178&_=1638804234866
+ * example：...
* or
* https://passport.baidu.com/passApi/{id}/{name}
* 给定规则：
@@ -145,7 +145,7 @@ private static void cropParameterUrl(String parameterUrl, Consumer - * example：https://passport.baidu.com/passApi/js/wrapper.js?cdnversion=1638804235178&_=1638804234866
+ * example：...
* or
* https://passport.baidu.com/passApi/{id}/{name}
* 拼接分为两部分：
@@ -176,11 +176,7 @@ public static String joinUrl(String templateUrl, Map vars) { Object value = vars.get(placeholder); vars.remove(placeholder); String encodeOfParameter = String.valueOf(value); - try { - encodeOfParameter = URLEncoder.encode(encodeOfParameter, "UTF-8"); - } catch (UnsupportedEncodingException e) { - // ignore - } + encodeOfParameter = URLEncoder.encode(encodeOfParameter, StandardCharsets.UTF_8); String replace = join.get().replace(StringPool.LEFT_BRACE.concat(placeholder).concat(StringPool.RIGHT_BRACE), encodeOfParameter); join.set(replace); }) @@ -188,11 +184,7 @@ public static String joinUrl(String templateUrl, Map vars) { // ?par=1&par=2 请求参数的拼接 .map(entity -> { String encodeOfParameter = String.valueOf(entity.getValue()); - try { - encodeOfParameter = URLEncoder.encode(encodeOfParameter, "UTF-8"); - } catch (UnsupportedEncodingException e) { - // ignore - } + encodeOfParameter = URLEncoder.encode(encodeOfParameter, StandardCharsets.UTF_8); return entity.getKey().concat(StringPool.EQUALS).concat(encodeOfParameter); }) .doOnNext(compose -> { @@ -210,7 +202,7 @@ public static String joinUrl(String templateUrl, Map vars) { /** * 获取url中基础的地址
- * example: https://passport.baidu.com/passApi/js/wrapper.js?cdnversion=1638804235178&_=1638804234866
+ * example: ...
* result：passport.baidu.com * * @param templateUrl 请求链接 @@ -232,7 +224,7 @@ public static Mono getBaseUrl(String templateUrl) { /** * 获取url中api的地址 - * example: https://passport.baidu.com/passApi/js/wrapper.js
+ * example: ...
* result：/passApi/js/wrapper.js * * @param templateUrl 请求链接 @@ -278,10 +270,6 @@ public static Mono getPort(String templateUrl) { @Data private static class PlaceholderParameter { - private PlaceholderParameter() { - - } - /** * 占位符名称 */ @@ -314,7 +302,7 @@ private static List find(String placeholderUrl) { placeholderParameter.setKey(placeholderUrl); return placeholderParameter; }) - .collect(Collectors.toList()); + .toList(); } } diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/Values.java b/uno-core/src/main/java/cc/allio/uno/core/util/Values.java index 5d82a88c..13132e87 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/Values.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/Values.java @@ -12,7 +12,6 @@ * 与值相关的操作 * * @author j.x - * @date 2024/2/19 17:42 * @since 1.1.7 */ public final class Values { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/BigDecimalComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/BigDecimalComparator.java index 10e8717c..e7ad222a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/BigDecimalComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/BigDecimalComparator.java @@ -7,7 +7,6 @@ * BigDecimal Comparator * * @author j.x - * @date 2022/7/10 15:58 * @since 1.0 */ public class BigDecimalComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/BooleanComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/BooleanComparator.java index f05399a7..2d933628 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/BooleanComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/BooleanComparator.java @@ -6,7 +6,6 @@ * Boolean Comparator * * @author j.x - * @date 2022/7/10 15:57 * @since 1.0 */ public class BooleanComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ByteComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ByteComparator.java index c9fa9f8f..c5e426dc 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ByteComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ByteComparator.java @@ -6,7 +6,6 @@ * Byte * * @author j.x - * @date 2022/7/10 16:00 * @since 1.0 */ public class ByteComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/CollectionComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/CollectionComparator.java index 522d3d1b..c229d9ba 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/CollectionComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/CollectionComparator.java @@ -15,7 +15,6 @@ * * * @author j.x - * @date 2022/7/10 16:01 * @since 1.0 */ public class CollectionComparator implements Comparator> { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/Comparators.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/Comparators.java index b0341ebf..5a7992dd 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/Comparators.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/Comparators.java @@ -10,7 +10,6 @@ * {@link java.util.Comparator}常用类型比较器 * * @author j.x - * @date 2024/2/13 14:54 * @since 1.1.7 */ public final class Comparators extends org.springframework.util.comparator.Comparators { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/DoubleComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/DoubleComparator.java index 68a98bde..dbd88518 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/DoubleComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/DoubleComparator.java @@ -6,7 +6,6 @@ * Double Comparator * * @author j.x - * @date 2022/7/10 14:59 * @since 1.0 */ public class DoubleComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/EqualsComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/EqualsComparator.java index 470b8971..6f5079b0 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/EqualsComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/EqualsComparator.java @@ -6,7 +6,6 @@ * Equals Comparator。基于{@link Object#equals(Object)} * * @author j.x - * @date 2022/7/10 16:16 * @since 1.0 */ public class EqualsComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/FloatComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/FloatComparator.java index 35070e7e..602c4467 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/FloatComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/FloatComparator.java @@ -6,7 +6,6 @@ * Float Comparator * * @author j.x - * @date 2022/7/10 17:41 * @since 1.0 */ public class FloatComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/IntegerComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/IntegerComparator.java index 5150c505..f637d7ff 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/IntegerComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/IntegerComparator.java @@ -6,7 +6,6 @@ * Integer Comparator * * @author j.x - * @date 2022/7/10 14:57 * @since 1.0 */ public class IntegerComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/LongComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/LongComparator.java index ed3f111d..9b12f663 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/LongComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/LongComparator.java @@ -6,7 +6,6 @@ * Long Comparator * * @author j.x - * @date 2022/7/10 15:58 * @since 1.0 */ public class LongComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ObjectComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ObjectComparator.java index 0a5289f1..f38f1033 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ObjectComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ObjectComparator.java @@ -8,7 +8,6 @@ * Object Comparator * * @author j.x - * @date 2022/7/10 16:02 * @since 1.0 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ShortComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ShortComparator.java index dab71e72..01976a35 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ShortComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/ShortComparator.java @@ -6,7 +6,6 @@ * Short Comparator * * @author j.x - * @date 2022/7/10 15:59 * @since 1.0 */ public class ShortComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/StringComparator.java b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/StringComparator.java index 66dd0340..fd5b12a3 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/comparator/StringComparator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/comparator/StringComparator.java @@ -6,7 +6,6 @@ * String Comparator，相等 = 1、不相等 = -1 * * @author j.x - * @date 2022/7/10 14:58 * @since 1.0 */ public class StringComparator implements Comparator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/id/IdGenerator.java b/uno-core/src/main/java/cc/allio/uno/core/util/id/IdGenerator.java index 86a89cec..17cdea85 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/id/IdGenerator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/id/IdGenerator.java @@ -4,7 +4,6 @@ * 分布式ID生成器 * * @author j.x - * @date 2022/1/26 09:46 * @see SnowflakeIdWorker * @since 1.0 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/id/InternalDataCenterIdGenerator.java b/uno-core/src/main/java/cc/allio/uno/core/util/id/InternalDataCenterIdGenerator.java index 1385d669..7702ae26 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/id/InternalDataCenterIdGenerator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/id/InternalDataCenterIdGenerator.java @@ -7,7 +7,6 @@ * 通过在类加载时把{@link SnowflakeIdWorker}根据数据中心ID值创建好，通过CAS获取每一个数据中心的分布式ID * * @author j.x - * @date 2022/1/26 09:43 * @since 1.0 */ public class InternalDataCenterIdGenerator implements IdGenerator { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/ExpressionTemplate.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/ExpressionTemplate.java index 98ebc949..6c1ac281 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/ExpressionTemplate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/ExpressionTemplate.java @@ -25,8 +25,6 @@ * Express模版。基于模版文件解析内容
* * @author j.x - * @date 2021/12/25 16:40 - * @modify 1.1.9 * @see PlaceholderExpressionTemplate * @see #createMVEL() create a {@link MVELExpressionTemplate} * @see #defaultTemplate() use internal {@link PlaceholderExpressionTemplate} diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/ExpressionTemplateNavigator.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/ExpressionTemplateNavigator.java index cd06eea7..4149aed8 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/ExpressionTemplateNavigator.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/ExpressionTemplateNavigator.java @@ -10,7 +10,6 @@ *

if {@link Tokenizer#AT_BRACE} then use {@link MVELExpressionTemplate} otherwise {@link PlaceholderExpressionTemplate}

* * @author j.x - * @date 2024/5/3 21:32 * @since 1.1.9 */ public class ExpressionTemplateNavigator implements ExpressionTemplate { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/TemplateContext.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/TemplateContext.java index 3249b865..d5c889d9 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/TemplateContext.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/TemplateContext.java @@ -21,7 +21,6 @@ * * * @author j.x - * @date 2024/5/3 20:12 * @since 1.1.9 */ public class TemplateContext implements OptionalContext { @@ -125,4 +124,4 @@ public void addImport(String key, Class importClass) { public void addVariableResolve(Class variableType, VariableResolve variableResolve) { this.variableResolveMap.put(variableType, variableResolve); } -} \ No newline at end of file +} diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/Tokenizer.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/Tokenizer.java index d03d18b3..dad7a111 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/Tokenizer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/Tokenizer.java @@ -9,8 +9,7 @@ * 用于{@link TokenParser}解析的Token解析 * * @author j.x - * @date 2022/12/3 16:24 - * @since 1.1.1.RELEASE + * @since 1.1.1 */ @FunctionalInterface public interface Tokenizer { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/VariableResolve.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/VariableResolve.java index 987e21e0..828bac13 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/VariableResolve.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/VariableResolve.java @@ -8,7 +8,6 @@ * @param type T * @param translate R * @author j.x - * @date 2024/5/4 14:12 * @since 1.1.9 */ public interface VariableResolve extends MethodFunction { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/BaseInterchange.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/BaseInterchange.java index 8221736f..fa088e5c 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/BaseInterchange.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/BaseInterchange.java @@ -4,7 +4,6 @@ * 抽象的交换 * * @author j.x - * @date 2022/12/3 20:19 * @since 1.1.2 */ public abstract class BaseInterchange implements Interchange { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/BeanInterchange.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/BeanInterchange.java index 91d46838..2b957721 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/BeanInterchange.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/BeanInterchange.java @@ -7,7 +7,6 @@ * Bean对象替换 * * @author j.x - * @date 2022/12/3 19:38 * @since 1.1.2 */ public class BeanInterchange extends BaseInterchange implements KeyInterchange { @@ -22,4 +21,4 @@ protected Object onChange(String text, Object value, boolean langsym) { protected boolean onCheck(Object value) { return Types.isBean(value.getClass()); } -} \ No newline at end of file +} diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Engine.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Engine.java index 322155cf..fbdcd689 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Engine.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Engine.java @@ -4,7 +4,6 @@ * 表达式替换引擎 * * @author j.x - * @date 2022/12/3 19:48 * @since 1.1.2 */ public interface Engine { @@ -16,7 +15,6 @@ public interface Engine { * @param value 赋予值 * @param langsym 是否保留语言符合，如 true = "2" false = 2 * @return 结果 - * @throws Throwable 运行过程中出现错误时抛出 */ String run(String expression, Object value, boolean langsym); } diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/GenericTokenParser.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/GenericTokenParser.java index 9dca5f63..8bbdf9b7 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/GenericTokenParser.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/GenericTokenParser.java @@ -7,7 +7,6 @@ * 通用Token解析器，指定Token解析成指定的内容，比如说：#{token}替换成指定的内容 * * @author j.x - * @date 2022/1/29 16:40 * @see TokenHandler * @since 1.0 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Interchange.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Interchange.java index 0bf30b3d..40080c81 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Interchange.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Interchange.java @@ -7,7 +7,6 @@ * 表达式交换定义 * * @author j.x - * @date 2022/12/3 19:35 * @since 1.1.2 */ public interface Interchange { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/KeyInterchange.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/KeyInterchange.java index dba04e65..3bf9ff56 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/KeyInterchange.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/KeyInterchange.java @@ -4,7 +4,6 @@ * Key结构 * * @author j.x - * @date 2022/12/3 19:37 * @since 1.1.2 */ public interface KeyInterchange extends Interchange { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/LangValue.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/LangValue.java index d08f6230..51dd6ff2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/LangValue.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/LangValue.java @@ -7,7 +7,6 @@ * 语言值。当它被解析的时候按照{@link #langsym}的true、fasle来判断是否把String 32 = "32" * * @author j.x - * @date 2023/4/23 20:25 * @see BaseInterchange * @since 1.1.4 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Layer.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Layer.java index c892d0ca..88523d80 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Layer.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/Layer.java @@ -8,7 +8,6 @@ * 运行时的Layer * * @author j.x - * @date 2022/12/3 19:34 * @since 1.1.2 */ @Data diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/ListInterchange.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/ListInterchange.java index 23adca1c..0f0d853a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/ListInterchange.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/ListInterchange.java @@ -10,7 +10,6 @@ * {@link java.util.List}进行替换 * * @author j.x - * @date 2022/12/3 19:38 * @since 1.1.2 */ public class ListInterchange extends BaseInterchange implements ListableInterchange { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/ListableInterchange.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/ListableInterchange.java index 9dd74290..045dfa25 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/ListableInterchange.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/ListableInterchange.java @@ -4,7 +4,6 @@ * 列表结构 * * @author j.x - * @date 2022/12/3 19:37 * @since 1.1.2 */ public interface ListableInterchange extends Interchange { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/MapInterchange.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/MapInterchange.java index a671e462..177ee78e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/MapInterchange.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/MapInterchange.java @@ -8,7 +8,6 @@ * Map替换。 * * @author j.x - * @date 2022/12/3 19:38 * @since 1.1.2 */ public class MapInterchange extends BaseInterchange implements KeyInterchange { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/PlaceholderExpressionTemplate.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/PlaceholderExpressionTemplate.java index 042ec4b2..08f3c8b2 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/PlaceholderExpressionTemplate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/PlaceholderExpressionTemplate.java @@ -33,7 +33,6 @@ * * * @author j.x - * @date 2021/12/25 16:46 * @see Tokenizer * @since 1.0 */ @@ -63,4 +62,4 @@ public String parseTemplate(@NonNull String template, TemplateContext context) { return engine.run(expression, vars, langsym); }); } -} \ No newline at end of file +} diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/SymbolEngine.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/SymbolEngine.java index d06c82c4..7cb3ab87 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/SymbolEngine.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/SymbolEngine.java @@ -9,7 +9,6 @@ * 使用指定的'symbol'如（',' '.'）对表达式进行切分，使其进行分层级构建{@link Interchange}对象，并调用其{@link Interchange#change(String, Object, boolean)}方法获取当前层级的Value值 * * @author j.x - * @date 2022/12/3 20:13 * @since 1.1.2 */ public class SymbolEngine implements Engine { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/TokenHandler.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/TokenHandler.java index 4150eec4..f0841978 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/TokenHandler.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/TokenHandler.java @@ -6,7 +6,6 @@ * Token处理器 * * @author j.x - * @date 2022/1/29 16:39 * @see GenericTokenParser * @since 1.0 */ diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/TokenParser.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/TokenParser.java index ac805681..6946fc9a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/TokenParser.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/internal/TokenParser.java @@ -6,9 +6,7 @@ * 按照指定的Token标识符号（如#{}、{{}}）等等TOKEN来对文本内容进行解析 * * @author j.x - * @date 2022/12/3 13:34 * @see GenericTokenParser - * @since 2.9.0-RELEASE */ public interface TokenParser { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/CharsetOutputStream.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/CharsetOutputStream.java index e2a55d95..5b9c300a 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/CharsetOutputStream.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/CharsetOutputStream.java @@ -9,7 +9,6 @@ * solution messy code * * @author j.x - * @date 2024/5/29 19:30 * @since 1.1.9 */ public class CharsetOutputStream implements TemplateOutputStream { diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/MVELExpressionTemplate.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/MVELExpressionTemplate.java index 735b9532..97e96c5e 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/MVELExpressionTemplate.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/MVELExpressionTemplate.java @@ -19,7 +19,6 @@ * according to mvel {@link TemplateRuntime} as parser * * @author j.x - * @date 2024/5/3 20:07 * @since 1.1.9 */ @Slf4j diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/TemplateContextVariableResolverFactory.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/TemplateContextVariableResolverFactory.java index 7bc91732..0c753ac8 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/TemplateContextVariableResolverFactory.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/TemplateContextVariableResolverFactory.java @@ -10,7 +10,6 @@ * {@link TemplateContext} * * @author j.x - * @date 2024/5/4 14:11 * @since 1.1.9 */ public class TemplateContextVariableResolverFactory extends MapVariableResolverFactory { @@ -63,4 +62,4 @@ public VariableResolver getVariableResolver(String name) { throw new UnresolveablePropertyException("unable to resolve variable '" + name + "'"); } } -} \ No newline at end of file +} diff --git a/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/TypeVariableResolver.java b/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/TypeVariableResolver.java index 59e9fd56..e361b4a6 100644 --- a/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/TypeVariableResolver.java +++ b/uno-core/src/main/java/cc/allio/uno/core/util/template/mvel/TypeVariableResolver.java @@ -11,7 +11,6 @@ * ues {@link VariableResolve} for specifies type parse, otherwise use {@link MapVariableResolver} * * @author j.x - * @date 2024/5/4 14:11 * @since 1.1.9 */ public class TypeVariableResolver extends MapVariableResolver { diff --git a/uno-core/src/test/java/cc/allio/uno/core/bean/BeanInfoWrapperTest.java b/uno-core/src/test/java/cc/allio/uno/core/bean/BeanInfoWrapperTest.java index 42d5d476..f3f948a3 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/bean/BeanInfoWrapperTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/bean/BeanInfoWrapperTest.java @@ -16,7 +16,6 @@ * BeanInfoWrapper 单元测试 * * @author j.x - * @date 2022/7/3 00:12 * @since 1.0 */ class BeanInfoWrapperTest extends BaseTestCase { diff --git a/uno-core/src/test/java/cc/allio/uno/core/bus/SubscriptionTest.java b/uno-core/src/test/java/cc/allio/uno/core/bus/SubscriptionTest.java index b98eed88..eb94cba4 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/bus/SubscriptionTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/bus/SubscriptionTest.java @@ -12,7 +12,6 @@ * 订阅信息单元测试 * * @author j.x - * @date 2022/2/7 17:53 * @since 1.0 */ class SubscriptionTest extends BaseTestCase { diff --git a/uno-core/src/test/java/cc/allio/uno/core/cache/InMemoryCacheTest.java b/uno-core/src/test/java/cc/allio/uno/core/cache/InMemoryCacheTest.java index 87c0fc6c..3b2f0c6a 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/cache/InMemoryCacheTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/cache/InMemoryCacheTest.java @@ -7,7 +7,6 @@ * 内容缓存测试 * * @author j.x - * @date 2022/2/9 16:46 * @since 1.0 */ class InMemoryCacheTest extends BaseTestCase { diff --git a/uno-core/src/test/java/cc/allio/uno/core/cache/InitializationCacheTest.java b/uno-core/src/test/java/cc/allio/uno/core/cache/InitializationCacheTest.java index d72ef849..147b7eec 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/cache/InitializationCacheTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/cache/InitializationCacheTest.java @@ -8,7 +8,6 @@ * 测试进行初始化设置的缓存 * * @author j.x - * @date 2022/2/10 13:06 * @since 1.0 */ class InitializationCacheTest extends BaseTestCase { diff --git a/uno-core/src/test/java/cc/allio/uno/core/chain/DefaultChainTest.java b/uno-core/src/test/java/cc/allio/uno/core/chain/DefaultChainTest.java index 1ed243a3..10515e2e 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/chain/DefaultChainTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/chain/DefaultChainTest.java @@ -11,7 +11,6 @@ * 默认链测试 * * @author j.x - * @date 2022/8/25 13:32 * @since 1.0 */ class DefaultChainTest extends BaseTestCase { diff --git a/uno-core/src/test/java/cc/allio/uno/core/serializer/ProtoStuffSerializerTest.java b/uno-core/src/test/java/cc/allio/uno/core/serializer/ProtoStuffSerializerTest.java index ad01e430..c5eadb65 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/serializer/ProtoStuffSerializerTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/serializer/ProtoStuffSerializerTest.java @@ -6,8 +6,7 @@ /** * Protostuff序列化器测试 * - * @author jw - * @date 2021/12/2 16:55 + * @author j.x */ class ProtoStuffSerializerTest extends BaseTestCase { diff --git a/uno-core/src/test/java/cc/allio/uno/core/spi/FactoriesLoaderTest.java b/uno-core/src/test/java/cc/allio/uno/core/spi/FactoriesLoaderTest.java index 2ae983f2..28ca70cb 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/spi/FactoriesLoaderTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/spi/FactoriesLoaderTest.java @@ -10,7 +10,6 @@ * 单元测试FactoriesLoader * * @author j.x - * @date 2022/4/1 10:10 * @see FactoriesLoader * @since 1.0.6 */ diff --git a/uno-core/src/test/java/cc/allio/uno/core/util/DateUtilTest.java b/uno-core/src/test/java/cc/allio/uno/core/util/DateUtilTest.java index 636c4478..8202a4f0 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/util/DateUtilTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/util/DateUtilTest.java @@ -10,7 +10,6 @@ * 时间工具类测试 * * @author j.x - * @date 2022/7/6 11:56 * @since 1.0 */ class DateUtilTest extends BaseTestCase { diff --git a/uno-core/src/test/java/cc/allio/uno/core/util/StringUtilBaseTest.java b/uno-core/src/test/java/cc/allio/uno/core/util/StringUtilBaseTest.java index f6eaa383..2ed93257 100644 --- a/uno-core/src/test/java/cc/allio/uno/core/util/StringUtilBaseTest.java +++ b/uno-core/src/test/java/cc/allio/uno/core/util/StringUtilBaseTest.java @@ -17,8 +17,7 @@ /** * 字符串工具集测试 * - * @author jw - * @date 2021/12/7 0:12 + * @author j.x */ class StringUtilBaseTest extends BaseTestCase { diff --git a/uno-data/pom.xml b/uno-data/pom.xml index 6916015d..c3e3c2cb 100644 --- a/uno-data/pom.xml +++ b/uno-data/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - uno - cc.allio - 1.1.9 + uno-parent + cc.allio.uno + 1.2.0 pom 4.0.0 uno-data - 1.1.9 + 1.2.0 summary: uno数据层操作，包含于数据源、mybatis-plus、reactive-jpa、elasticsearch、influxdb等 features: 提供数据聚合等操作 @@ -32,14 +32,18 @@ - cc.allio + cc.allio.uno uno-starter-core - cc.allio + cc.allio.uno uno-auto provided + + org.junit.jupiter + junit-jupiter-api + org.springframework.boot spring-boot-starter-test @@ -52,4 +56,4 @@ - \ No newline at end of file + diff --git a/uno-data/uno-data-api/pom.xml b/uno-data/uno-data-api/pom.xml index c8487194..071d2070 100644 --- a/uno-data/uno-data-api/pom.xml +++ b/uno-data/uno-data-api/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml jar @@ -27,9 +27,9 @@ - cc.allio + cc.allio.uno uno-test test - \ No newline at end of file + diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/annotation/LogicDelete.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/annotation/LogicDelete.java index 22ae7943..74176fa2 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/annotation/LogicDelete.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/annotation/LogicDelete.java @@ -18,7 +18,6 @@ * * * @author j.x - * @date 2024/2/19 16:16 * @since 1.1.7 */ @Documented diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/BinaryCondition.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/BinaryCondition.java index a4ddef9a..c4e22edd 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/BinaryCondition.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/BinaryCondition.java @@ -7,7 +7,6 @@ * SQL二元操作 * * @author j.x - * @date 2023/4/13 12:07 * @since 1.1.4 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ColumnDef.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ColumnDef.java index 45723107..36e10150 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ColumnDef.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ColumnDef.java @@ -15,7 +15,6 @@ * DSL字段定义 * * @author j.x - * @date 2023/4/12 19:35 * @see ColumnDefBuilder * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Condition.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Condition.java index 1f045c66..53023452 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Condition.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Condition.java @@ -4,7 +4,6 @@ * SQL条件，如'OR'、'WHERE'... * * @author j.x - * @date 2023/1/5 10:47 * @since 1.1.4 */ public interface Condition { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/DSLName.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/DSLName.java index e00bffce..68ef5ecc 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/DSLName.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/DSLName.java @@ -13,7 +13,6 @@ * dsl name 如 xxxx name、column name...根据指定格式化转换对应的name * * @author j.x - * @date 2023/4/17 16:16 * @since 1.1.4 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/DataBaseOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/DataBaseOperator.java index 0b3db8a1..fe06d63b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/DataBaseOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/DataBaseOperator.java @@ -6,7 +6,6 @@ * database relevant operator * * @author j.x - * @date 2024/2/15 11:43 * @since 1.1.7 */ public interface DataBaseOperator> extends Self { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Database.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Database.java index 20eb88b0..c31379f9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Database.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Database.java @@ -6,7 +6,6 @@ * 数据库信息 * * @author j.x - * @date 2024/1/4 18:32 * @since 1.1.7 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Func.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Func.java index e5f66b1b..a0c17a99 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Func.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Func.java @@ -7,7 +7,6 @@ * SQL Func * * @author j.x - * @date 2023/1/12 16:19 * @since 1.1.4 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JDBCTypes.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JDBCTypes.java index f4bc5514..d842f732 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JDBCTypes.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JDBCTypes.java @@ -7,7 +7,6 @@ * 处理JDBC相关类型 * * @author j.x - * @date 2023/1/5 19:59 * @since 1.1.4 */ public class JDBCTypes extends Types { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinTable.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinTable.java index 6de99845..d1f5a91b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinTable.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinTable.java @@ -7,7 +7,6 @@ * JOIN Table * * @author j.x - * @date 2023/4/13 12:23 * @since 1.1.4 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinType.java index e6cbbf03..ac24f573 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinType.java @@ -4,7 +4,6 @@ * SQL join * * @author j.x - * @date 2023/4/13 12:05 * @since 1.1.4 */ public enum JoinType { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinTypeAdapter.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinTypeAdapter.java index 7d2b25a6..2ae84923 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinTypeAdapter.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/JoinTypeAdapter.java @@ -6,7 +6,6 @@ * join type adapter * * @author j.x - * @date 2023/4/13 13:23 * @since 1.1.4 */ public interface JoinTypeAdapter extends Adapter { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Meta.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Meta.java index 2267eb60..5d43acc8 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Meta.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Meta.java @@ -7,7 +7,6 @@ * definition 'Meta data' * * @author j.x - * @date 2024/4/16 15:05 * @since 1.1.8 */ public interface Meta> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/MetaAcceptor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/MetaAcceptor.java index b4f6ee41..7b4d07c7 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/MetaAcceptor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/MetaAcceptor.java @@ -11,7 +11,6 @@ * * * @author j.x - * @date 2024/4/16 15:03 * @since 1.1.8 */ public interface MetaAcceptor> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/MetaAcceptorSet.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/MetaAcceptorSet.java index 0ce51dc1..6cb4f783 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/MetaAcceptorSet.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/MetaAcceptorSet.java @@ -6,7 +6,6 @@ * {@link MetaAcceptor} Set * * @author j.x - * @date 2024/4/16 15:36 * @since 1.1.8 */ public interface MetaAcceptorSet { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Operator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Operator.java index 8c0a3bc2..6548b737 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Operator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Operator.java @@ -39,9 +39,7 @@ *

* * @author j.x - * @date 2023/4/12 19:44 * @since 1.1.4 - * @modify 1.1.9 * @see DeleteOperator * @see InsertOperator * @see QueryOperator diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/OperatorKey.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/OperatorKey.java index 419de106..4898dddf 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/OperatorKey.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/OperatorKey.java @@ -12,7 +12,6 @@ * OperatorKey * * @author j.x - * @date 2024/1/3 22:48 * @since 1.1.7 */ public interface OperatorKey extends Key { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/OrderCondition.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/OrderCondition.java index 181dd50f..4f01def5 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/OrderCondition.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/OrderCondition.java @@ -7,7 +7,6 @@ * order condition * * @author j.x - * @date 2023/1/5 10:52 * @since 1.1.4 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareOperator.java index 60b0b32b..71e9b8c4 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareOperator.java @@ -14,7 +14,6 @@ * SQL prepare operator * * @author j.x - * @date 2023/4/16 15:47 * @see PreparedStatement * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareOperatorImpl.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareOperatorImpl.java index d1329f61..e088f363 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareOperatorImpl.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareOperatorImpl.java @@ -10,7 +10,6 @@ * SQLPrepareOperatorImpl * * @author j.x - * @date 2023/4/16 18:19 * @since 1.1.4 */ public abstract class PrepareOperatorImpl> implements PrepareOperator { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareValue.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareValue.java index 1c366d90..f53984e2 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareValue.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/PrepareValue.java @@ -13,7 +13,6 @@ * 预处理SQL值对象 * * @author j.x - * @date 2023/4/16 15:47 * @since 1.1.4 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/SPIOperatorHelper.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/SPIOperatorHelper.java index 5695d7bc..3ca18229 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/SPIOperatorHelper.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/SPIOperatorHelper.java @@ -23,7 +23,6 @@ * Helper * * @author j.x - * @date 2024/1/3 22:25 * @since 1.1.7 */ @Slf4j @@ -57,6 +56,9 @@ public static > T lazyGet(Class operatorClass, Operator return ifNullThenAgain( () -> { OperatorTraitGroup operatorTraitGroup = OTG_CACHES.get(operatorKey); + if (operatorTraitGroup == null) { + throw new DSLException(String.format("From Operator %s not found any OperatorTraitGroup", operatorKey.key())); + } OperatorTrait operatorTrait; Lock readLock = lock.readLock(); try { @@ -66,8 +68,8 @@ public static > T lazyGet(Class operatorClass, Operator throw new DSLException( String.format( "On the basis of SPI load operator %s and %s, " + - "but not found counterpart Impl, " + - "Please Check the Impl Has Annotation @AutoService", operatorKey.key(), operatorClass.getName())); + "but not found counterpart Impl, " + + "Please Check the Impl Has Annotation @AutoService", operatorKey.key(), operatorClass.getName())); } } finally { readLock.unlock(); @@ -119,7 +121,7 @@ private static T ifNullThenAgain(SupplierAction action, VoidConsumer comp * 基于SPI加载{@link Operator}的类型，放入缓存 */ private static void loadOperatorBySPI(Class> operatorClass) { - ServiceLoader> loader = ServiceLoader.load(operatorClass, ClassLoader.getSystemClassLoader()); + ServiceLoader> loader = ServiceLoader.load(operatorClass); boolean present = loader.stream().findAny().isPresent(); if (!present) { Class[] interfaces = operatorClass.getInterfaces(); diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Table.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Table.java index afd08e18..cb811e46 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Table.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Table.java @@ -7,7 +7,6 @@ * 表 * * @author j.x - * @date 2023/1/9 12:16 * @since 1.1.4 */ @Data @@ -96,4 +95,4 @@ public static Table of(DSLName name, String alias) { table.setAlias(alias); return table; } -} \ No newline at end of file +} diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TableOperator.java index 9f15575c..b828ad3c 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TableOperator.java @@ -8,7 +8,6 @@ * Table Operator (xxxx xxx) * * @author j.x - * @date 2023/4/16 18:07 * @since 1.1.4 */ public interface TableOperator> extends Operator { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Token.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Token.java index dc6854be..a1e4d00a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Token.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/Token.java @@ -4,7 +4,6 @@ * SQL 相关字符 * * @author j.x - * @date 2023/4/13 13:06 * @since 1.1.4 */ public enum Token { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TokenOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TokenOperator.java index c4b3851b..f9013a45 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TokenOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TokenOperator.java @@ -7,7 +7,6 @@ * SQL相关的操作符 * * @author j.x - * @date 2023/4/13 13:10 * @since 1.1.4 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TokenOperatorAdapter.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TokenOperatorAdapter.java index 2e415a15..6a90d474 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TokenOperatorAdapter.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/TokenOperatorAdapter.java @@ -6,7 +6,6 @@ * SQL operator * * @author j.x - * @date 2023/4/13 13:13 * @since 1.1.4 */ public interface TokenOperatorAdapter extends Adapter { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/UnaryOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/UnaryOperator.java index d2fbc187..b8a31186 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/UnaryOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/UnaryOperator.java @@ -7,7 +7,6 @@ * SQL 一元操作符 * * @author j.x - * @date 2023/2/27 19:04 * @since 1.1.4 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/UnrecognizedOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/UnrecognizedOperator.java index cae37850..1cdc0d9c 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/UnrecognizedOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/UnrecognizedOperator.java @@ -4,7 +4,6 @@ * not belong to 'ddl' and 'dml' * * @author j.x - * @date 2024/7/25 18:33 * @since 1.1.9 */ public interface UnrecognizedOperator> extends Operator { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/WhereOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/WhereOperator.java index 2f777229..95bce930 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/WhereOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/WhereOperator.java @@ -32,7 +32,6 @@ * * * @author j.x - * @date 2023/4/16 18:14 * @since 1.1.4 */ public interface WhereOperator> extends Self { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/AlterTableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/AlterTableOperator.java index 527c1dfd..4dba4944 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/AlterTableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/AlterTableOperator.java @@ -13,7 +13,6 @@ * DSL修改表以及相关字段操作 * * @author j.x - * @date 2023/6/8 19:21 * @see Operators * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/CreateTableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/CreateTableOperator.java index 05716062..1f5df78a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/CreateTableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/CreateTableOperator.java @@ -14,7 +14,6 @@ * Create Operator * * @author j.x - * @date 2023/4/12 19:42 * @see Operators * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/DropTableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/DropTableOperator.java index 8d713c34..aa98370d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/DropTableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/DropTableOperator.java @@ -8,7 +8,6 @@ * Drop Operator * * @author j.x - * @date 2023/4/16 12:52 * @see Operators * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ExistTableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ExistTableOperator.java index a9f0ea3a..3fb81270 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ExistTableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ExistTableOperator.java @@ -8,7 +8,6 @@ * Exist Operator * * @author j.x - * @date 2023/4/17 09:46 * @since 1.1.4 * @see Operators */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ShowColumnsOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ShowColumnsOperator.java index c44f2bc6..a7e59cc9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ShowColumnsOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ShowColumnsOperator.java @@ -10,7 +10,6 @@ * Show Columns * * @author j.x - * @date 2023/6/8 19:19 * @see Operators * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ShowTablesOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ShowTablesOperator.java index 4cf6f744..4441dbad 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ShowTablesOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/ddl/ShowTablesOperator.java @@ -8,7 +8,6 @@ * Show Tables Operator * * @author j.x - * @date 2024/1/4 16:56 * @see Operators * @since 1.1.7 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dialect/TypeTranslator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dialect/TypeTranslator.java index c9e3f199..4775b108 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dialect/TypeTranslator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dialect/TypeTranslator.java @@ -7,7 +7,6 @@ * 不同数据类型方言转换器 * * @author j.x - * @date 2024/1/8 19:33 * @since 1.1.7 */ public interface TypeTranslator { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/DeleteOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/DeleteOperator.java index 9d994217..c5a95913 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/DeleteOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/DeleteOperator.java @@ -9,7 +9,6 @@ * DeleteOperator * * @author j.x - * @date 2023/4/16 18:42 * @see Operators * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/InsertOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/InsertOperator.java index 4b638143..77e2feb9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/InsertOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/InsertOperator.java @@ -18,7 +18,6 @@ *

值得注意的是每调用一次{@link #insert(String, Object)}API，都会生成一个VALUES。建议调用{@link #batchInserts(List, List)}API批量生成

* * @author j.x - * @date 2023/4/13 15:25 * @see Operators * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/QueryOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/QueryOperator.java index 94572710..5425fa3d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/QueryOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/QueryOperator.java @@ -16,7 +16,6 @@ * Query Operator * * @author j.x - * @date 2023/4/12 23:02 * @see Operators * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/UpdateOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/UpdateOperator.java index d6df56e6..2ec91050 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/UpdateOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/dml/UpdateOperator.java @@ -17,7 +17,6 @@ * Update Operator * * @author j.x - * @date 2023/4/16 15:19 * @see Operators * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DDLException.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DDLException.java index e574d904..22d2fe19 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DDLException.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DDLException.java @@ -4,7 +4,6 @@ * DDL exception 是一个运行时异常 * * @author j.x - * @date 2024/2/8 13:57 * @since 1.1.7 */ public class DDLException extends RuntimeException { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DMLException.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DMLException.java index 8f8f5939..e94e72a0 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DMLException.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DMLException.java @@ -4,7 +4,6 @@ * DML exception 是一个运行时异常 * * @author j.x - * @date 2024/2/8 13:58 * @since 1.1.7 */ public class DMLException extends RuntimeException { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DSLException.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DSLException.java index c254d583..a222eb07 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DSLException.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/exception/DSLException.java @@ -4,7 +4,6 @@ * SQL相关操作时抛出的异常，他是一个运行时异常 * * @author j.x - * @date 2022/9/30 10:44 * @since 1.1.0 */ public class DSLException extends RuntimeException { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefListResolve.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefListResolve.java index b3d0e2a0..bcd30e7b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefListResolve.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefListResolve.java @@ -6,7 +6,6 @@ * 加在pojo上，由它自身提供column的定义 * * @author j.x - * @date 2024/2/6 20:39 * @since 1.1.7 */ @Documented diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefListResolver.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefListResolver.java index f0252464..25818a29 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefListResolver.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefListResolver.java @@ -8,7 +8,6 @@ * 根据class解析出column的定义 * * @author j.x - * @date 2024/2/6 20:40 * @since 1.1.7 */ public interface ColumnDefListResolver { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefResolve.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefResolve.java index 3cb44f60..b916eb8e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefResolve.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefResolve.java @@ -6,7 +6,6 @@ * 用于在{@link PojoWrapper#getColumnDefs()}进行使用 * * @author j.x - * @date 2024/2/6 20:07 * @since 1.1.7 */ @Documented diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefResolver.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefResolver.java index 23ea01f4..6384ff1c 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefResolver.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/ColumnDefResolver.java @@ -8,7 +8,6 @@ * 根据指定的{@link java.lang.reflect.Field}解析出{@link cc.allio.uno.data.orm.dsl.ColumnDef} * * @author j.x - * @date 2024/2/6 20:08 * @see ColumnDefResolve * @since 1.1.7 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoInspect.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoInspect.java index 74c44dd1..2c538364 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoInspect.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoInspect.java @@ -4,7 +4,6 @@ * POJO相关的检查器 * * @author j.x - * @date 2024/2/16 20:42 * @since 1.1.7 */ public interface PojoInspect { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoInspection.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoInspection.java index b2264542..c7748460 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoInspection.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoInspection.java @@ -6,7 +6,6 @@ * 加在实体类，决定该pojo如何进行检查 * * @author j.x - * @date 2024/2/6 20:39 * @since 1.1.7 */ @Documented diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoResolver.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoResolver.java index b8166ccf..0ff428e2 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoResolver.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoResolver.java @@ -4,7 +4,6 @@ * pojo相关的Resolver * * @author j.x - * @date 2024/2/6 23:32 * @since 1.1.7 */ public interface PojoResolver { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoWrapper.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoWrapper.java index 5cb94a26..0c1b53ad 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoWrapper.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/PojoWrapper.java @@ -54,7 +54,6 @@ * * * @author j.x - * @date 2023/7/4 17:14 * @see #getInstance(Object) * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/TableResolve.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/TableResolve.java index 005a7a8f..5736c418 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/TableResolve.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/TableResolve.java @@ -6,7 +6,6 @@ * 在{@link PojoWrapper#findTable(Class)}时使用 * * @author j.x - * @date 2024/2/6 20:06 * @since 1.1.7 */ @Documented diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/TableResolver.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/TableResolver.java index 8123dd74..e59a4fd1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/TableResolver.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/helper/TableResolver.java @@ -6,7 +6,6 @@ * 根据指定的实体类，解析出表名 * * @author j.x - * @date 2024/2/6 20:05 * @see TableResolve * @since 1.1.7 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/BiLogical.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/BiLogical.java index f243b30f..5170d3b7 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/BiLogical.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/BiLogical.java @@ -4,7 +4,6 @@ * the binary of logical * * @author j.x - * @date 2024/3/12 01:39 * @since 1.1.7 */ public interface BiLogical { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/Logical.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/Logical.java index 4eda36f9..25f768b2 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/Logical.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/Logical.java @@ -4,7 +4,6 @@ * describe DSL logic predicate * * @author j.x - * @date 2024/3/12 01:38 * @since 1.1.7 */ public enum Logical { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/QueLogical.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/QueLogical.java index fc53b392..e441dd4e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/QueLogical.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/QueLogical.java @@ -4,7 +4,6 @@ * the quaternary logical * * @author j.x - * @date 2024/3/12 01:44 * @since 1.1.7 */ public interface QueLogical { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/TerLogical.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/TerLogical.java index 5f779da6..41ec9ee1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/TerLogical.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/logical/TerLogical.java @@ -4,7 +4,6 @@ * the ternary logical * * @author j.x - * @date 2024/3/12 01:42 * @since 1.1.7 */ public interface TerLogical { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorAlterTableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorAlterTableOperator.java index 89a00b61..a94a1768 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorAlterTableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorAlterTableOperator.java @@ -14,7 +14,6 @@ * wrapper for {@link AlterTableOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 16:30 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorCreateTableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorCreateTableOperator.java index 328e1041..dd9f272a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorCreateTableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorCreateTableOperator.java @@ -16,7 +16,6 @@ * wrapper for {@link CreateTableOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 16:14 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorDeleteOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorDeleteOperator.java index c535135c..9b8d14ae 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorDeleteOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorDeleteOperator.java @@ -13,7 +13,6 @@ * wrapper for {@link DeleteOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 16:11 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorDropTableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorDropTableOperator.java index c9b5dc85..ebef808b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorDropTableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorDropTableOperator.java @@ -15,7 +15,6 @@ * wrapper for {@link DropTableOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 16:17 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorExistTableOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorExistTableOperator.java index c2839a71..66ab8ad1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorExistTableOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorExistTableOperator.java @@ -16,7 +16,6 @@ * wrapper for {@link ExistTableOperator} * * @author j.x - * @date 2024/4/21 16:19 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorInsertOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorInsertOperator.java index 516b629f..43b78a76 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorInsertOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorInsertOperator.java @@ -15,7 +15,6 @@ * wrapper for {@link InsertOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 16:05 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorQueryOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorQueryOperator.java index 639a44bb..21febedf 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorQueryOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorQueryOperator.java @@ -15,7 +15,6 @@ * wrapper for {@link QueryOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 15:54 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorSetOperatorGroup.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorSetOperatorGroup.java index bf7968bc..9fb9169d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorSetOperatorGroup.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorSetOperatorGroup.java @@ -14,7 +14,6 @@ *

enhance {@link Operator#obtainMetaAcceptorSet()} load by proxy

* * @author j.x - * @date 2024/4/21 15:31 * @since 1.1.8 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorShowColumnsOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorShowColumnsOperator.java index 47086189..2bc55a1a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorShowColumnsOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorShowColumnsOperator.java @@ -14,7 +14,6 @@ * wrapper for {@link ShowColumnsOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 16:21 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorShowTablesOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorShowTablesOperator.java index f6f071f9..35303269 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorShowTablesOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorShowTablesOperator.java @@ -14,7 +14,6 @@ * wrapper for {@link ShowTablesOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 16:23 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorUpdateOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorUpdateOperator.java index 02bada53..a9b93adc 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorUpdateOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/MetaAcceptorUpdateOperator.java @@ -15,7 +15,6 @@ * wrapper for {@link UpdateOperator} from {@link MetaAcceptorSet} * * @author j.x - * @date 2024/4/21 16:08 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/Operators.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/Operators.java index e669b587..33f1a6de 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/Operators.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/Operators.java @@ -12,7 +12,6 @@ * 操作管理接口 * * @author j.x - * @date 2023/4/13 18:52 * @see Operator * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/WrapperOperator.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/WrapperOperator.java index 0677b008..f5f05c44 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/WrapperOperator.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/opeartorgroup/WrapperOperator.java @@ -6,7 +6,6 @@ * describe how to wrapper {@link Operator} * * @author j.x - * @date 2024/4/21 17:24 * @since 1.1.8 */ public interface WrapperOperator { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ArrayJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ArrayJavaType.java index 2684940f..096d21f9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ArrayJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ArrayJavaType.java @@ -6,7 +6,6 @@ * java array * * @author j.x - * @date 2023/4/14 18:58 * @since 1.1.4 */ public class ArrayJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BeanJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BeanJavaType.java index b5d369d5..584a4f41 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BeanJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BeanJavaType.java @@ -6,7 +6,6 @@ * java bean type * * @author j.x - * @date 2024/4/2 18:56 * @since 1.1.8 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BigDecimalJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BigDecimalJavaType.java index 7ca1f80e..2b70125d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BigDecimalJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BigDecimalJavaType.java @@ -8,7 +8,6 @@ * big decimal java type * * @author j.x - * @date 2023/1/13 18:16 * @since 1.1.4 */ public class BigDecimalJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BooleanJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BooleanJavaType.java index 1a62212d..2b343d8e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BooleanJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/BooleanJavaType.java @@ -6,7 +6,6 @@ * boolean java type * * @author j.x - * @date 2023/1/16 09:49 * @since 1.1.4 */ public class BooleanJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ByteJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ByteJavaType.java index 3a8719a9..a0a2c46d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ByteJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ByteJavaType.java @@ -6,7 +6,6 @@ * byte java type * * @author j.x - * @date 2023/4/16 16:43 * @since 1.1.4 */ public class ByteJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/CharArrayJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/CharArrayJavaType.java index d0d68b38..a2c13aef 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/CharArrayJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/CharArrayJavaType.java @@ -4,7 +4,6 @@ * 标识类，标识为char[]类型 * * @author j.x - * @date 2023/4/14 18:59 * @since 1.1.4 */ public class CharArrayJavaType extends ArrayJavaType { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DBType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DBType.java index ec7fb7ec..f9366cae 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DBType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DBType.java @@ -16,7 +16,6 @@ * 定义数据库类型 * * @author j.x - * @date 2023/2/23 16:36 * @since 1.1.4 */ public interface DBType { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DBTypeAdapter.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DBTypeAdapter.java index c07b4043..aa827c88 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DBTypeAdapter.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DBTypeAdapter.java @@ -6,7 +6,6 @@ * SQL 数据库类型适配器 * * @author j.x - * @date 2023/4/13 13:17 * @since 1.1.4 */ public interface DBTypeAdapter extends Adapter { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DSLType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DSLType.java index aaf31551..08b20ec3 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DSLType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DSLType.java @@ -14,7 +14,6 @@ *

建议通过{@link TypeTranslatorHolder#getTypeTranslator()}在进行包装，否则获取的{@link DSLType}实例无法满足指定数据库方言

* * @author j.x - * @date 2023/4/12 20:03 * @see DataType * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DataType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DataType.java index c09d70e9..79956d1e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DataType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DataType.java @@ -7,7 +7,6 @@ * 数据类型 * * @author j.x - * @date 2023/4/12 19:54 * @since 1.1.4 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DataTypeAdapter.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DataTypeAdapter.java index a1642167..76b3f4f9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DataTypeAdapter.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DataTypeAdapter.java @@ -6,7 +6,6 @@ * 适用于不同框架的类型定义 * * @author j.x - * @date 2023/4/12 20:01 * @since 1.1.4 */ public interface DataTypeAdapter extends Adapter { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DateJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DateJavaType.java index 9a271316..d6da7fee 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DateJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DateJavaType.java @@ -8,7 +8,6 @@ * date java type * * @author j.x - * @date 2023/4/14 18:49 * @since 1.1.4 */ public class DateJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DoubleJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DoubleJavaType.java index 30be7bab..fc04f53e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DoubleJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/DoubleJavaType.java @@ -6,7 +6,6 @@ * Double * * @author j.x - * @date 2023/4/14 18:48 * @since 1.1.4 */ public class DoubleJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/EnumJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/EnumJavaType.java index 0c3169e3..57303c69 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/EnumJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/EnumJavaType.java @@ -4,7 +4,6 @@ * enum java type * * @author j.x - * @date 2023/7/10 18:49 * @since 1.1.4 */ public class EnumJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/FloatJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/FloatJavaType.java index fd393ca1..2654d28d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/FloatJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/FloatJavaType.java @@ -6,7 +6,6 @@ * Float * * @author j.x - * @date 2023/4/14 18:45 * @since 1.1.4 */ public class FloatJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/IntegerJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/IntegerJavaType.java index 0ede2375..2f4d08c1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/IntegerJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/IntegerJavaType.java @@ -6,7 +6,6 @@ * Integer * * @author j.x - * @date 2023/1/13 16:08 * @since 1.1.4 */ public class IntegerJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaType.java index 191b73d2..428bedc6 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaType.java @@ -8,7 +8,6 @@ * java type定义 * * @author j.x - * @date 2023/1/13 09:10 * @see TypeRegistry * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaTypeImpl.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaTypeImpl.java index 19da0e34..dbc62025 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaTypeImpl.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JavaTypeImpl.java @@ -4,7 +4,6 @@ * java type impl * * @author j.x - * @date 2023/1/13 15:58 * @since 1.1.4 */ public abstract class JavaTypeImpl implements JavaType { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JdbcType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JdbcType.java index 831d4e75..7d050f21 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JdbcType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JdbcType.java @@ -14,7 +14,6 @@ * jdbc type定义。与{@link JavaType}成映射关系。 * * @author j.x - * @date 2023/1/13 09:15 * @see java.sql.SQLType * @see TypeRegistry * @since 1.1.4 @@ -86,7 +85,6 @@ static JdbcTypeBuilder builder() { * {@link JdbcType}构建器 * * @author j.x - * @date 2023/1/13 15:01 * @since 1.1.4 */ class JdbcTypeBuilder { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JdbcTypeImpl.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JdbcTypeImpl.java index a56327d5..33c9abbe 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JdbcTypeImpl.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/JdbcTypeImpl.java @@ -11,7 +11,6 @@ * 默认实现 * * @author j.x - * @date 2023/1/13 14:48 * @since 1.1.4 */ public class JdbcTypeImpl implements JdbcType { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ListJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ListJavaType.java index 95aa0533..ff1ea620 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ListJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ListJavaType.java @@ -8,7 +8,6 @@ * list * * @author j.x - * @date 2023/4/16 16:58 * @since 1.1.4 */ public class ListJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/LongJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/LongJavaType.java index e17f2c66..dfffbbc3 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/LongJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/LongJavaType.java @@ -6,7 +6,6 @@ * long java type * * @author j.x - * @date 2023/1/13 17:52 * @since 1.1.4 */ public class LongJavaType implements JavaType { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/MapJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/MapJavaType.java index b8e262a9..6e54b9c7 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/MapJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/MapJavaType.java @@ -8,7 +8,6 @@ * map * * @author j.x - * @date 2023/4/16 16:59 * @since 1.1.4 */ public class MapJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/QueueJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/QueueJavaType.java index 618c0bea..2161e292 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/QueueJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/QueueJavaType.java @@ -8,7 +8,6 @@ * queue * * @author j.x - * @date 2023/4/16 17:10 * @since 1.1.4 */ public class QueueJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/SetJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/SetJavaType.java index 77b9c4a8..f15b7521 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/SetJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/SetJavaType.java @@ -8,7 +8,6 @@ * {@link Set} * * @author j.x - * @date 2023/4/16 17:07 * @since 1.1.4 */ public class SetJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ShortJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ShortJavaType.java index adba05b0..5acca1af 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ShortJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/ShortJavaType.java @@ -6,7 +6,6 @@ * short java type * * @author j.x - * @date 2023/1/13 18:00 * @since 1.1.4 */ public class ShortJavaType implements JavaType { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/StackJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/StackJavaType.java index d2aec9ac..8741c7b9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/StackJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/StackJavaType.java @@ -6,7 +6,6 @@ * {@link Stack} * * @author j.x - * @date 2023/4/16 17:09 * @since 1.1.4 */ public class StackJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/StringJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/StringJavaType.java index b2cad0d5..f8ccd178 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/StringJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/StringJavaType.java @@ -4,7 +4,6 @@ * string java type * * @author j.x - * @date 2023/1/17 18:02 * @since 1.1.4 */ public class StringJavaType implements JavaType { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/TypeRegistry.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/TypeRegistry.java index 097a7006..09b6d16e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/TypeRegistry.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/TypeRegistry.java @@ -17,9 +17,7 @@ *

* * @author j.x - * @date 2023/1/13 16:00 * @since 1.1.4 - * @modify 1.1.9 */ public final class TypeRegistry { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/UnknownJavaType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/UnknownJavaType.java index 461a5691..03c60324 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/UnknownJavaType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/type/UnknownJavaType.java @@ -4,7 +4,6 @@ * unknown java type * * @author j.x - * @date 2023/4/16 16:03 * @since 1.1.4 */ public class UnknownJavaType extends JavaTypeImpl { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/Distinct.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/Distinct.java index a8b08f69..c32b3cc4 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/Distinct.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/Distinct.java @@ -6,7 +6,6 @@ * distinct * * @author j.x - * @date 2023/1/12 17:18 * @since 1.1.4 */ public class Distinct extends KeyWord { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/KeyWord.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/KeyWord.java index 61064957..70104c6e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/KeyWord.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/KeyWord.java @@ -6,7 +6,6 @@ * SQL 关键值 * * @author j.x - * @date 2023/1/12 16:42 * @since 1.1.4 */ @AllArgsConstructor diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/KeyWords.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/KeyWords.java index 7fba8aa5..ef29dcbc 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/KeyWords.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/dsl/word/KeyWords.java @@ -9,7 +9,6 @@ * SQL 相关关键字存储 * * @author j.x - * @date 2023/1/12 16:43 * @since 1.1.4 */ public class KeyWords { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/AbstractCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/AbstractCommandExecutor.java index 50c3022c..68caf8bc 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/AbstractCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/AbstractCommandExecutor.java @@ -27,7 +27,6 @@ * 实现自{@link CommandExecutor}的基本的类，所有的具体实现类都需要继承该类。 * * @author j.x - * @date 2024/1/8 10:45 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/AggregateCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/AggregateCommandExecutor.java index 33f3ea14..f21292a4 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/AggregateCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/AggregateCommandExecutor.java @@ -4,7 +4,6 @@ * a marked interface, collect to DDL and DML command operator * * @author j.x - * @date 2024/3/15 08:32 * @see DDLCommandExecutor * @see DMLCommandExecutor * @since 1.1.7 diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/BaseCommandExecutorLoader.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/BaseCommandExecutorLoader.java index 0e12fe96..b8ec8c73 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/BaseCommandExecutorLoader.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/BaseCommandExecutorLoader.java @@ -18,7 +18,6 @@ *

* * @author j.x - * @date 2024/4/12 18:05 * @since 1.1.8 */ public abstract class BaseCommandExecutorLoader implements CommandExecutorLoader { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutor.java index f5900f1b..763f4a31 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutor.java @@ -18,7 +18,6 @@ * Command Executor * * @author j.x - * @date 2023/4/14 13:43 * @since 1.1.4 */ public interface CommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorAware.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorAware.java index 515eba15..f0e882ba 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorAware.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorAware.java @@ -13,7 +13,6 @@ *

* * @author j.x - * @date 2024/1/10 18:00 * @since 1.1.7 */ public interface CommandExecutorAware { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorFactory.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorFactory.java index b57db13c..09327ec9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorFactory.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorFactory.java @@ -8,7 +8,6 @@ * DSL Executor factory * * @author j.x - * @date 2023/4/16 23:38 * @since 1.1.4 */ @Slf4j diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorLoader.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorLoader.java index 8150bfe3..d5dd32d0 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorLoader.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorLoader.java @@ -10,7 +10,6 @@ * {@link CommandExecutor}实例加载器 * * @author j.x - * @date 2024/1/10 16:02 * @since 1.1.7 */ public interface CommandExecutorLoader { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorRegistry.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorRegistry.java index 8d5672b0..b1e4eb5b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorRegistry.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorRegistry.java @@ -12,7 +12,6 @@ * command executor registry，参考自{@link org.springframework.beans.factory.BeanFactory} * * @author j.x - * @date 2024/1/29 13:04 * @since 1.1.7 */ public interface CommandExecutorRegistry { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorRegistryImpl.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorRegistryImpl.java index 417cefbc..2d225505 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorRegistryImpl.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandExecutorRegistryImpl.java @@ -21,7 +21,6 @@ * command executor registry * * @author j.x - * @date 2024/1/25 17:07 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandType.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandType.java index 4e1955d9..ad4fd262 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandType.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/CommandType.java @@ -14,7 +14,6 @@ * 执行命令 * * @author j.x - * @date 2023/4/14 13:49 * @since 1.1.4 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/DDLCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/DDLCommandExecutor.java index c7d5749e..c2a3738d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/DDLCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/DDLCommandExecutor.java @@ -21,7 +21,6 @@ * * * @author j.x - * @date 2024/3/15 08:26 * @since 1.1.7 */ public interface DDLCommandExecutor extends CommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/DMLCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/DMLCommandExecutor.java index c3afee1b..2ab29ccd 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/DMLCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/DMLCommandExecutor.java @@ -35,7 +35,6 @@ * * * @author j.x - * @date 2024/3/15 08:27 * @since 1.1.7 */ public interface DMLCommandExecutor extends CommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorFactoryBean.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorFactoryBean.java index 23e9810e..dfe1f3af 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorFactoryBean.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorFactoryBean.java @@ -7,7 +7,6 @@ * 基于当前系统变量的{@link ExecutorKey#DSL_EXECUTOR_TYPE_KEY}获取对应的{@code CommandExecutor} * * @author j.x - * @date 2024/1/10 18:10 * @since 1.1.7 */ public class ExecutorFactoryBean implements FactoryBean { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorInitializer.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorInitializer.java index a95cc8ca..6fd4a762 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorInitializer.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorInitializer.java @@ -10,7 +10,6 @@ * 初始化{@link CommandExecutor} * * @author j.x - * @date 2024/1/10 16:04 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorOptionsBuilder.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorOptionsBuilder.java index 8b5838a9..e7bf9cc8 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorOptionsBuilder.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ExecutorOptionsBuilder.java @@ -21,7 +21,6 @@ * {@link ExecutorOptionsImpl}构建 * * @author j.x - * @date 2024/1/25 17:52 * @since 1.1.7 */ public class ExecutorOptionsBuilder implements Self { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/IPage.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/IPage.java index aa4d93c1..b91c71f0 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/IPage.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/IPage.java @@ -14,7 +14,6 @@ * 分页 Page 对象接口，借鉴于mybatis-plus * * @author j.x - * @date 2023/5/28 22:34 * @since 1.1.4 */ public interface IPage extends Serializable { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/IdMethodReferenceColumn.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/IdMethodReferenceColumn.java index 789ec24b..4a6481f3 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/IdMethodReferenceColumn.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/IdMethodReferenceColumn.java @@ -11,7 +11,6 @@ * pojo的id方法 * * @author j.x - * @date 2023/7/11 12:34 * @since 1.1.4 */ public class IdMethodReferenceColumn

implements MethodReferenceColumn

{ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/Page.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/Page.java index 8b3a3fbb..a32dd9b1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/Page.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/Page.java @@ -14,7 +14,6 @@ * 简单分页模型，借鉴与mybatis-plus * * @author j.x - * @date 2023/5/28 22:35 * @since 1.1.4 */ public class Page implements IPage { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultGroup.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultGroup.java index 99157bab..764c6534 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultGroup.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultGroup.java @@ -23,7 +23,6 @@ * 结果集。保持顺序一致性 * * @author j.x - * @date 2023/4/14 18:02 * @since 1.1.4 */ @Data @@ -405,4 +404,4 @@ public K getValue(DSLName columnName, Function transfer, Suppl .map(adjuster) .orElse(null); } -} \ No newline at end of file +} diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultRow.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultRow.java index 17315ff0..bbb99cf5 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultRow.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultRow.java @@ -12,7 +12,6 @@ * 执行器执行结果 * * @author j.x - * @date 2023/4/14 17:39 * @since 1.1.4 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultSet.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultSet.java index aa3103fa..418493fc 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultSet.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/ResultSet.java @@ -10,7 +10,6 @@ * 结果集 * * @author j.x - * @date 2023/5/28 23:11 * @since 1.1.4 */ @Setter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/exception/ExecuteException.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/exception/ExecuteException.java index ace0be53..e4ed033b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/exception/ExecuteException.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/exception/ExecuteException.java @@ -7,7 +7,6 @@ *

it is a {@link Throwable}, make sure invoker handle the Exception

* * @author j.x - * @date 2024/4/1 18:08 * @since 1.1.8 */ public class ExecuteException extends Throwable { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BeanResultHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BeanResultHandler.java index 9e3f40ff..7aa10492 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BeanResultHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BeanResultHandler.java @@ -7,7 +7,6 @@ * * @param bean type * @author j.x - * @date 2024/2/14 16:52 * @since 1.1.7 */ public interface BeanResultHandler extends ResultHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BeanResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BeanResultSetHandler.java index 87cdd0e0..e731a89b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BeanResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BeanResultSetHandler.java @@ -6,7 +6,6 @@ * Java Bean对象处理器 * * @author j.x - * @date 2023/4/18 13:17 * @since 1.1.4 */ public class BeanResultSetHandler extends ExecutorOptionsAwareImpl implements ResultSetHandler, BeanResultHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BoolResultHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BoolResultHandler.java index 7f06b5f7..1900cf30 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BoolResultHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/BoolResultHandler.java @@ -12,7 +12,6 @@ * bool 转换 * * @author j.x - * @date 2023/4/18 13:38 * @since 1.1.4 */ public class BoolResultHandler extends ExecutorOptionsAwareImpl implements ResultSetHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/CohesionListResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/CohesionListResultSetHandler.java index a566e319..4da2350b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/CohesionListResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/CohesionListResultSetHandler.java @@ -10,7 +10,6 @@ * decorate {@link ListBeanResultSetHandler} from {@link ResultSetHandler} * * @author j.x - * @date 2024/7/21 17:33 * @since 0.1.1 */ public class CohesionListResultSetHandler implements ListResultSetHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ColumnDefListResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ColumnDefListResultSetHandler.java index d2494574..6abf4b10 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ColumnDefListResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ColumnDefListResultSetHandler.java @@ -20,7 +20,6 @@ * {@link ColumnDef}结果集处理器 * * @author j.x - * @date 2023/7/4 14:54 * @since 1.1.4 */ public class ColumnDefListResultSetHandler extends ExecutorOptionsAwareImpl implements ListResultSetHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/DefaultListResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/DefaultListResultSetHandler.java index 9a1bda16..134c6f0d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/DefaultListResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/DefaultListResultSetHandler.java @@ -10,7 +10,6 @@ * 返回 list ResultGroup * * @author j.x - * @date 2023/4/18 13:33 * @since 1.1.4 */ public class DefaultListResultSetHandler extends ExecutorOptionsAwareImpl implements ListResultSetHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/DefaultResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/DefaultResultSetHandler.java index 20074506..a910e762 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/DefaultResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/DefaultResultSetHandler.java @@ -6,7 +6,6 @@ * 不经任何处理 * * @author j.x - * @date 2023/4/18 13:25 * @since 1.1.4 */ public class DefaultResultSetHandler extends ExecutorOptionsAwareImpl implements ResultSetHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ExecutorOptionsAware.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ExecutorOptionsAware.java index f4c62676..8905f673 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ExecutorOptionsAware.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ExecutorOptionsAware.java @@ -6,7 +6,6 @@ * 借鉴spring aware机制，实现该接口的实例可以获取到ExecutorOptions实例 * * @author j.x - * @date 2024/2/14 16:21 * @since 1.1.7 */ public interface ExecutorOptionsAware { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ExecutorResultHandlerSet.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ExecutorResultHandlerSet.java index c25e13d6..801ac20e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ExecutorResultHandlerSet.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ExecutorResultHandlerSet.java @@ -4,7 +4,6 @@ * 定义{@link cc.allio.uno.data.orm.executor.CommandExecutor}结果处理器集合 * * @author j.x - * @date 2024/2/14 16:02 * @since 1.1.7 */ public interface ExecutorResultHandlerSet { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListBeanResultHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListBeanResultHandler.java index 7cc06b3d..9bc691a8 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListBeanResultHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListBeanResultHandler.java @@ -4,7 +4,6 @@ * marked list bean handler interface * * @author j.x - * @date 2024/2/16 23:41 * @since 1.1.7 */ public interface ListBeanResultHandler extends BeanResultHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListBeanResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListBeanResultSetHandler.java index 40a3246e..5b824519 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListBeanResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListBeanResultSetHandler.java @@ -10,7 +10,6 @@ * Java Bean 转换为 List * * @author j.x - * @date 2023/4/18 13:30 * @see BeanResultSetHandler * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListMapResultHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListMapResultHandler.java index f7474eeb..99979e35 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListMapResultHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListMapResultHandler.java @@ -11,7 +11,6 @@ * list map * * @author j.x - * @date 2023/4/18 13:34 * @since 1.1.4 */ public class ListMapResultHandler extends ExecutorOptionsAwareImpl implements ListResultSetHandler> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListResultSetHandler.java index e2417c1b..def3fb23 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ListResultSetHandler.java @@ -9,7 +9,6 @@ * List 结果集处理器 * * @author j.x - * @date 2023/4/18 13:29 * @since 1.1.4 * @see ResultSetHandler */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/MapResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/MapResultSetHandler.java index 092d2334..4a35f7eb 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/MapResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/MapResultSetHandler.java @@ -9,7 +9,6 @@ * ResultGroup -> map * * @author j.x - * @date 2023/4/18 13:24 * @since 1.1.4 */ public class MapResultSetHandler extends ExecutorOptionsAwareImpl implements ResultSetHandler> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ResultHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ResultHandler.java index 1e144846..0b33fd66 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ResultHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ResultHandler.java @@ -4,7 +4,6 @@ * marked uno-data collection handler interface * * @author j.x - * @date 2024/2/14 16:45 * @since 1.1.7 */ public interface ResultHandler extends ExecutorOptionsAware { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ResultSetHandler.java index bcf55256..cdb47f65 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/ResultSetHandler.java @@ -9,7 +9,6 @@ * DSL执行结果集处理器 * * @author j.x - * @date 2023/4/18 13:16 * @since 1.1.4 */ public interface ResultSetHandler extends Function, ResultHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/TableListResultSetHandler.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/TableListResultSetHandler.java index 910cb591..0f2750de 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/TableListResultSetHandler.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/handler/TableListResultSetHandler.java @@ -12,7 +12,6 @@ * {@link Table}结果集处理器 * * @author j.x - * @date 2024/1/4 18:56 * @since 1.1.7 */ public class TableListResultSetHandler extends ExecutorOptionsAwareImpl implements ListResultSetHandler { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/AfterInterceptor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/AfterInterceptor.java index 6c7f3f0a..36b0c30b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/AfterInterceptor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/AfterInterceptor.java @@ -8,7 +8,6 @@ * 内置拦截器，在Command操作执行之前进行拦截 * * @author j.x - * @date 2024/1/8 12:11 * @since 1.1.7 */ public class AfterInterceptor extends InternalInterceptor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/BeforeInterceptor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/BeforeInterceptor.java index f8b00263..342143e1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/BeforeInterceptor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/BeforeInterceptor.java @@ -7,7 +7,6 @@ * 内置拦截器，在command操作之后进行拦截 * * @author j.x - * @date 2024/1/8 12:14 * @since 1.1.7 */ public class BeforeInterceptor extends InternalInterceptor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/Interceptor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/Interceptor.java index 4333fb5d..dd8a1183 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/Interceptor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/Interceptor.java @@ -17,7 +17,6 @@ * 允许用户在执行过程中添加自定义代码，参考自 hibernate #Interceptor * * @author j.x - * @date 2024/1/8 10:22 * @since 1.1.7 */ public interface Interceptor extends Node { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InterceptorChain.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InterceptorChain.java index a93ecae1..a3160433 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InterceptorChain.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InterceptorChain.java @@ -6,7 +6,6 @@ * 拦截器链 * * @author j.x - * @date 2024/1/8 10:22 * @since 1.1.7 */ public interface InterceptorChain extends Chain { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InterceptorChainContext.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InterceptorChainContext.java index d7a9b0c5..6d3471fa 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InterceptorChainContext.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InterceptorChainContext.java @@ -6,7 +6,6 @@ * 拦截器链上下文 * * @author j.x - * @date 2024/1/8 10:59 * @since 1.1.7 */ public class InterceptorChainContext implements ChainContext { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InternalInterceptor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InternalInterceptor.java index 0abcbf38..a960a810 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InternalInterceptor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/interceptor/InternalInterceptor.java @@ -16,7 +16,6 @@ * {@link Interceptor}装饰器，确定调用事件方法 * * @author j.x - * @date 2024/1/8 10:51 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/ATOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/ATOInnerCommandExecutor.java index 48d1ae16..c5c4268d 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/ATOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/ATOInnerCommandExecutor.java @@ -9,7 +9,6 @@ * ATO({@link AlterTableOperator}) inner command type * * @author j.x - * @date 2024/3/15 10:49 * @since 1.1.7 */ public interface ATOInnerCommandExecutor extends InnerDefaultCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/CTOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/CTOInnerCommandExecutor.java index 6a44c9ab..ea96f739 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/CTOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/CTOInnerCommandExecutor.java @@ -7,7 +7,6 @@ * CTO({@link cc.allio.uno.data.orm.dsl.ddl.CreateTableOperator}) inner command executor * * @author j.x - * @date 2024/3/15 04:26 * @since 1.1.7 */ public interface CTOInnerCommandExecutor extends InnerDefaultCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/DOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/DOInnerCommandExecutor.java index bea166d7..f850ef3c 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/DOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/DOInnerCommandExecutor.java @@ -7,7 +7,6 @@ * DO({@link DeleteOperator}) inner command executor * * @author j.x - * @date 2024/3/15 04:38 * @since 1.1.7 */ public interface DOInnerCommandExecutor extends InnerDefaultCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/DTOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/DTOInnerCommandExecutor.java index b0388277..96a6814a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/DTOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/DTOInnerCommandExecutor.java @@ -7,7 +7,6 @@ * DTO({@link DropTableOperator}) inner command executor * * @author j.x - * @date 2024/3/15 04:34 * @since 1.1.7 */ public interface DTOInnerCommandExecutor extends InnerDefaultCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/ETOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/ETOInnerCommandExecutor.java index ee0c7e80..456e80ee 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/ETOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/ETOInnerCommandExecutor.java @@ -7,7 +7,6 @@ * ETO({@link cc.allio.uno.data.orm.dsl.ddl.ExistTableOperator}) inner command executor * * @author j.x - * @date 2024/3/15 04:35 * @since 1.1.7 */ public interface ETOInnerCommandExecutor extends InnerDefaultCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/IOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/IOInnerCommandExecutor.java index 13e4ee21..282f6d26 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/IOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/IOInnerCommandExecutor.java @@ -7,7 +7,6 @@ * IO({@link InsertOperator}) inner command executor * * @author j.x - * @date 2024/3/15 04:39 * @since 1.1.7 */ public interface IOInnerCommandExecutor extends InnerDefaultCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerCommandExecutor.java index 43be0963..e80a7992 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerCommandExecutor.java @@ -13,8 +13,6 @@ * Definition DSL internal command executor * * @author j.x - * @date 2023/5/29 20:41 - * @modify 1.1.7 * @since 1.1.4 */ public interface InnerCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerCommandExecutorManager.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerCommandExecutorManager.java index 58de631c..3af33a52 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerCommandExecutorManager.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerCommandExecutorManager.java @@ -16,7 +16,6 @@ * manage {@link InnerCommandExecutor} entity * * @author j.x - * @date 2024/3/15 04:49 * @see SPIInnerCommandScanner * @since 1.1.7 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerDefaultCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerDefaultCommandExecutor.java index bdbc631c..433a6c82 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerDefaultCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerDefaultCommandExecutor.java @@ -7,7 +7,6 @@ * base on {@link ResultSetHandler} build to command executor * * @author j.x - * @date 2024/3/15 06:42 * @since 1.1.7 */ public interface InnerDefaultCommandExecutor extends InnerCommandExecutor> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerListCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerListCommandExecutor.java index 5787489b..495ea0f3 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerListCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/InnerListCommandExecutor.java @@ -9,7 +9,6 @@ * base on {@link ListResultSetHandler} build to command executor * * @author j.x - * @date 2024/3/15 06:39 * @since 1.1.7 */ public interface InnerListCommandExecutor extends InnerCommandExecutor, O, ListResultSetHandler> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/QOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/QOInnerCommandExecutor.java index 6faca0c0..ec41ef3a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/QOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/QOInnerCommandExecutor.java @@ -7,7 +7,6 @@ * QO({@link QueryOperator}) inner command executor * * @author j.x - * @date 2024/3/15 04:41 * @since 1.1.7 */ public interface QOInnerCommandExecutor extends InnerListCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/SCOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/SCOInnerCommandExecutor.java index 04edd9cf..b878e513 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/SCOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/SCOInnerCommandExecutor.java @@ -8,7 +8,6 @@ * SCO({@link ShowColumnsOperator}) inner command type * * @author j.x - * @date 2024/3/15 04:36 * @since 1.1.7 */ public interface SCOInnerCommandExecutor extends InnerListCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/SPIInnerCommandScanner.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/SPIInnerCommandScanner.java index 335b9a78..2150d1e7 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/SPIInnerCommandScanner.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/SPIInnerCommandScanner.java @@ -15,7 +15,6 @@ * scan include annotation {@link cc.allio.uno.data.orm.executor.CommandExecutor.Group} the {@link InnerCommandExecutor} * * @author j.x - * @date 2024/3/15 08:36 * @since 1.1.7 */ public final class SPIInnerCommandScanner { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/STInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/STInnerCommandExecutor.java index 52dcdc6a..7a8e0236 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/STInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/STInnerCommandExecutor.java @@ -8,7 +8,6 @@ * ST({@link ShowTablesOperator}) command executor * * @author j.x - * @date 2024/3/15 11:22 * @since 1.1.7 */ public interface STInnerCommandExecutor extends InnerListCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/UOInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/UOInnerCommandExecutor.java index bdf6c6fa..80e99331 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/UOInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/UOInnerCommandExecutor.java @@ -7,7 +7,6 @@ * UO({@link UpdateOperator}) inner command executor * * @author j.x - * @date 2024/3/15 04:40 * @since 1.1.7 */ public interface UOInnerCommandExecutor extends InnerDefaultCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/UnknownInnerCommandExecutor.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/UnknownInnerCommandExecutor.java index f2870fcb..1422afd9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/UnknownInnerCommandExecutor.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/internal/UnknownInnerCommandExecutor.java @@ -7,7 +7,6 @@ * {@link UnrecognizedOperator} inner command executor * * @author j.x - * @date 2024/7/25 21:26 * @since 1.1.9 */ public interface UnknownInnerCommandExecutor> extends InnerDefaultCommandExecutor { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorKey.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorKey.java index 09995761..7045bb0c 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorKey.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorKey.java @@ -11,7 +11,6 @@ * ExecutorKey * * @author j.x - * @date 2024/1/3 22:59 * @since 1.1.7 */ public interface ExecutorKey extends Key { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorOptions.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorOptions.java index 0a31e269..045d0c5a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorOptions.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorOptions.java @@ -15,7 +15,6 @@ * 执行器{@link cc.allio.uno.data.orm.executor.CommandExecutor}相关参数 * * @author j.x - * @date 2024/2/14 21:07 * @since 1.1.7 */ public interface ExecutorOptions extends ExecutorResultHandlerSet, MetaAcceptorSet, OptionalContext { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorOptionsImpl.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorOptionsImpl.java index 41e7218e..1b59799f 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorOptionsImpl.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/ExecutorOptionsImpl.java @@ -21,7 +21,6 @@ * 执行器相关参数集合 * * @author j.x - * @date 2024/1/8 10:30 * @since 1.1.7 */ public class ExecutorOptionsImpl extends SPIExecutorOptionsResultHandlerSet implements ExecutorOptions { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/SPIExecutorOptionsResultHandlerSet.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/SPIExecutorOptionsResultHandlerSet.java index c2f49c04..ac448075 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/SPIExecutorOptionsResultHandlerSet.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/orm/executor/options/SPIExecutorOptionsResultHandlerSet.java @@ -11,7 +11,6 @@ * 基于SPI机制，获取每一个类型处理器的实例，如果没有值则采用默认处理器 * * @author j.x - * @date 2024/2/14 16:12 * @since 1.1.7 */ public abstract class SPIExecutorOptionsResultHandlerSet implements ExecutorOptions { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/BaseHigherQuery.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/BaseHigherQuery.java index e8e0e1ab..abd9b0ab 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/BaseHigherQuery.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/BaseHigherQuery.java @@ -11,7 +11,6 @@ * 高阶查询Impl * * @author j.x - * @date 2023/4/17 18:19 * @since 1.1.4 */ public class BaseHigherQuery implements HigherQuery { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/BaseQueryFilter.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/BaseQueryFilter.java index 146911da..52708344 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/BaseQueryFilter.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/BaseQueryFilter.java @@ -15,7 +15,6 @@ * 基于{@link QueryOperator}实现的{@link QueryFilter} * * @author j.x - * @date 2023/4/17 18:21 * @since 1.1.4 */ public class BaseQueryFilter implements QueryFilter, QueryOperator { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/HigherQuery.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/HigherQuery.java index fa05d874..49fd0401 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/HigherQuery.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/HigherQuery.java @@ -9,7 +9,6 @@ * 复合的高阶查询，提供对单表数据多维度的快速分析 * * @author j.x - * @date 2023/4/17 18:17 * @see BaseHigherQuery * @since 1.1.4 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/Query.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/Query.java index 4f9dc2cf..9f732cb5 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/Query.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/Query.java @@ -13,7 +13,6 @@ * 标识注解，使用于Mapper查询 * * @author j.x - * @date 2022/9/30 16:40 * @since 1.1.0 */ @Inherited diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/QueryFilter.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/QueryFilter.java index 89c1b1f4..75f3085f 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/QueryFilter.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/QueryFilter.java @@ -4,7 +4,6 @@ * QueryFilter * * @author j.x - * @date 2023/4/17 18:11 * @since 1.1.4 */ public interface QueryFilter { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/QueryWrapper.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/QueryWrapper.java index fa328306..f1ba30cc 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/QueryWrapper.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/QueryWrapper.java @@ -10,7 +10,6 @@ * 查询领域对象 * * @author j.x - * @date 2022/9/29 12:52 * @since 1.1.0 */ public interface QueryWrapper extends Serializable { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/Action.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/Action.java index 8a2dce46..7ca611f1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/Action.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/Action.java @@ -10,7 +10,6 @@ * 抽稀动作 * * @author j.x - * @date 2022/10/11 10:59 * @since 1.1.0 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/AddDiluteAction.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/AddDiluteAction.java index dd2771d5..33c9c493 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/AddDiluteAction.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/AddDiluteAction.java @@ -9,7 +9,6 @@ * 数据求和 * * @author j.x - * @date 2022/10/10 16:54 * @since 1.1.0 */ @Slf4j diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DataDilute.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DataDilute.java index 34c366c7..a321eab4 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DataDilute.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DataDilute.java @@ -6,7 +6,6 @@ * 抽稀实体 * * @author j.x - * @date 2022/10/10 16:28 * @since 1.1.0 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DateDimension.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DateDimension.java index 732d74dc..772d92d7 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DateDimension.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DateDimension.java @@ -6,7 +6,6 @@ * 数据抽稀维度 * * @author j.x - * @date 2022/11/16 11:40 * @since 1.1.0 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DefaultDiluteAction.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DefaultDiluteAction.java index 0ed4fa6d..807a15a2 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DefaultDiluteAction.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DefaultDiluteAction.java @@ -6,7 +6,6 @@ * 默认抽稀动作，不实现任何动作 * * @author j.x - * @date 2022/11/16 11:40 * @since 1.1.0 */ public class DefaultDiluteAction implements DiluteAction { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DiluteAction.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DiluteAction.java index 5c49b16c..c4bc7daf 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DiluteAction.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/DiluteAction.java @@ -6,7 +6,6 @@ * 数据抽稀动作 * * @author j.x - * @date 2022/10/10 16:20 * @since 1.1.0 */ public interface DiluteAction { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/TimeDimension.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/TimeDimension.java index 6716ee14..e1ce69d9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/TimeDimension.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/TimeDimension.java @@ -15,7 +15,6 @@ * 维度标识 * * @author j.x - * @date 2022/11/16 11:40 * @since 1.1.0 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/Window.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/Window.java index c0c2ccda..c21c68ae 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/Window.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/param/Window.java @@ -13,7 +13,6 @@ * 数据抽稀相关常量 * * @author j.x - * @date 2022/10/9 11:25 * @since 1.0 */ @Getter diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/AsyncStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/AsyncStream.java index b964d927..8ae43df5 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/AsyncStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/AsyncStream.java @@ -14,7 +14,6 @@ * Async stream * * @author j.x - * @date 2023/1/20 12:05 * @since 1.1.3 */ public class AsyncStream implements DataStream> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/CollectionTimeStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/CollectionTimeStream.java index 954397c3..4bccc5d4 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/CollectionTimeStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/CollectionTimeStream.java @@ -6,7 +6,6 @@ * 集合数据流 * * @author j.x - * @date 2022/11/18 13:06 * @since 1.1.0 */ public interface CollectionTimeStream extends TimeStream> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/CollectionTimeStreamImpl.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/CollectionTimeStreamImpl.java index e0c2b50a..465e5cd9 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/CollectionTimeStreamImpl.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/CollectionTimeStreamImpl.java @@ -9,7 +9,6 @@ * 读取某个集合数据流 * * @author j.x - * @date 2022/11/18 14:28 * @since 1.1.0 */ public class CollectionTimeStreamImpl implements CollectionTimeStream { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ContemporaneousStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ContemporaneousStream.java index daba80f2..9206ba2e 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ContemporaneousStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ContemporaneousStream.java @@ -16,7 +16,6 @@ *

接受一个入口流{@link DataStream}，根据同期对比的参数数据重新构建入口流的{@link QueryFilter}参数。根据该新参数获取集合流数据，把集合流数据转换为以时间为key的参数

* * @author j.x - * @date 2022/11/18 14:40 * @since 1.1.0 */ public class ContemporaneousStream implements TimeStream>> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ContemporaneousValueTimeStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ContemporaneousValueTimeStream.java index a388372d..4c1d93fc 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ContemporaneousValueTimeStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ContemporaneousValueTimeStream.java @@ -11,7 +11,6 @@ * 以{@link ContemporaneousStream}数据数据流，把其数据转换为ValueTime的数据流 * * @author j.x - * @date 2022/11/18 14:54 * @since 1.1.0 */ public class ContemporaneousValueTimeStream implements TimeStream>>> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/DataStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/DataStream.java index a15fbc04..886977fb 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/DataStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/DataStream.java @@ -10,7 +10,6 @@ * 定义数据Query流，设计参考自{@link java.io.InputStream} * * @author j.x - * @date 2022/11/16 12:01 * @since 1.1.0 */ @FunctionalInterface diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/DiluentTimeStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/DiluentTimeStream.java index 473b6e28..99735dc0 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/DiluentTimeStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/DiluentTimeStream.java @@ -14,7 +14,6 @@ * 数据稀释剂，根据{@link DataDilute}配置项进行数据抽稀， * * @author j.x - * @date 2022/11/16 11:46 * @since 1.1.0 */ public class DiluentTimeStream extends FunctionalityTimeStream { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/FunctionalityTimeStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/FunctionalityTimeStream.java index 7f4eb3de..7231091b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/FunctionalityTimeStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/FunctionalityTimeStream.java @@ -11,7 +11,6 @@ *

其里面包含一个{@link DataStream}实例，其作用是把它作为基本的数据源

* * @author j.x - * @date 2022/11/16 13:14 * @since 1.1.0 */ public abstract class FunctionalityTimeStream implements CollectionTimeStream { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/OutliersIgnoreTimeStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/OutliersIgnoreTimeStream.java index e90cff7b..a764878a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/OutliersIgnoreTimeStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/OutliersIgnoreTimeStream.java @@ -12,7 +12,6 @@ *

对于给定的查询数据字段{@link QueryWrapper#getDataFields()}与{@link QueryWrapper#getTimeField()}过滤针对null值，相同时间序列数据进行过滤

* * @author j.x - * @date 2022/11/17 23:31 * @since 1.1.0 */ public class OutliersIgnoreTimeStream extends FunctionalityTimeStream { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SQLCommandExecutorStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SQLCommandExecutorStream.java index 605ddeea..688a9da8 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SQLCommandExecutorStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SQLCommandExecutorStream.java @@ -12,7 +12,6 @@ * 基于{@link CommandExecutor}的流 * * @author j.x - * @date 2023/4/21 13:21 * @since 1.1.4 */ public class SQLCommandExecutorStream implements CollectionTimeStream> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/Sampling.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/Sampling.java index c16274b9..da1c6cac 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/Sampling.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/Sampling.java @@ -13,7 +13,6 @@ *

基于随机采取指定的样本数据量

* * @author j.x - * @date 2022/11/17 19:17 * @since 1.1.1 */ public class Sampling { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SortStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SortStream.java index a2012ec6..9d8812f8 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SortStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SortStream.java @@ -12,7 +12,6 @@ * 排序 * * @author j.x - * @date 2023/1/20 10:56 * @since 1.1.4 */ public class SortStream extends FunctionalityTimeStream { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/StreamBuilder.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/StreamBuilder.java index e87ccbfa..0d414847 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/StreamBuilder.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/StreamBuilder.java @@ -4,7 +4,6 @@ * 动态Stream创建器 * * @author j.x - * @date 2023/1/20 11:25 * @since 1.1.4 */ public class StreamBuilder { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SupplementTimeStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SupplementTimeStream.java index 3231ae44..100bb61f 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SupplementTimeStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/SupplementTimeStream.java @@ -30,7 +30,6 @@ * * * @author j.x - * @date 2022/11/16 13:20 * @see SupplementList * @since 1.1.0 */ diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/TimeStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/TimeStream.java index 03488d4a..de9b1f06 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/TimeStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/TimeStream.java @@ -14,7 +14,6 @@ * 标识当前为时间流数据，提供静态方法。 * * @author j.x - * @date 2022/11/17 11:11 * @since 1.1.0 */ public interface TimeStream extends DataStream { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ValueTime.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ValueTime.java index 88b3d30d..af7434f1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ValueTime.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ValueTime.java @@ -9,7 +9,6 @@ * 包含值与时间对象 * * @author j.x - * @date 2022/10/11 14:56 * @since 1.1.0 */ @Data diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ValueTimeStream.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ValueTimeStream.java index ca6792b7..267d8afb 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ValueTimeStream.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/query/stream/ValueTimeStream.java @@ -18,7 +18,6 @@ * 指定某一个集合数据流，按照给定的数据字段（{@link QueryWrapper#getDataFields()}）使其转换为{@link ValueTime}的时间数据。 * * @author j.x - * @date 2022/11/18 14:33 * @since 1.1.0 */ public class ValueTimeStream implements TimeStream>> { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/BaseTransactionBehavior.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/BaseTransactionBehavior.java index 8ac89cbb..bec3b68b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/BaseTransactionBehavior.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/BaseTransactionBehavior.java @@ -8,7 +8,6 @@ * 基于{@link InternalTransactionBehavior}实现 * * @author j.x - * @date 2024/2/11 12:39 * @since 1.1.7 */ public abstract class BaseTransactionBehavior> implements TxDefinition { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/BoolTransactionBehavior.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/BoolTransactionBehavior.java index 92a40f36..23ba74c1 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/BoolTransactionBehavior.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/BoolTransactionBehavior.java @@ -11,7 +11,6 @@ * bool * * @author j.x - * @date 2024/2/11 12:42 * @since 1.1.7 */ public class BoolTransactionBehavior extends BaseTransactionBehavior { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/Transaction.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/Transaction.java index ca632abe..7ee71ea2 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/Transaction.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/Transaction.java @@ -4,7 +4,6 @@ * 事物的代码块 * * @author j.x - * @date 2024/2/11 11:15 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TransactionAction.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TransactionAction.java index 8669b43e..3e8bc860 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TransactionAction.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TransactionAction.java @@ -4,7 +4,6 @@ * 定义事物动作 * * @author j.x - * @date 2024/2/11 12:34 * @since 1.1.7 */ public interface TransactionAction { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TransactionContext.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TransactionContext.java index 3bf7b5bf..21f642ad 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TransactionContext.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TransactionContext.java @@ -10,7 +10,6 @@ * 基于Spring编程式事物工具 * * @author j.x - * @date 2022/1/10 21:57 * @since 1.0 */ @Slf4j diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TxDefinition.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TxDefinition.java index a79bda00..bacb4d4b 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TxDefinition.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TxDefinition.java @@ -7,7 +7,6 @@ * 事物定义 * * @author j.x - * @date 2024/2/11 11:17 * @since 1.1.7 */ public interface TxDefinition> extends Self { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TxDefinitionImpl.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TxDefinitionImpl.java index e6c31ea2..cb080b49 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TxDefinitionImpl.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/TxDefinitionImpl.java @@ -7,7 +7,6 @@ * 基于{@link org.springframework.transaction.support.DefaultTransactionDefinition} * * @author j.x - * @date 2024/2/11 11:35 * @since 1.1.7 */ public class TxDefinitionImpl> implements TxDefinition { diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/VoidTransactionAction.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/VoidTransactionAction.java index 84c79728..b00c834a 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/VoidTransactionAction.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/VoidTransactionAction.java @@ -4,7 +4,6 @@ * 事物的代码块 * * @author j.x - * @date 2024/2/11 11:14 * @since 1.1.7 */ @FunctionalInterface diff --git a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/VoidTransactionBehavior.java b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/VoidTransactionBehavior.java index d365bdde..1faa3595 100644 --- a/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/VoidTransactionBehavior.java +++ b/uno-data/uno-data-api/src/main/java/cc/allio/uno/data/tx/VoidTransactionBehavior.java @@ -10,7 +10,6 @@ * void transaction behavior * * @author j.x - * @date 2024/2/11 12:37 * @since 1.1.7 */ public class VoidTransactionBehavior extends BaseTransactionBehavior { diff --git a/uno-data/uno-data-db/pom.xml b/uno-data/uno-data-db/pom.xml index 9b381029..e96af910 100644 --- a/uno-data/uno-data-db/pom.xml +++ b/uno-data/uno-data-db/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml 4.0.0 @@ -14,7 +14,7 @@ - cc.allio + cc.allio.uno uno-data-api @@ -28,11 +28,11 @@ provided - cc.allio + cc.allio.uno uno-data-sql - cc.allio + cc.allio.uno uno-data-test test @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/config/db/DbAutoConfiguration.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/config/db/DbAutoConfiguration.java index 99c99b06..06827d9f 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/config/db/DbAutoConfiguration.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/config/db/DbAutoConfiguration.java @@ -35,7 +35,6 @@ * configuration for db * * @author j.x - * @date 2023/4/14 19:29 * @since 1.1.4 */ @Configuration(proxyBeanMethods = false) @@ -91,4 +90,4 @@ public DbCommandExecutor defaultDbCommandExecutor(DbCommandExecutorLoader comman return commandExecutorRegistry.register(executorOptions, () -> commandExecutorLoader.load(executorOptions), false); } -} \ No newline at end of file +} diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/config/db/DbProperties.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/config/db/DbProperties.java index 62438761..56645e04 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/config/db/DbProperties.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/config/db/DbProperties.java @@ -7,7 +7,6 @@ * describe database command executor type properties * * @author j.x - * @date 2024/4/14 19:23 * @since 1.1.8 */ @Data diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DataSourceHelper.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DataSourceHelper.java index 6087aede..472de36f 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DataSourceHelper.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DataSourceHelper.java @@ -19,7 +19,6 @@ * * * @author j.x - * @date 2024/1/25 13:10 * @since 1.1.7 */ public final class DataSourceHelper { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutor.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutor.java index f4e6a261..e2cd06bb 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutor.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutor.java @@ -47,7 +47,6 @@ * 基于MybatisSQL执行器 * * @author j.x - * @date 2023/4/14 13:45 * @see CommandExecutorFactory * @since 1.1.4 */ diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorAspect.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorAspect.java index 49897af1..8ed9c408 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorAspect.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorAspect.java @@ -6,7 +6,6 @@ * Aspect * * @author j.x - * @date 2024/1/10 18:21 * @see DbCommandExecutorAware * @since 1.1.7 */ diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorAware.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorAware.java index 2b7d4f13..d8070c53 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorAware.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorAware.java @@ -6,7 +6,6 @@ * 获取{@link DbCommandExecutor}实例标识接口 * * @author j.x - * @date 2024/1/10 18:18 * @since 1.1.7 */ public interface DbCommandExecutorAware extends CommandExecutorAware { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorLoader.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorLoader.java index 9c0331ab..a661cc92 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorLoader.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorLoader.java @@ -23,7 +23,6 @@ * 实例化{@link CommandExecutor} * * @author j.x - * @date 2024/1/10 18:27 * @since 1.1.7 */ @AutoService(CommandExecutorLoader.class) diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorProcessor.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorProcessor.java index f77b1ae0..0db41ffc 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorProcessor.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbCommandExecutorProcessor.java @@ -15,7 +15,6 @@ * {@link CommandExecutorAware}实现 * * @author j.x - * @date 2024/1/10 18:35 * @since 1.1.7 */ public class DbCommandExecutorProcessor implements BeanPostProcessor { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbMybatisConfiguration.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbMybatisConfiguration.java index 68cc6049..a5430da2 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbMybatisConfiguration.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbMybatisConfiguration.java @@ -41,7 +41,6 @@ *

注意：{@link #environment}如果使用父类进行设置或获取，将会导致使用默认数据源查询时会被替换，相应的代码在{@link DefaultSqlSessionFactory#openSession()}

* * @author j.x - * @date 2023/4/14 17:51 * @see #newResultSetHandler(Executor, MappedStatement, RowBounds, ParameterHandler, ResultHandler, BoundSql) * @since 1.1.4 */ diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbStatementSetHandler.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbStatementSetHandler.java index 6482d447..28a90fab 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbStatementSetHandler.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/DbStatementSetHandler.java @@ -31,7 +31,6 @@ * 解决值无法映射到一个抽象对象上的问题 * * @author j.x - * @date 2023/4/14 18:00 * @since 1.1.4 */ public class DbStatementSetHandler extends DefaultResultSetHandler implements ResultSetHandler { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/ColumnDefListResultHandlerDelegate.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/ColumnDefListResultHandlerDelegate.java index 5bcaf8c0..d5eaf230 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/ColumnDefListResultHandlerDelegate.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/ColumnDefListResultHandlerDelegate.java @@ -18,7 +18,6 @@ * 基于db的多类型，构建一个代理类，按照不同的{@link DBType}构建对应的{@link ColumnDefListResultSetHandler} * * @author j.x - * @date 2024/2/14 22:58 * @since 1.1.7 */ @AutoService(ColumnDefListResultSetHandler.class) diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/H2ColumnDefListResultSetHandler.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/H2ColumnDefListResultSetHandler.java index bd9c98e5..10c6a54f 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/H2ColumnDefListResultSetHandler.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/H2ColumnDefListResultSetHandler.java @@ -7,7 +7,6 @@ * {@link cc.allio.uno.data.orm.dsl.type.DBType#H2}的{@link cc.allio.uno.data.orm.executor.CommandExecutor#showColumns(Table)}结果集处理器 * * @author j.x - * @date 2024/2/14 23:19 * @since 1.1.7 */ public class H2ColumnDefListResultSetHandler extends ColumnDefListResultSetHandler { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/MySQLColumnDefListResultHandler.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/MySQLColumnDefListResultHandler.java index 94e66063..82ed3d21 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/MySQLColumnDefListResultHandler.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/MySQLColumnDefListResultHandler.java @@ -7,7 +7,6 @@ * {@link cc.allio.uno.data.orm.dsl.type.DBType#MYSQL}的{@link cc.allio.uno.data.orm.executor.CommandExecutor#showColumns(Table)}结果集处理器 * * @author j.x - * @date 2024/2/14 23:18 * @since 1.1.7 */ public class MySQLColumnDefListResultHandler extends ColumnDefListResultSetHandler { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/PostgreSQLColumnDefListResultSetHandler.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/PostgreSQLColumnDefListResultSetHandler.java index c156da72..28792b33 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/PostgreSQLColumnDefListResultSetHandler.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/orm/executor/db/handler/dialect/PostgreSQLColumnDefListResultSetHandler.java @@ -18,7 +18,6 @@ * {@link cc.allio.uno.data.orm.dsl.type.DBType#POSTGRESQL}的{@link cc.allio.uno.data.orm.executor.CommandExecutor#showColumns(Table)}结果集处理器 * * @author j.x - * @date 2024/2/14 23:19 * @since 1.1.7 */ public class PostgreSQLColumnDefListResultSetHandler extends ColumnDefListResultSetHandler { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/UnoDataMybatisAutoConfiguration.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/UnoDataMybatisAutoConfiguration.java index dc308ffb..833f7925 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/UnoDataMybatisAutoConfiguration.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/UnoDataMybatisAutoConfiguration.java @@ -9,7 +9,6 @@ * UNO-DATA配置 * * @author j.x - * @date 2022/11/22 15:11 * @since 1.1.2 */ @Configuration(proxyBeanMethods = false) diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/mapper/QueryMapper.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/mapper/QueryMapper.java index 48379caa..c69c6cff 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/mapper/QueryMapper.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/mapper/QueryMapper.java @@ -7,7 +7,6 @@ * 通用查询功能 * * @author j.x - * @date 2022/9/28 10:28 * @since 1.0 */ public interface QueryMapper extends BaseMapper, HigherQuery { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryContemporaneousForValueTimeQueryMethodInterceptor.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryContemporaneousForValueTimeQueryMethodInterceptor.java index 842f72a2..8a38512a 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryContemporaneousForValueTimeQueryMethodInterceptor.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryContemporaneousForValueTimeQueryMethodInterceptor.java @@ -13,7 +13,6 @@ * {@link QueryMapper#queryContemporaneousForValueTime(QueryFilter)} 方法拦截器，调用{@link QueryContemporaneousQueryMethodInterceptor}结果进行封装 * * @author j.x - * @date 2022/11/18 13:11 * @since 1.1.0 */ public class QueryContemporaneousForValueTimeQueryMethodInterceptor implements QueryMethodInterceptorDelegate { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryContemporaneousQueryMethodInterceptor.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryContemporaneousQueryMethodInterceptor.java index 17e9ff70..aa25b4f4 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryContemporaneousQueryMethodInterceptor.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryContemporaneousQueryMethodInterceptor.java @@ -12,7 +12,6 @@ * {@link QueryMapper#queryContemporaneous(QueryFilter)}方法拦截器 * * @author j.x - * @date 2022/11/18 13:09 * @since 1.1.0 */ final class QueryContemporaneousQueryMethodInterceptor implements QueryMethodInterceptorDelegate { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryInterceptor.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryInterceptor.java index 2d07603a..613d1f30 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryInterceptor.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryInterceptor.java @@ -15,7 +15,6 @@ * 查询拦截器实现 * * @author j.x - * @date 2022/9/30 16:46 * @since 1.1.0 */ @Slf4j diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryListForValueTimeQueryMethodInterceptor.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryListForValueTimeQueryMethodInterceptor.java index f04d014d..da333eaa 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryListForValueTimeQueryMethodInterceptor.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryListForValueTimeQueryMethodInterceptor.java @@ -13,7 +13,6 @@ * {@link QueryMapper#queryListForValueTime(QueryFilter)} 方法拦截器，调用{@link QueryListQueryMethodInterceptor}结果进行{@link ValueTime}的封装 * * @author j.x - * @date 2022/11/18 13:10 * @since 1.1.0 */ final class QueryListForValueTimeQueryMethodInterceptor implements QueryMethodInterceptorDelegate { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryListQueryMethodInterceptor.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryListQueryMethodInterceptor.java index 380cd85a..6d0c9bf4 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryListQueryMethodInterceptor.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryListQueryMethodInterceptor.java @@ -12,7 +12,6 @@ * {@link QueryMapper#queryList(QueryFilter) }方法拦截器 * * @author j.x - * @date 2022/11/18 13:08 * @since 1.1.0 */ final class QueryListQueryMethodInterceptor implements QueryMethodInterceptor { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptor.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptor.java index b3f1bbc4..9ff9bc6a 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptor.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptor.java @@ -8,7 +8,6 @@ * 定义查询方法拦截器，基于AOP实现 * * @author j.x - * @date 2022/9/30 16:29 * @since 1.1.0 */ public interface QueryMethodInterceptor { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptorDelegate.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptorDelegate.java index d6e6dc07..ab6fa78d 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptorDelegate.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptorDelegate.java @@ -4,7 +4,6 @@ * 拦截器代理接口 * * @author j.x - * @date 2022/9/30 17:00 * @since 1.1.0 */ public interface QueryMethodInterceptorDelegate extends QueryMethodInterceptor { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptorFactory.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptorFactory.java index c494fc6b..dfc84077 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptorFactory.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/interceptor/QueryMethodInterceptorFactory.java @@ -12,7 +12,6 @@ * 查询拦截器静态工厂 * * @author j.x - * @date 2022/9/30 16:59 * @since 1.1.0 */ public class QueryMethodInterceptorFactory { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/stream/MybatisStream.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/stream/MybatisStream.java index 8a1f18bc..d602c4e7 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/stream/MybatisStream.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/query/stream/MybatisStream.java @@ -14,7 +14,6 @@ * 查询数据的入口流，通过{@link JoinPointDelegate}的代理调用，由定义的{@link QueryMapper}获取入口数据流. * * @author j.x - * @date 2022/11/16 12:05 * @since 1.1.0 */ public class MybatisStream implements CollectionTimeStream { diff --git a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/type/DateDimensionTypeHandler.java b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/type/DateDimensionTypeHandler.java index a784073f..9dcd20f5 100644 --- a/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/type/DateDimensionTypeHandler.java +++ b/uno-data/uno-data-db/src/main/java/cc/allio/uno/data/query/db/type/DateDimensionTypeHandler.java @@ -13,7 +13,6 @@ * 注意使用时候需要在Mybatis配置文件中配置typeHandlerPackage = cc/allio/uno/data/query/db/type... * * @author j.x - * @date 2022/9/30 17:01 * @since 1.1.0 */ @MappedTypes(Object.class) diff --git a/uno-data/uno-data-elasticsearch/pom.xml b/uno-data/uno-data-elasticsearch/pom.xml index a2b0e543..c075e6a0 100644 --- a/uno-data/uno-data-elasticsearch/pom.xml +++ b/uno-data/uno-data-elasticsearch/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml 4.0.0 @@ -14,7 +14,7 @@ - cc.allio + cc.allio.uno uno-data-api @@ -28,9 +28,9 @@ provided - cc.allio + cc.allio.uno uno-data-test test - \ No newline at end of file + diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/config/elasticsearch/ElasticSearchProperties.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/config/elasticsearch/ElasticSearchProperties.java index a0406e81..cf2befeb 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/config/elasticsearch/ElasticSearchProperties.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/config/elasticsearch/ElasticSearchProperties.java @@ -7,7 +7,6 @@ * describe elasticsearch properties * * @author j.x - * @date 2024/4/14 19:59 * @since 1.1.8 */ @Data diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/config/elasticsearch/UnoElasticSearchAutoConfiguration.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/config/elasticsearch/UnoElasticSearchAutoConfiguration.java index 3a60ee4d..242f5816 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/config/elasticsearch/UnoElasticSearchAutoConfiguration.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/config/elasticsearch/UnoElasticSearchAutoConfiguration.java @@ -29,7 +29,6 @@ * configuration for elasticsearch * * @author j.x - * @date 2023/3/14 20:01 * @since 1.1.4 */ @Configuration(proxyBeanMethods = false) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsCreateIndexOperator.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsCreateIndexOperator.java index 62128203..86086b9f 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsCreateIndexOperator.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsCreateIndexOperator.java @@ -18,7 +18,6 @@ * 创建索引 * * @author j.x - * @date 2023/5/29 14:00 * @see 索引的settings * @since 1.1.4 */ diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsDropIndexOperator.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsDropIndexOperator.java index 7cc81a01..ef1616ae 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsDropIndexOperator.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsDropIndexOperator.java @@ -16,7 +16,6 @@ * 删除索引{@link DeleteIndexRequest} * * @author j.x - * @date 2023/5/29 18:43 * @since 1.1.4 */ @AutoService(DropTableOperator.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsExistIndexOperator.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsExistIndexOperator.java index e0ddbcbb..bcbb6233 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsExistIndexOperator.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsExistIndexOperator.java @@ -14,7 +14,6 @@ * 判断索引是否存在{@link co.elastic.clients.elasticsearch.indices.ExistsRequest} * * @author j.x - * @date 2023/5/29 18:59 * @since 1.1.4 */ @AutoService(ExistTableOperator.class) @@ -95,4 +94,4 @@ public SearchRequest getSearchRequest() { } return searchRequest; } -} \ No newline at end of file +} diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsPropertyAdapter.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsPropertyAdapter.java index 49389776..1f1c3f3c 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsPropertyAdapter.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsPropertyAdapter.java @@ -15,7 +15,6 @@ * JDBC数据类型转换为es类型 * * @author j.x - * @date 2023/7/4 15:25 * @since 1.1.4 */ public class EsPropertyAdapter implements DataTypeAdapter { diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsShowColumnsOperator.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsShowColumnsOperator.java index 1df7bff3..2e36b24c 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsShowColumnsOperator.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/ddl/EsShowColumnsOperator.java @@ -18,7 +18,6 @@ * es 查询所有映射.{@link GetMappingRequest} * * @author j.x - * @date 2023/6/11 20:07 * @since 1.1.4 */ @AutoService(ShowColumnsOperator.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsDeleteOperator.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsDeleteOperator.java index 89c58417..9ee49bb3 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsDeleteOperator.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsDeleteOperator.java @@ -17,7 +17,6 @@ * {@link DeleteByQueryRequest}实现删除数据 * * @author j.x - * @date 2023/5/29 13:49 * @since 1.1.4 */ @AutoService(DeleteOperator.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsInsertOperator.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsInsertOperator.java index 569a13d3..f21d5f44 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsInsertOperator.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsInsertOperator.java @@ -25,7 +25,6 @@ * 基于{@link BulkRequest}做数据创建 * * @author j.x - * @date 2023/5/29 12:13 * @see BulkOperation * @since 1.1.4 */ diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsQueryOperator.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsQueryOperator.java index bc19a2af..37b46ba1 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsQueryOperator.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsQueryOperator.java @@ -27,7 +27,6 @@ * 基于{@link SearchRequest}的查询，SQL数据为elasticsearch dsl * * @author j.x - * @date 2023/5/28 15:34 * @since 1.1.4 */ @AutoService(QueryOperator.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsUpdateOperator.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsUpdateOperator.java index 316994d5..a0ef7e18 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsUpdateOperator.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsUpdateOperator.java @@ -21,7 +21,6 @@ * 基于{@link UpdateByQueryRequest}做数据更新 * * @author j.x - * @date 2023/5/29 13:03 * @since 1.1.4 */ @AutoService(UpdateOperator.class) @@ -101,7 +100,8 @@ public EsUpdateOperator updates(Map values) { String source = values.keySet().stream().map(o -> "ctx._source['" + o.format() + "'] = params['" + o.format() + "']").collect(Collectors.joining(StringPool.SEMICOLON)); // params Map params = values.entrySet().stream().collect(Collectors.toMap(k -> k.getKey().format(), v -> JsonData.of(v.getValue()))); - this.updateBuilder = updateBuilder.script(s -> s.inline(i -> i.params(params).source(source))); + // TODO 替换script inline +// this.updateBuilder = updateBuilder.script(s -> s.inline(i -> i.params(params).source(source))); return self(); } @@ -123,4 +123,4 @@ public UpdateByQueryRequest getUpdateRequest() { } return updateRequest; } -} \ No newline at end of file +} diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsWhereOperatorImpl.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsWhereOperatorImpl.java index ff806375..ac273d40 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsWhereOperatorImpl.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/dsl/elasticsearch/dml/EsWhereOperatorImpl.java @@ -14,13 +14,11 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; /** * es通用条件查询 * * @author j.x - * @date 2023/5/29 13:22 * @since 1.1.4 */ public abstract class EsWhereOperatorImpl> implements WhereOperator { @@ -92,13 +90,14 @@ public T isNull(DSLName sqlName) { @Override public T in(DSLName sqlName, Object... values) { - List fieldValues = Arrays.stream(values).map(this::esValue).collect(Collectors.toList()); + List fieldValues = Arrays.stream(values).map(this::esValue).toList(); return logicQuery(TermsQuery.of(tq -> tq.field(sqlName.format()).terms(TermsQueryField.of(tqf -> tqf.value(fieldValues))))._toQuery()); } @Override public T between(DSLName sqlName, Object withValue, Object endValue) { - return logicQuery(RangeQuery.of(rb -> rb.field(sqlName.format()).gte(JsonData.of(withValue)).lte(JsonData.of(endValue)))._toQuery()); + return logicQuery(RangeQuery.of(rb -> rb.field(sqlName.format()).gte(JsonData.of(withValue)).lte(JsonData.of(endValue)))._toQuery()) + ; } @Override diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutor.java index 13161fe9..cff42362 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutor.java @@ -24,7 +24,6 @@ * 基于es的SQL执行器 * * @author j.x - * @date 2023/4/19 11:45 * @since 1.1.4 */ @Slf4j diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorAspect.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorAspect.java index 62b2e718..7735281a 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorAspect.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorAspect.java @@ -6,7 +6,6 @@ * Aspect * * @author j.x - * @date 2024/1/10 22:24 * @since 1.1.7 */ @Aspect diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorAware.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorAware.java index e78b9084..b0ef3bf7 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorAware.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorAware.java @@ -6,7 +6,6 @@ * 获取{@link EsCommandExecutor}实例标识接口 * * @author j.x - * @date 2024/1/10 18:18 * @since 1.1.7 */ public interface EsCommandExecutorAware extends CommandExecutorAware { diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorLoader.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorLoader.java index 332dfe28..c7aee55b 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorLoader.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorLoader.java @@ -17,7 +17,6 @@ * impl for elasticsearch command loader * * @author j.x - * @date 2024/3/21 00:07 * @since 1.1.7 */ @AutoService(CommandExecutorLoader.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorProcessor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorProcessor.java index af20d1ec..3dc7f479 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorProcessor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/EsCommandExecutorProcessor.java @@ -15,7 +15,6 @@ * {@link CommandExecutorAware}的ES实现 * * @author j.x - * @date 2024/1/10 22:26 * @since 1.1.7 */ public class EsCommandExecutorProcessor implements BeanPostProcessor { diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/AggrResultSet.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/AggrResultSet.java index 443f8554..0c6df37e 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/AggrResultSet.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/AggrResultSet.java @@ -9,7 +9,6 @@ * es聚合结果集 * * @author j.x - * @date 2023/5/28 21:42 * @since 1.1.4 */ public class AggrResultSet { diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsCreateTableCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsCreateTableCommandExecutor.java index cf645315..22664afd 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsCreateTableCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsCreateTableCommandExecutor.java @@ -16,7 +16,6 @@ * {@link CommandType#CREATE_TABLE} * * @author j.x - * @date 2023/5/29 21:56 * @since 1.1.4 */ @AutoService(CTOInnerCommandExecutor.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsDeleteCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsDeleteCommandExecutor.java index 48020a93..4fe1a86c 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsDeleteCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsDeleteCommandExecutor.java @@ -17,7 +17,6 @@ * {@link CommandType#DELETE} * * @author j.x - * @date 2023/7/4 15:59 * @since 1.1.4 */ @AutoService(DOInnerCommandExecutor.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsDeleteTableCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsDeleteTableCommandExecutor.java index b6612b12..daba1191 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsDeleteTableCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsDeleteTableCommandExecutor.java @@ -16,7 +16,6 @@ * {@link CommandType#DELETE_TABLE} * * @author j.x - * @date 2023/5/30 08:53 * @since 1.1.4 */ @AutoService(DTOInnerCommandExecutor.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsExistTableCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsExistTableCommandExecutor.java index 7cb89046..0e33c29c 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsExistTableCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsExistTableCommandExecutor.java @@ -16,7 +16,6 @@ * {@link CommandType#EXIST_TABLE} * * @author j.x - * @date 2023/5/30 08:54 * @since 1.1.4 */ @AutoService(ETOInnerCommandExecutor.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsInsertCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsInsertCommandExecutor.java index b6f5ac37..0f583f78 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsInsertCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsInsertCommandExecutor.java @@ -17,7 +17,6 @@ * {@link CommandType#INSERT} * * @author j.x - * @date 2023/5/30 08:58 * @since 1.1.4 */ @AutoService(IOInnerCommandExecutor.class) diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsQueryCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsQueryCommandExecutor.java index d90d48b7..9c7ba71b 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsQueryCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsQueryCommandExecutor.java @@ -28,7 +28,6 @@ * elasticsearch query command executor * * @author j.x - * @date 2024/3/15 06:51 * @since 1.1.7 */ public class EsQueryCommandExecutor implements QOInnerCommandExecutor { diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsResultGroup.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsResultGroup.java index aa3ebad5..ab671bc4 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsResultGroup.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsResultGroup.java @@ -8,7 +8,6 @@ * 拓展{@link ResultGroup}。增加聚合结果集 * * @author j.x - * @date 2023/5/28 21:41 * @since 1.1.4 */ @Data diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsResultSet.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsResultSet.java index 28a55feb..3f34df78 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsResultSet.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsResultSet.java @@ -8,7 +8,6 @@ * es结果集 * * @author j.x - * @date 2023/5/28 22:46 * @since 1.1.4 */ @Getter diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsShowColumnCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsShowColumnCommandExecutor.java index e41413f2..f01677db 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsShowColumnCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsShowColumnCommandExecutor.java @@ -28,7 +28,6 @@ * elasticsearch show columns command executor * * @author j.x - * @date 2024/3/15 05:18 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsUpdateCommandExecutor.java b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsUpdateCommandExecutor.java index 0fbea494..29ff1aaf 100644 --- a/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsUpdateCommandExecutor.java +++ b/uno-data/uno-data-elasticsearch/src/main/java/cc/allio/uno/data/orm/executor/elasticsearch/internal/EsUpdateCommandExecutor.java @@ -16,7 +16,6 @@ * {@link CommandType#UPDATE} * * @author j.x - * @date 2023/6/11 20:22 * @since 1.1.4 */ @AutoService(UOInnerCommandExecutor.class) diff --git a/uno-data/uno-data-influxdb/pom.xml b/uno-data/uno-data-influxdb/pom.xml index 8b30ec10..7e5ce01b 100644 --- a/uno-data/uno-data-influxdb/pom.xml +++ b/uno-data/uno-data-influxdb/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml 4.0.0 @@ -14,11 +14,11 @@ - cc.allio + cc.allio.uno uno-data-api - cc.allio + cc.allio.uno uno-data-sql @@ -26,9 +26,9 @@ influxdb-client-java - cc.allio + cc.allio.uno uno-data-test test - \ No newline at end of file + diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/config/influxdb/InfluxdbProperties.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/config/influxdb/InfluxdbProperties.java index 78194e4a..6aed677b 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/config/influxdb/InfluxdbProperties.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/config/influxdb/InfluxdbProperties.java @@ -9,7 +9,6 @@ * describe influxdb properties * * @author j.x - * @date 2024/4/14 18:16 * @since 1.1.8 */ @Data diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/config/influxdb/UnoInfluxdbAutoConfiguration.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/config/influxdb/UnoInfluxdbAutoConfiguration.java index 04534a52..cf7b5498 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/config/influxdb/UnoInfluxdbAutoConfiguration.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/config/influxdb/UnoInfluxdbAutoConfiguration.java @@ -24,7 +24,6 @@ * configuration for uno influxdb * * @author j.x - * @date 2024/4/14 18:17 * @since 1.1.8 */ @Configuration diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/InfluxDbTableAcceptor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/InfluxDbTableAcceptor.java index b9a658d1..ebc59b9e 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/InfluxDbTableAcceptor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/InfluxDbTableAcceptor.java @@ -8,7 +8,6 @@ * in influxdb {@link Table#getSchema()} is empty, but for compatible other data service. so this {@link MetaAcceptor} solution problem * * @author j.x - * @date 2024/4/20 19:30 * @since 1.1.8 */ public class InfluxDbTableAcceptor implements MetaAcceptor
{ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbAlterBucketOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbAlterBucketOperator.java index 4a40969c..9a429f0f 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbAlterBucketOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbAlterBucketOperator.java @@ -18,7 +18,6 @@ * influxdb alter bucket(table) operator * * @author j.x - * @date 2024/4/1 16:27 * @since 1.1.8 */ @Getter diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbCreateBucketOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbCreateBucketOperator.java index 13f4183e..74402a9b 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbCreateBucketOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbCreateBucketOperator.java @@ -22,7 +22,6 @@ * influxdb create bucket operator * * @author j.x - * @date 2024/4/13 17:07 * @since 1.1.8 */ @Getter diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbDropBucketOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbDropBucketOperator.java index b9150c8f..ba62fb3b 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbDropBucketOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbDropBucketOperator.java @@ -14,7 +14,6 @@ * influxdb drop bucket(table) operator * * @author j.x - * @date 2024/4/13 18:40 * @since 1.1.8 */ @AutoService(DropTableOperator.class) diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbExistBucketOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbExistBucketOperator.java index bd7de84c..a0e40548 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbExistBucketOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbExistBucketOperator.java @@ -17,7 +17,6 @@ * influxdb exist bucket(table) operator * * @author j.x - * @date 2024/4/13 18:48 * @since 1.1.8 */ @AutoService(ExistTableOperator.class) diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbShowBucketsOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbShowBucketsOperator.java index 45d46228..fd10f272 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbShowBucketsOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/ddl/InfluxdbShowBucketsOperator.java @@ -18,7 +18,6 @@ * influxdb show buckets operator * * @author j.x - * @date 2024/4/13 19:41 * @since 1.1.8 */ @Getter diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbDeleteOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbDeleteOperator.java index d9495945..6b75d47f 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbDeleteOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbDeleteOperator.java @@ -14,7 +14,6 @@ * influx delete measurement operator. * * @author j.x - * @date 2024/4/13 20:14 * @see api * @since 1.1.8 */ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbInsertOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbInsertOperator.java index a3da749a..6b06c303 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbInsertOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbInsertOperator.java @@ -21,7 +21,6 @@ *

when invoke relevant {@link #columns(String...)} api, means create influxdb fields, if create tags, please use

* * @author j.x - * @date 2024/4/14 15:19 * @since 1.1.8 */ @AutoService(InsertOperator.class) diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbQueryOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbQueryOperator.java index ec07005c..dbf875dd 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbQueryOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbQueryOperator.java @@ -16,7 +16,6 @@ * influx query operator use by InfluxQL * * @author j.x - * @date 2024/4/14 16:51 * @since 1.1.8 */ @AutoService(QueryOperator.class) diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbSQLWhereOperatorImpl.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbSQLWhereOperatorImpl.java index b53c2537..f5242d88 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbSQLWhereOperatorImpl.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbSQLWhereOperatorImpl.java @@ -10,7 +10,6 @@ * use SQL as for InfluxQL * * @author j.x - * @date 2024/4/14 15:14 * @since 1.1.8 */ public class InfluxdbSQLWhereOperatorImpl> implements WhereOperator { diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbUpdateOperator.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbUpdateOperator.java index 678d3f7a..a3de4a9a 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbUpdateOperator.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/dsl/influxdb/dml/InfluxdbUpdateOperator.java @@ -15,7 +15,6 @@ * influx db update operator (bridge to {@link InfluxdbInsertOperator}) * * @author j.x - * @date 2024/4/14 15:48 * @since 1.1.8 */ @AutoService(UpdateOperator.class) diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutor.java index 362541c6..e0c5acec 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutor.java @@ -24,7 +24,6 @@ * command executor for time-series database implementation * * @author j.x - * @date 2024/4/1 16:38 * @since 1.1.8 */ public class InfluxdbCommandExecutor extends AbstractCommandExecutor implements AggregateCommandExecutor { diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorAspect.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorAspect.java index b7db08a1..22abb238 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorAspect.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorAspect.java @@ -6,7 +6,6 @@ * declarative aspect * * @author j.x - * @date 2024/4/1 16:39 * @since 1.1.8 */ @Aspect diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorAware.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorAware.java index c57f5e99..d8f5ac15 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorAware.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorAware.java @@ -6,7 +6,6 @@ * a marked interface use for obtain {@link InfluxdbCommandExecutor} * * @author j.x - * @date 2024/4/1 16:40 * @since 1.1.8 */ public interface InfluxdbCommandExecutorAware extends CommandExecutorAware { diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorLoader.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorLoader.java index 9b21b52a..0d0d0522 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorLoader.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorLoader.java @@ -14,7 +14,6 @@ * load influxdb command executor * * @author j.x - * @date 2024/4/1 17:21 * @since 1.1.8 */ @AutoService(CommandExecutorLoader.class) diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorProcessor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorProcessor.java index 55b74c9d..85dcd9c3 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorProcessor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/InfluxdbCommandExecutorProcessor.java @@ -14,7 +14,6 @@ * handle implement {@link InfluxdbCommandExecutorAware}, set a proxy obtain get {@link InfluxdbCommandExecutor} * * @author j.x - * @date 2024/4/1 17:23 * @since 1.1.8 */ public class InfluxdbCommandExecutorProcessor implements BeanPostProcessor { diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbAlterBucketCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbAlterBucketCommandExecutor.java index 01469da3..6fb15442 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbAlterBucketCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbAlterBucketCommandExecutor.java @@ -23,7 +23,6 @@ * influxdb alter bucket command executor * * @author j.x - * @date 2024/4/13 17:15 * @see InfluxdbAlterBucketOperator * @since 1.1.8 */ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbCommandExecutorAdaptation.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbCommandExecutorAdaptation.java index 93845724..dcfd5da7 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbCommandExecutorAdaptation.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbCommandExecutorAdaptation.java @@ -20,7 +20,6 @@ *

should be contains how to get organization, maybe without creation

* * @author j.x - * @date 2024/4/14 23:52 * @since 1.1.8 */ @Slf4j diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbCreateBucketCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbCreateBucketCommandExecutor.java index 38076d34..da68602c 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbCreateBucketCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbCreateBucketCommandExecutor.java @@ -24,7 +24,6 @@ * influxdb create bucket command executor * * @author j.x - * @date 2024/4/13 18:25 * @see InfluxdbCreateBucketOperator * @since 1.1.8 */ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbDeleteCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbDeleteCommandExecutor.java index 740d9c04..d3a08cce 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbDeleteCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbDeleteCommandExecutor.java @@ -28,7 +28,6 @@ * influxdb delete command * * @author j.x - * @date 2024/4/14 17:06 * @see InfluxdbDeleteOperator * @since 1.1.8 */ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbDropBucketCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbDropBucketCommandExecutor.java index 4cedc0c7..28f63c0a 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbDropBucketCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbDropBucketCommandExecutor.java @@ -20,7 +20,6 @@ * influxdb drop bucket command executor * * @author j.x - * @date 2024/4/13 18:45 * @see InfluxdbDropBucketOperator * @since 1.1.8 */ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbExistBucketCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbExistBucketCommandExecutor.java index fc7210ba..b35a1295 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbExistBucketCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbExistBucketCommandExecutor.java @@ -19,7 +19,6 @@ * influxdb exist bucket command executor * * @author j.x - * @date 2024/4/13 19:38 * @see InfluxdbExistBucketOperator * @since 1.1.8 */ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbInsertCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbInsertCommandExecutor.java index a799ddf5..14052152 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbInsertCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbInsertCommandExecutor.java @@ -28,7 +28,6 @@ * influxdb insert command executor * * @author j.x - * @date 2024/4/14 17:22 * @see InfluxdbInsertOperator * @since 1.1.8 */ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbQueryCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbQueryCommandExecutor.java index e543e1fe..c0a76f0f 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbQueryCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbQueryCommandExecutor.java @@ -28,7 +28,6 @@ * influxdb query command executor * * @author j.x - * @date 2024/4/14 17:53 * @since 1.1.8 */ @Slf4j diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbShowBucketsCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbShowBucketsCommandExecutor.java index 61ba3b56..006de940 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbShowBucketsCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbShowBucketsCommandExecutor.java @@ -25,7 +25,6 @@ * influxdb show buckets command executor * * @author j.x - * @date 2024/4/13 20:00 * @see InfluxdbShowBucketsOperator * @since 1.1.8 */ diff --git a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbUpdateCommandExecutor.java b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbUpdateCommandExecutor.java index 7580fc60..a499917d 100644 --- a/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbUpdateCommandExecutor.java +++ b/uno-data/uno-data-influxdb/src/main/java/cc/allio/uno/data/orm/executor/influxdb/internal/InfluxdbUpdateCommandExecutor.java @@ -18,7 +18,6 @@ * influxdb update command (bridge to {@link InfluxdbInsertCommandExecutor}) * * @author j.x - * @date 2024/4/14 17:45 * @see InfluxdbUpdateOperator * @since 1.1.8 */ diff --git a/uno-data/uno-data-mongodb/pom.xml b/uno-data/uno-data-mongodb/pom.xml index b62b54c3..90e820c1 100644 --- a/uno-data/uno-data-mongodb/pom.xml +++ b/uno-data/uno-data-mongodb/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml jar @@ -14,7 +14,7 @@ - cc.allio + cc.allio.uno uno-data-api @@ -22,9 +22,9 @@ mongodb-driver-sync - cc.allio + cc.allio.uno uno-data-test test - \ No newline at end of file + diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/config/mongodb/MongodbProperties.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/config/mongodb/MongodbProperties.java index 1ecf26f7..ca6e8cf6 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/config/mongodb/MongodbProperties.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/config/mongodb/MongodbProperties.java @@ -7,7 +7,6 @@ * describe mongodb properties * * @author j.x - * @date 2024/4/14 19:35 * @since 1.1.8 */ @Data diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/config/mongodb/UnoMongodbAutoConfiguration.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/config/mongodb/UnoMongodbAutoConfiguration.java index 42a7e169..080bef55 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/config/mongodb/UnoMongodbAutoConfiguration.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/config/mongodb/UnoMongodbAutoConfiguration.java @@ -24,7 +24,6 @@ * configuration for mongodb * * @author j.x - * @date 2024/3/14 19:37 * @since 1.1.7 */ @Configuration diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/MongodbSupport.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/MongodbSupport.java index f0000948..c78057be 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/MongodbSupport.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/MongodbSupport.java @@ -15,7 +15,6 @@ * Help build mongodb application * * @author j.x - * @date 2024/3/14 01:06 * @since 1.1.7 */ public final class MongodbSupport { diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbAlterCollectionOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbAlterCollectionOperator.java index 8ac63dc3..61fbe942 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbAlterCollectionOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbAlterCollectionOperator.java @@ -17,7 +17,6 @@ * mongodb alter collection(table) operator * * @author j.x - * @date 2024/3/11 23:12 * @since 1.1.7 */ @Getter diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbCreateCollectionOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbCreateCollectionOperator.java index f88996bb..68ce29b5 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbCreateCollectionOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbCreateCollectionOperator.java @@ -18,7 +18,6 @@ * mongodb create collection operator * * @author j.x - * @date 2024/3/12 00:57 * @since 1.1.7 */ @Getter diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbDropCollectionOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbDropCollectionOperator.java index 4c226c0b..56489def 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbDropCollectionOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbDropCollectionOperator.java @@ -17,7 +17,6 @@ * mongodb drop collection operator * * @author j.x - * @date 2024/3/12 00:58 * @since 1.1.7 */ @AutoService(DropTableOperator.class) diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbExistCollectionOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbExistCollectionOperator.java index 7e579de8..e4066228 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbExistCollectionOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbExistCollectionOperator.java @@ -19,7 +19,6 @@ * mongodb exist collection operator * * @author j.x - * @date 2024/3/12 01:11 * @since 1.1.7 */ @AutoService(ExistTableOperator.class) diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbShowCollectionsOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbShowCollectionsOperator.java index 2abcbf26..5a90af9b 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbShowCollectionsOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/ddl/MongodbShowCollectionsOperator.java @@ -21,7 +21,6 @@ * mongodb show collections operator * * @author j.x - * @date 2024/3/12 01:11 * @since 1.1.7 */ @Getter diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbDeleteOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbDeleteOperator.java index 52ebd30d..22b69de6 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbDeleteOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbDeleteOperator.java @@ -17,7 +17,6 @@ * mongodb delete document operator * * @author j.x - * @date 2024/3/14 00:31 * @since 1.1.7 */ @AutoService(DeleteOperator.class) diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbInsertOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbInsertOperator.java index c884d52e..0ea85f0e 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbInsertOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbInsertOperator.java @@ -19,7 +19,6 @@ * mongodb insert document operator * * @author j.x - * @date 2024/3/14 00:32 * @since 1.1.7 */ @AutoService(InsertOperator.class) diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbQueryOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbQueryOperator.java index 07ef13f2..c962aea1 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbQueryOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbQueryOperator.java @@ -24,7 +24,6 @@ * mongodb query document operator implementation * * @author j.x - * @date 2024/3/14 00:52 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbUpdateOperator.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbUpdateOperator.java index 702abad3..1ccab318 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbUpdateOperator.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbUpdateOperator.java @@ -21,7 +21,6 @@ * mongodb update document operator implementation * * @author j.x - * @date 2024/3/14 01:34 * @since 1.1.7 */ @AutoService(UpdateOperator.class) diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbWhereOperatorImpl.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbWhereOperatorImpl.java index 6f351240..b0aa1985 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbWhereOperatorImpl.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/dsl/mongodb/dml/MongodbWhereOperatorImpl.java @@ -18,7 +18,6 @@ * The {@link WhereOperator} default implementation for mongodb * * @author j.x - * @date 2024/3/12 01:22 * @since 1.1.7 */ public class MongodbWhereOperatorImpl> implements WhereOperator { diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutor.java index 46e4c39c..cb6c03b0 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutor.java @@ -20,7 +20,6 @@ * command executor for document database mongodb implementation * * @author j.x - * @date 2024/3/10 23:32 * @since 1.1.7 */ public class MongodbCommandExecutor extends AbstractCommandExecutor implements AggregateCommandExecutor { diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorAspect.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorAspect.java index b52e25d4..bc84a3aa 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorAspect.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorAspect.java @@ -6,7 +6,6 @@ * declarative aspect * * @author j.x - * @date 2024/3/15 11:46 * @since 1.1.7 */ @Aspect diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorAware.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorAware.java index 16ccbb64..dd5151fc 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorAware.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorAware.java @@ -6,7 +6,6 @@ * an marked interface use for obtain {@link MongodbCommandExecutor} * * @author j.x - * @date 2024/3/15 11:47 * @since 1.1.7 */ public interface MongodbCommandExecutorAware extends CommandExecutorAware { diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorLoader.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorLoader.java index 3b1f7b03..a7de47ea 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorLoader.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorLoader.java @@ -13,7 +13,6 @@ * loader mongodb * * @author j.x - * @date 2024/3/15 11:44 * @since 1.1.7 */ @AutoService(CommandExecutorLoader.class) diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorProcessor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorProcessor.java index 398f6c6b..53e67c15 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorProcessor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/MongodbCommandExecutorProcessor.java @@ -14,7 +14,6 @@ * handle take on {@link MongodbCommandExecutorAware} interface object, set proxy obtain {@link MongodbCommandExecutor} * * @author j.x - * @date 2024/3/15 11:51 * @see MongodbCommandExecutorAware * @since 1.1.7 */ diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbAlterCollectionCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbAlterCollectionCommandExecutor.java index 96e9e6ec..16bbc186 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbAlterCollectionCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbAlterCollectionCommandExecutor.java @@ -22,7 +22,6 @@ * mongodb alter collection command executor * * @author j.x - * @date 2024/3/15 10:51 * @see RenameCollectionOperation * @since 1.1.7 */ diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbCreateCollectionCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbCreateCollectionCommandExecutor.java index c44030e8..1b96d5e3 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbCreateCollectionCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbCreateCollectionCommandExecutor.java @@ -21,7 +21,6 @@ * mongodb create collection command executor * * @author j.x - * @date 2024/3/15 10:59 * @see CreateCollectionOperation * @since 1.1.7 */ diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbDeleteCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbDeleteCommandExecutor.java index 519e2ee7..c21368e3 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbDeleteCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbDeleteCommandExecutor.java @@ -24,7 +24,6 @@ * mongodb delete command executor * * @author j.x - * @date 2024/3/15 11:30 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbDropCollectionCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbDropCollectionCommandExecutor.java index 7282789d..8c88a2c0 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbDropCollectionCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbDropCollectionCommandExecutor.java @@ -23,7 +23,6 @@ * mongodb drop collection command executor * * @author j.x - * @date 2024/3/15 11:17 * @see DropCollectionOperation * @since 1.1.7 */ diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbExistCollectionCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbExistCollectionCommandExecutor.java index e7c122b1..e586083d 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbExistCollectionCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbExistCollectionCommandExecutor.java @@ -25,7 +25,6 @@ * mongodb exist collection command executor * * @author j.x - * @date 2024/3/15 11:20 * @see ListCollectionsOperation * @since 1.1.7 */ diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbInsertCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbInsertCommandExecutor.java index cdb88789..bf6d5f35 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbInsertCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbInsertCommandExecutor.java @@ -25,7 +25,6 @@ * mongodb insert command executor * * @author j.x - * @date 2024/3/15 11:32 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbQueryCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbQueryCommandExecutor.java index 12c4f641..f5561135 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbQueryCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbQueryCommandExecutor.java @@ -31,7 +31,6 @@ * mongodb query command executor * * @author j.x - * @date 2024/3/15 11:34 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbShowCollectionCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbShowCollectionCommandExecutor.java index e75fec51..b76f3153 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbShowCollectionCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbShowCollectionCommandExecutor.java @@ -27,7 +27,6 @@ * mongodb show collections command executor * * @author j.x - * @date 2024/3/15 11:23 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbUpdateCommandExecutor.java b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbUpdateCommandExecutor.java index 6838053b..146e1fc9 100644 --- a/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbUpdateCommandExecutor.java +++ b/uno-data/uno-data-mongodb/src/main/java/cc/allio/uno/data/orm/executor/mongodb/internal/MongodbUpdateCommandExecutor.java @@ -24,7 +24,6 @@ * mongodb update command executor * * @author j.x - * @date 2024/3/15 11:35 * @since 1.1.7 */ @Slf4j diff --git a/uno-data/uno-data-neo4j/pom.xml b/uno-data/uno-data-neo4j/pom.xml index d6ad7eab..021ddae7 100644 --- a/uno-data/uno-data-neo4j/pom.xml +++ b/uno-data/uno-data-neo4j/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml jar @@ -14,7 +14,7 @@ - cc.allio + cc.allio.uno uno-data-api @@ -22,9 +22,9 @@ neo4j-java-driver - cc.allio + cc.allio.uno uno-data-test test - \ No newline at end of file + diff --git a/uno-data/uno-data-redis/pom.xml b/uno-data/uno-data-redis/pom.xml index d5a436b3..4b73554f 100644 --- a/uno-data/uno-data-redis/pom.xml +++ b/uno-data/uno-data-redis/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml jar @@ -14,7 +14,7 @@ - cc.allio + cc.allio.uno uno-data-api @@ -22,9 +22,9 @@ redisson - cc.allio + cc.allio.uno uno-data-test test - \ No newline at end of file + diff --git a/uno-data/uno-data-sql/pom.xml b/uno-data/uno-data-sql/pom.xml index 653e3d9e..79badcc2 100644 --- a/uno-data/uno-data-sql/pom.xml +++ b/uno-data/uno-data-sql/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml @@ -15,7 +15,7 @@ - cc.allio + cc.allio.uno uno-data-api @@ -24,9 +24,9 @@ druid - cc.allio + cc.allio.uno uno-data-test test - \ No newline at end of file + diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/SQLSupport.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/SQLSupport.java index b716e189..74f7a294 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/SQLSupport.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/SQLSupport.java @@ -29,7 +29,6 @@ * druid sql 相关工具类 * * @author j.x - * @date 2024/1/4 17:06 * @since 1.1.7 */ public class SQLSupport implements Self { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/UnoSQLExprTableSource.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/UnoSQLExprTableSource.java index bb14ca3f..43780a18 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/UnoSQLExprTableSource.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/UnoSQLExprTableSource.java @@ -7,7 +7,6 @@ * 基于{@link SQLExprTableSource}，拓展当设置schema，判断数据库类型决定是否设置 * * @author j.x - * @date 2024/1/5 16:15 * @since 1.1.7 */ public class UnoSQLExprTableSource extends SQLExprTableSource { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/DDLSQLSupport.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/DDLSQLSupport.java index 8cdb7a4c..fb7dcf4f 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/DDLSQLSupport.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/DDLSQLSupport.java @@ -19,7 +19,6 @@ * 与DDL SQL相关的操作 * * @author j.x - * @date 2024/2/8 13:46 * @since 1.1.7 */ public class DDLSQLSupport extends SQLSupport { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLAlterTableOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLAlterTableOperator.java index 7ea5d575..4aab84e0 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLAlterTableOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLAlterTableOperator.java @@ -24,7 +24,6 @@ * druid for modify xxxx structure * * @author j.x - * @date 2023/6/8 19:55 * @since 1.1.4 */ @AutoService(AlterTableOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLCreateTableOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLCreateTableOperator.java index ae6bbcb2..d6a9be6d 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLCreateTableOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLCreateTableOperator.java @@ -22,7 +22,6 @@ * 基于Druid registry operator * * @author j.x - * @date 2023/4/12 19:45 * @since 1.1.4 */ @AutoService(CreateTableOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLDropTableOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLDropTableOperator.java index 0bfc4ba9..114a12e7 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLDropTableOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLDropTableOperator.java @@ -17,7 +17,6 @@ * DruidSQLDropTableOperator * * @author j.x - * @date 2023/4/16 13:02 * @since 1.1.4 */ @AutoService(DropTableOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLExistTableOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLExistTableOperator.java index be29b11b..7ed287c4 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLExistTableOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLExistTableOperator.java @@ -17,7 +17,6 @@ * druid * * @author j.x - * @date 2023/4/17 09:47 * @since 1.1.4 */ @AutoService(ExistTableOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLShowColumnsOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLShowColumnsOperator.java index 8512242f..83ca3ec1 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLShowColumnsOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/ddl/SQLShowColumnsOperator.java @@ -18,7 +18,6 @@ * 表结构 * * @author j.x - * @date 2023/6/8 19:20 * @since 1.1.4 */ @AutoService(ShowColumnsOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/H2TypeTranslator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/H2TypeTranslator.java index c5553680..b22b0967 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/H2TypeTranslator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/H2TypeTranslator.java @@ -10,7 +10,6 @@ * h2 * * @author j.x - * @date 2024/1/8 19:50 * @since 1.1.7 */ @AutoService(TypeTranslator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/DSLTypeDelegate.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/DSLTypeDelegate.java index 1b3d5d73..1a0c32da 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/DSLTypeDelegate.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/DSLTypeDelegate.java @@ -8,7 +8,6 @@ * 内置DSLType基类，实现通用的方法 * * @author j.x - * @date 2024/2/1 19:56 * @since 1.1.7 */ public abstract class DSLTypeDelegate implements DSLType { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/H2SQLTypeDelegate.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/H2SQLTypeDelegate.java index 30dd0ad7..5353214b 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/H2SQLTypeDelegate.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/H2SQLTypeDelegate.java @@ -11,7 +11,6 @@ * h2数据库字段类型二次转换 * * @author j.x - * @date 2024/1/8 19:42 * @since 1.1.7 */ public class H2SQLTypeDelegate extends DSLTypeDelegate { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/MySQLTypeDelegate.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/MySQLTypeDelegate.java index b09d47e6..a05d209a 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/MySQLTypeDelegate.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/MySQLTypeDelegate.java @@ -6,7 +6,6 @@ * 对mysql库字段进行处理 * * @author j.x - * @date 2023/4/18 11:15 * @since 1.1.4 */ public class MySQLTypeDelegate implements DSLType { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/PostgreSQLTypeDelegate.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/PostgreSQLTypeDelegate.java index 2f339c38..e6cb4c92 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/PostgreSQLTypeDelegate.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dialect/type/PostgreSQLTypeDelegate.java @@ -11,7 +11,6 @@ * 对pg库的字段类型进行处理 * * @author j.x - * @date 2023/4/18 11:14 * @since 1.1.4 */ public class PostgreSQLTypeDelegate extends DSLTypeDelegate { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/DruidJoinTypeAdapter.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/DruidJoinTypeAdapter.java index 45b8aeb8..7bb6e37e 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/DruidJoinTypeAdapter.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/DruidJoinTypeAdapter.java @@ -8,7 +8,6 @@ * DruidJoinTypeAdapter * * @author j.x - * @date 2023/4/13 13:25 * @since 1.1.4 */ public final class DruidJoinTypeAdapter implements JoinTypeAdapter { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/DruidTokenOperatorAdapter.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/DruidTokenOperatorAdapter.java index e43810fd..f90d4ad9 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/DruidTokenOperatorAdapter.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/DruidTokenOperatorAdapter.java @@ -8,7 +8,6 @@ * BinaryOperator * * @author j.x - * @date 2023/4/13 13:21 * @since 1.1.4 */ public class DruidTokenOperatorAdapter implements TokenOperatorAdapter { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLDeleteOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLDeleteOperator.java index 6f56fbcb..68791325 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLDeleteOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLDeleteOperator.java @@ -23,7 +23,6 @@ * DruidSQLDeleteQueryOperator * * @author j.x - * @date 2023/4/16 18:43 * @since 1.1.4 */ @AutoService(DeleteOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLInsertOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLInsertOperator.java index 83f5a4f5..5a4dbc58 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLInsertOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLInsertOperator.java @@ -26,7 +26,6 @@ * Druid INSERT * * @author j.x - * @date 2023/4/13 16:25 * @since 1.1.4 */ @AutoService(InsertOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLQueryOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLQueryOperator.java index b8ba39d4..35f291c1 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLQueryOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLQueryOperator.java @@ -35,7 +35,6 @@ * Druid Query Operator * * @author j.x - * @date 2023/4/12 23:08 * @since 1.1.4 */ @AutoService(QueryOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLUpdateOperator.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLUpdateOperator.java index d82854b2..03209ce9 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLUpdateOperator.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLUpdateOperator.java @@ -31,7 +31,6 @@ * DruidSQLUpdateOperator * * @author j.x - * @date 2023/4/16 18:18 * @since 1.1.4 */ @AutoService(UpdateOperator.class) diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLWhereOperatorImpl.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLWhereOperatorImpl.java index 4365f737..a2518b4a 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLWhereOperatorImpl.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/sql/dml/SQLWhereOperatorImpl.java @@ -18,7 +18,6 @@ * where操作集合归类 * * @author j.x - * @date 2024/1/5 20:28 * @since 1.1.7 */ public abstract class SQLWhereOperatorImpl & PrepareOperator> diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/type/DruidDataTypeAdapter.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/type/DruidDataTypeAdapter.java index 1ec896a0..ba10c288 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/type/DruidDataTypeAdapter.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/type/DruidDataTypeAdapter.java @@ -14,7 +14,6 @@ * druid的类型转换器 * * @author j.x - * @date 2023/4/12 20:06 * @since 1.1.4 */ public class DruidDataTypeAdapter implements DataTypeAdapter { diff --git a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/type/DruidDbTypeAdapter.java b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/type/DruidDbTypeAdapter.java index f236caa4..9983274d 100644 --- a/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/type/DruidDbTypeAdapter.java +++ b/uno-data/uno-data-sql/src/main/java/cc/allio/uno/data/orm/dsl/type/DruidDbTypeAdapter.java @@ -6,7 +6,6 @@ * DruidDbTypeBridge * * @author j.x - * @date 2023/2/23 16:47 * @since 1.1.4 */ public class DruidDbTypeAdapter implements DBTypeAdapter { diff --git a/uno-data/uno-data-test/pom.xml b/uno-data/uno-data-test/pom.xml index 90539aae..d4404001 100644 --- a/uno-data/uno-data-test/pom.xml +++ b/uno-data/uno-data-test/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio + cc.allio.uno uno-data - 1.1.9 + 1.2.0 ../pom.xml jar @@ -14,13 +14,13 @@ - cc.allio + cc.allio.uno uno-data-api - cc.allio + cc.allio.uno uno-test compile - \ No newline at end of file + diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/CommandExecutorInjectRunner.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/CommandExecutorInjectRunner.java index 6db3b763..d336ac57 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/CommandExecutorInjectRunner.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/CommandExecutorInjectRunner.java @@ -31,7 +31,6 @@ *

and set {@link CommandExecutor} if test class implementation {@link CommandExecutorSetter}

* * @author j.x - * @date 2024/3/20 00:44 * @since 1.1.7 */ @Slf4j @@ -126,4 +125,4 @@ ExecutorOptions drain(Container container) { executorOptions.putAll(property); return executorOptions; } -} \ No newline at end of file +} diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/CommandExecutorSetter.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/CommandExecutorSetter.java index d8950981..04ba1a3d 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/CommandExecutorSetter.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/CommandExecutorSetter.java @@ -9,7 +9,6 @@ *

This interface only one set method, when test class exits {@link RunContainer} annotation will trigger that method.

* * @author j.x - * @date 2024/3/21 00:04 * @since 0.1.1 */ public interface CommandExecutorSetter { diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/testcontainers/InfluxdbPrelude.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/testcontainers/InfluxdbPrelude.java index 2540d7c7..23c3ffdc 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/testcontainers/InfluxdbPrelude.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/testcontainers/InfluxdbPrelude.java @@ -11,7 +11,6 @@ * prepare influxdb in start before. * * @author j.x - * @date 2024/4/16 14:13 * @see cc.allio.uno.data.test.executor.translator.InfluxdbTranslator * @since 1.1.8 */ diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/ContainerExecutorOptionsTranslator.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/ContainerExecutorOptionsTranslator.java index f4857091..1f749fed 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/ContainerExecutorOptionsTranslator.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/ContainerExecutorOptionsTranslator.java @@ -13,7 +13,6 @@ * translate {@link Container} to {@link ExecutorOptions} * * @author j.x - * @date 2024/3/20 01:02 * @since 1.1.7 */ public interface ContainerExecutorOptionsTranslator { diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/InfluxdbTranslator.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/InfluxdbTranslator.java index 3a40b718..3a530e51 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/InfluxdbTranslator.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/InfluxdbTranslator.java @@ -14,7 +14,6 @@ * influxdb describe executor options * * @author j.x - * @date 2024/4/1 16:47 * @see org.testcontainers.containers.InfluxDBContainer * @since 1.1.8 */ diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MSSQLTranslator.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MSSQLTranslator.java index a88fcc98..3e389368 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MSSQLTranslator.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MSSQLTranslator.java @@ -10,7 +10,6 @@ * mssql impl translator * * @author j.x - * @date 2024/3/20 01:16 * @since 1.1.7 */ public class MSSQLTranslator extends RDBTranslator { diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MongodbTranslator.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MongodbTranslator.java index 376b2a5b..2ca3cb95 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MongodbTranslator.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MongodbTranslator.java @@ -12,7 +12,6 @@ * mongodb impl translator * * @author j.x - * @date 2024/3/20 01:19 * @since 1.1.7 */ public class MongodbTranslator implements ContainerExecutorOptionsTranslator { diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MySQLTranslator.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MySQLTranslator.java index a872cbea..e2553e89 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MySQLTranslator.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/MySQLTranslator.java @@ -10,7 +10,6 @@ * mysql impl translator * * @author j.x - * @date 2024/3/20 01:07 * @since 1.1.7 */ public class MySQLTranslator extends RDBTranslator { diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/PostgreSQLTranslator.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/PostgreSQLTranslator.java index 20542220..33d8b860 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/PostgreSQLTranslator.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/PostgreSQLTranslator.java @@ -10,7 +10,6 @@ * pg impl translator * * @author j.x - * @date 2024/3/20 01:07 * @since 1.1.7 */ public class PostgreSQLTranslator extends RDBTranslator { diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/RDBTranslator.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/RDBTranslator.java index 39d3361f..f5ba1aac 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/RDBTranslator.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/executor/translator/RDBTranslator.java @@ -8,7 +8,6 @@ * default implementation translator get executor key and translator operator key * * @author j.x - * @date 2024/3/20 01:11 * @since 1.1.7 */ public abstract class RDBTranslator implements ContainerExecutorOptionsTranslator { diff --git a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/model/DataSets.java b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/model/DataSets.java index 02f3c34b..e7d5ca19 100644 --- a/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/model/DataSets.java +++ b/uno-data/uno-data-test/src/main/java/cc/allio/uno/data/test/model/DataSets.java @@ -13,7 +13,6 @@ * 常用的数据集 * * @author j.x - * @date 2024/2/8 14:10 * @since 1.1.7 */ public final class DataSets { diff --git a/uno-demo/pom.xml b/uno-demo/pom.xml deleted file mode 100644 index b9ede305..00000000 --- a/uno-demo/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - uno - cc.allio - 1.1.9 - - 4.0.0 - - uno-demo - pom - - uno-websocket-demo - - - \ No newline at end of file diff --git a/uno-demo/uno-websocket-demo/pom.xml b/uno-demo/uno-websocket-demo/pom.xml deleted file mode 100644 index 33d518d5..00000000 --- a/uno-demo/uno-websocket-demo/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - uno-demo - cc.allio - 1.1.9 - - 4.0.0 - - uno-websocket-demo - - websocket使用示例 - - - - cc.allio - uno-starter-websocket - - - cc.allio - uno-starter-core - - - - \ No newline at end of file diff --git a/uno-demo/uno-websocket-demo/src/main/java/cc/allio/uno/websocket/demo/DemoWebSocketApplication.java b/uno-demo/uno-websocket-demo/src/main/java/cc/allio/uno/websocket/demo/DemoWebSocketApplication.java deleted file mode 100644 index 4cbae1e1..00000000 --- a/uno-demo/uno-websocket-demo/src/main/java/cc/allio/uno/websocket/demo/DemoWebSocketApplication.java +++ /dev/null @@ -1,12 +0,0 @@ -package cc.allio.uno.websocket.demo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class DemoWebSocketApplication { - - public static void main(String[] args) { - SpringApplication.run(DemoWebSocketApplication.class); - } -} diff --git a/uno-demo/uno-websocket-demo/src/main/java/cc/allio/uno/websocket/demo/DemoWebSocketEndpoint.java b/uno-demo/uno-websocket-demo/src/main/java/cc/allio/uno/websocket/demo/DemoWebSocketEndpoint.java deleted file mode 100644 index e6c440fc..00000000 --- a/uno-demo/uno-websocket-demo/src/main/java/cc/allio/uno/websocket/demo/DemoWebSocketEndpoint.java +++ /dev/null @@ -1,48 +0,0 @@ -package cc.allio.uno.websocket.demo; - -import cc.allio.uno.websocket.BaseWebsocketEndpoint; -import jakarta.websocket.Session; -import jakarta.websocket.server.ServerEndpoint; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Controller; -import reactor.core.publisher.FluxSink; - -import java.util.List; - -@Slf4j -@Controller -@ServerEndpoint("/demo") -public class DemoWebSocketEndpoint extends BaseWebsocketEndpoint { - - @Override - protected void doOnOpen(Session session) throws Throwable { - - } - - @Override - protected void doOnMessage(Session session, List message) throws Throwable { - for (String s : message) { - log.info(s); - } - } - - @Override - protected void doOnPublish(Object source, FluxSink collectSink, Session session) throws Throwable { - - } - - @Override - protected void doOnClose() throws Throwable { - - } - - @Override - protected void doOnError() throws Throwable { - - } - - @Override - public boolean enableHeartbeat() { - return false; - } -} diff --git a/uno-gis/pom.xml b/uno-gis/pom.xml index 8e25173a..25a68e64 100644 --- a/uno-gis/pom.xml +++ b/uno-gis/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - uno - cc.allio - 1.1.9 + uno-parent + cc.allio.uno + 1.2.0 4.0.0 @@ -13,20 +13,20 @@ - cc.allio + cc.allio.uno uno-starter-core - cc.allio + cc.allio.uno uno-data-api - cc.allio + cc.allio.uno uno-auto provided - cc.allio + cc.allio.uno uno-test test @@ -106,4 +106,4 @@ - \ No newline at end of file + diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/GeometryTypes.java b/uno-gis/src/main/java/cc/allio/uno/gis/GeometryTypes.java index 6ab18e37..af618f89 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/GeometryTypes.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/GeometryTypes.java @@ -10,7 +10,6 @@ * 空间数据类型 * * @author j.x - * @date 2022/12/9 21:07 * @since 1.1.2 */ public final class GeometryTypes extends Types { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/GisUtil.java b/uno-gis/src/main/java/cc/allio/uno/gis/GisUtil.java index 3cbbafc1..01d10314 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/GisUtil.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/GisUtil.java @@ -19,7 +19,6 @@ * Gis 实用工具集 * * @author j.x - * @date 2023/2/27 16:18 * @since 1.1.3 */ public class GisUtil { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/SRID.java b/uno-gis/src/main/java/cc/allio/uno/gis/SRID.java index d86864d5..40b4aefc 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/SRID.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/SRID.java @@ -7,7 +7,6 @@ * Spatial Reference System Identifier check * * @author j.x - * @date 2022/12/8 15:07 * @since 1.1.2 */ @Getter diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/annotation/GeoJsonTransform.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/annotation/GeoJsonTransform.java index 7b6c696f..f1704960 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/annotation/GeoJsonTransform.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/annotation/GeoJsonTransform.java @@ -20,7 +20,6 @@ * * * @author j.x - * @date 2022/12/8 10:58 * @since 1.1.2 */ @Documented diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/Feature.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/Feature.java index bd3cf421..f065bea6 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/Feature.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/Feature.java @@ -12,11 +12,6 @@ /** * 〈功能简述〉
* 〈〉 - * - * @author Mr.QL - * @ClassName Feature - * @Date 2022-03-18 17:11 - * @Version 1.0 */ @GeoJsonType(type = FeatureType.FEATURE) @JsonSerialize(using = GeoJsonSerializer.class) diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/FeatureCollection.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/FeatureCollection.java index ef1629ab..3be6ecd4 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/FeatureCollection.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/FeatureCollection.java @@ -15,11 +15,6 @@ /** * 〈功能简述〉
* 〈封装Feature集合〉 - * - * @author Mr.QL - * @ClassName FeatureCollection - * @Date 2022-03-13 0:12 - * @Version 1.0 */ @GeoJsonType(type = FeatureType.FEATURE_COLLECTION) @JsonSerialize(using = GeoJsonSerializer.class) diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/GeometryCollection.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/GeometryCollection.java index 852d4f71..96e08493 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/GeometryCollection.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/collection/GeometryCollection.java @@ -14,11 +14,6 @@ /** * 〈功能简述〉
* 〈封装Geometry集合〉 - * - * @author Mr.QL - * @ClassName GeometryCollection - * @Date 2022-03-13 0:13 - * @Version 1.0 */ @GeoJsonType(type = FeatureType.GEOMETRY_COLLECTION) @JsonSerialize(using = GeoJsonSerializer.class) diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/deserializer/GeoJsonDeserializer.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/deserializer/GeoJsonDeserializer.java index 7f13fe1b..93cda912 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/deserializer/GeoJsonDeserializer.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/deserializer/GeoJsonDeserializer.java @@ -19,11 +19,6 @@ /** * 〈功能简述〉
* 〈〉 - * - * @author Mr.QL - * @ClassName GeoJsonDeserializer - * @Date 2022-03-05 13:44 - * @Version 1.0 */ public class GeoJsonDeserializer extends JsonDeserializer implements ContextualDeserializer { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/introspector/IgnoreJsonTypeInfoIntrospector.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/introspector/IgnoreJsonTypeInfoIntrospector.java index a3b8e329..7aaa4822 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/introspector/IgnoreJsonTypeInfoIntrospector.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/introspector/IgnoreJsonTypeInfoIntrospector.java @@ -11,11 +11,6 @@ /** * 〈功能简述〉
* 〈〉 - * - * @author Mr.QL - * @ClassName ignoreJsonTypeInfoIntrospector - * @Date 2022-03-05 18:19 - * @Version 1.0 */ public class IgnoreJsonTypeInfoIntrospector extends JacksonAnnotationIntrospector { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/BaseIgnoreDeserializerObjectMapper.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/BaseIgnoreDeserializerObjectMapper.java index 9833a71e..5b2aac98 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/BaseIgnoreDeserializerObjectMapper.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/BaseIgnoreDeserializerObjectMapper.java @@ -8,11 +8,6 @@ /** * 〈功能简述〉
* 〈〉 - * - * @author Mr.QL - * @ClassName BaseIgnoreDeserializerObjectMapper - * @Date 2022-03-12 22:28 - * @Version 1.0 */ public abstract class BaseIgnoreDeserializerObjectMapper { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/FeatureCollectionGeoJsonParser.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/FeatureCollectionGeoJsonParser.java index 3abff1ea..078ea411 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/FeatureCollectionGeoJsonParser.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/FeatureCollectionGeoJsonParser.java @@ -23,11 +23,6 @@ /** * 〈功能简述〉
* 〈〉 - * - * @author Mr.QL - * @ClassName FeatureCollectionGeoJsonParser - * @Date 2022-03-12 23:13 - * @Version 1.0 */ public class FeatureCollectionGeoJsonParser extends BaseIgnoreDeserializerObjectMapper implements GeoJsonBaseParser { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/FeatureGeoJsonParser.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/FeatureGeoJsonParser.java index 60eb13f8..a9323650 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/FeatureGeoJsonParser.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/FeatureGeoJsonParser.java @@ -21,11 +21,6 @@ /** * 〈功能简述〉
* 〈〉 - * - * @author Mr.QL - * @ClassName FeatureGeoJsonParser - * @Date 2022-03-12 22:38 - * @Version 1.0 */ public class FeatureGeoJsonParser extends BaseIgnoreDeserializerObjectMapper implements GeoJsonBaseParser { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/GeoJsonBaseParser.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/GeoJsonBaseParser.java index 8ed4c206..00603c33 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/GeoJsonBaseParser.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/GeoJsonBaseParser.java @@ -7,11 +7,6 @@ /** * 〈功能简述〉
* 〈〉 - * - * @author Mr.QL - * @ClassName BaseParser - * @Date 2022-03-12 22:13 - * @Version 1.0 */ public interface GeoJsonBaseParser { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/GeometryCollectionGeoJsonParser.java b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/GeometryCollectionGeoJsonParser.java index 7b66a7aa..abed0de6 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/GeometryCollectionGeoJsonParser.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/jackson/geojson/parser/GeometryCollectionGeoJsonParser.java @@ -21,11 +21,6 @@ /** * 〈功能简述〉
* 〈〉 - * - * @author Mr.QL - * @ClassName FeatureCollectionGeoJsonParser - * @Date 2022-03-12 23:13 - * @Version 1.0 */ public class GeometryCollectionGeoJsonParser extends BaseIgnoreDeserializerObjectMapper implements GeoJsonBaseParser { public GeometryCollectionGeoJsonParser(JavaType valueType, Class deserializeClazz) { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryCollectionJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryCollectionJavaType.java index dfe6b1bc..bb3d4de2 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryCollectionJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryCollectionJavaType.java @@ -8,7 +8,6 @@ * GeometryCollection * * @author j.x - * @date 2023/4/18 16:11 * @since 1.1.4 */ public class GeometryCollectionJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryJavaType.java index 546ce3e4..9ec985d8 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/GeometryJavaType.java @@ -8,7 +8,6 @@ * Geometry * * @author j.x - * @date 2023/4/18 16:08 * @since 1.1.4 */ public class GeometryJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LineStringJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LineStringJavaType.java index ef9bfb5f..78094fa3 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LineStringJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LineStringJavaType.java @@ -8,7 +8,6 @@ * LineString * * @author j.x - * @date 2023/4/18 15:59 * @since 1.1.4 */ public class LineStringJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LinearRingJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LinearRingJavaType.java index 7381ff0f..327e6f0a 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LinearRingJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/LinearRingJavaType.java @@ -8,7 +8,6 @@ * LinearRing * * @author j.x - * @date 2023/4/18 15:59 * @since 1.1.4 */ public class LinearRingJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiLineStringJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiLineStringJavaType.java index fc47a16e..61f131d1 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiLineStringJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiLineStringJavaType.java @@ -8,7 +8,6 @@ * MultiLineString * * @author j.x - * @date 2023/4/18 15:59 * @since 1.1.4 */ public class MultiLineStringJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPointJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPointJavaType.java index b1008b62..b2d6fc6c 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPointJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPointJavaType.java @@ -8,7 +8,6 @@ * MultiPoint * * @author j.x - * @date 2023/4/18 16:00 * @since 1.1.4 */ public class MultiPointJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPolygonJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPolygonJavaType.java index 2e55d890..c98aeb9a 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPolygonJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/MultiPolygonJavaType.java @@ -8,7 +8,6 @@ * MultiPolygon * * @author j.x - * @date 2023/4/18 16:01 * @since 1.1.4 */ public class MultiPolygonJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PointJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PointJavaType.java index 3e931ba1..2e672e9f 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PointJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PointJavaType.java @@ -8,7 +8,6 @@ * Point * * @author j.x - * @date 2023/4/18 16:01 * @since 1.1.4 */ public class PointJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PolygonJavaType.java b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PolygonJavaType.java index 66afb579..baccd872 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PolygonJavaType.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/local/type/PolygonJavaType.java @@ -8,7 +8,6 @@ * Polygon * * @author j.x - * @date 2023/4/18 16:02 * @since 1.1.4 */ public class PolygonJavaType extends JavaTypeImpl { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/mybatis/MybatisTransform.java b/uno-gis/src/main/java/cc/allio/uno/gis/mybatis/MybatisTransform.java index c0ee88f5..79d48498 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/mybatis/MybatisTransform.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/mybatis/MybatisTransform.java @@ -13,7 +13,6 @@ * mybatis 数据库坐标转换，用于实体上。 * * @author j.x - * @date 2022/12/8 20:46 * @since 1.1.2 */ @Documented diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/mybatis/type/AbstractGeometryTypeHandler.java b/uno-gis/src/main/java/cc/allio/uno/gis/mybatis/type/AbstractGeometryTypeHandler.java index 00578637..bf98ce25 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/mybatis/type/AbstractGeometryTypeHandler.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/mybatis/type/AbstractGeometryTypeHandler.java @@ -3,13 +3,13 @@ import cc.allio.uno.gis.SRID; import cc.allio.uno.gis.config.UnoGisProperties; import lombok.extern.slf4j.Slf4j; +import net.postgis.jdbc.PGgeometry; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.WKTReader; import org.locationtech.jts.io.WKTWriter; -import org.postgis.PGgeometry; import java.sql.CallableStatement; import java.sql.PreparedStatement; @@ -43,7 +43,7 @@ protected AbstractGeometryTypeHandler(UnoGisProperties gisProperties) { @Override public void setNonNullParameter(PreparedStatement ps, int i, T parameter, JdbcType jdbcType) throws SQLException { PGgeometry pGgeometry = new PGgeometry(WRITER_POOL.get().write(parameter)); - org.postgis.Geometry geometry = pGgeometry.getGeometry(); + net.postgis.jdbc.geometry.Geometry geometry = pGgeometry.getGeometry(); geometry.setSrid(gisProperties.getDefaultSrid()); ps.setObject(i, pGgeometry); } diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/AnnoTransform.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/AnnoTransform.java index 42005990..76284ca9 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/AnnoTransform.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/AnnoTransform.java @@ -12,7 +12,6 @@ * 根据对象上标识的注解，寻找适合于它的{@link CrsTransform}实例 * * @author j.x - * @date 2022/12/8 20:25 * @see FromTo * @since 1.1.2 */ diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/CrsTransform.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/CrsTransform.java index e9947ee6..f7f2d5a8 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/CrsTransform.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/CrsTransform.java @@ -6,7 +6,6 @@ * 坐标转换 * * @author j.x - * @date 2022/12/8 11:13 * @see BaseCrsTransform * @see JTSCrsTransform * @see FromTo diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/CrsTransformBuilder.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/CrsTransformBuilder.java index 4a7e08aa..4dd97345 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/CrsTransformBuilder.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/CrsTransformBuilder.java @@ -9,7 +9,6 @@ * {@link CrsTransform}对象构造器 * * @author j.x - * @date 2023/2/27 16:39 * @since 1.1.3 */ public class CrsTransformBuilder { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/FromTo.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/FromTo.java index 9e78fc48..a62dcbb8 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/FromTo.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/FromTo.java @@ -8,7 +8,6 @@ * 坐标系转换关系 * * @author j.x - * @date 2022/12/8 20:09 * @since 1.1.2 */ @Documented @@ -36,4 +35,4 @@ * @return */ Class transform() default JTSCrsTransform.class; -} \ No newline at end of file +} diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/JTSCrsTransform.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/JTSCrsTransform.java index 7ef8647f..1aed6f0a 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/JTSCrsTransform.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/JTSCrsTransform.java @@ -12,7 +12,6 @@ * JTS坐标系转换 * * @author j.x - * @date 2022/12/8 11:24 * @since 1.1.2 */ @Slf4j diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadWrite.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadWrite.java index 5b3cfb77..97b4fb21 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadWrite.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadWrite.java @@ -4,7 +4,6 @@ * 定义读写（序列化）标识常量 * * @author j.x - * @date 2022/12/8 20:29 * @since 1.1.2 */ public enum ReadWrite { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadWriteCrsTransform.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadWriteCrsTransform.java index 2923418d..a686c575 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadWriteCrsTransform.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadWriteCrsTransform.java @@ -6,7 +6,6 @@ * 可读（序列化）写（反序列化）的坐标转换 * * @author j.x - * @date 2022/12/8 18:27 * @since 1.1.2 */ class ReadWriteCrsTransform implements CrsTransform { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadableCrsTransform.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadableCrsTransform.java index b7cbb2f7..260d3252 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadableCrsTransform.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/ReadableCrsTransform.java @@ -6,7 +6,6 @@ * 读CrsTransform 标识接口 * * @author j.x - * @date 2022/12/8 19:37 * @since 1.1.2 */ class ReadableCrsTransform implements CrsTransform { diff --git a/uno-gis/src/main/java/cc/allio/uno/gis/transform/WritableCrsTransform.java b/uno-gis/src/main/java/cc/allio/uno/gis/transform/WritableCrsTransform.java index 045b6a5f..b4578c79 100644 --- a/uno-gis/src/main/java/cc/allio/uno/gis/transform/WritableCrsTransform.java +++ b/uno-gis/src/main/java/cc/allio/uno/gis/transform/WritableCrsTransform.java @@ -6,7 +6,6 @@ * 可写的CrsTransform * * @author j.x - * @date 2022/12/8 19:38 * @since 1.1.2 */ class WritableCrsTransform implements CrsTransform { diff --git a/uno-gis/src/test/java/cc/allio/uno/gis/jackson/JacksonTest.java b/uno-gis/src/test/java/cc/allio/uno/gis/jackson/JacksonTest.java index c1e818bc..75d9a2dc 100644 --- a/uno-gis/src/test/java/cc/allio/uno/gis/jackson/JacksonTest.java +++ b/uno-gis/src/test/java/cc/allio/uno/gis/jackson/JacksonTest.java @@ -40,12 +40,6 @@ * geojson序列化实体定义 * * @author j.x - * @GeoJsonType 注解该geojson对象的类型 - * @JsonSerialize(using = {@link GeoJsonSerializer}) 注释该实体使用{@link GeoJsonSerializer}进行序列化 - * @JsonDeserialize(using = GeoJsonDeserializer.class) 注释该实体使用{@link GeoJsonDeserializer}进行反序列化 - * @GeoJsonId、@GeoJsonGeometry适用于字段上或者getxxx()方法，表明该字段进行geojson数据的何种形式 - * @GeoJsonProperties、@GeoJsonProperty是互为互斥的两个注解，都是构建geojson-properties属性，其中@GeoJsonProperties只能出现一次，@GeoJsonProperty在同一个对象中可以多次出现 - * @date 2022/9/26 14:43 * @since 1.0 */ class JacksonTest extends BaseTestCase { diff --git a/uno-http/pom.xml b/uno-http/pom.xml index 3a1a2335..fc835f89 100644 --- a/uno-http/pom.xml +++ b/uno-http/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cc.allio - uno - 1.1.9 + cc.allio.uno + uno-parent + 1.2.0 4.0.0 @@ -15,11 +15,12 @@ 21 21 UTF-8 + 4.12.0 - cc.allio + cc.allio.uno uno-core @@ -44,10 +45,11 @@ com.squareup.okhttp3 mockwebserver + ${mockserver.version} test - cc.allio + cc.allio.uno uno-test test diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/BaseHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/BaseHttpRequest.java index 9a21161a..d655d3d8 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/BaseHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/BaseHttpRequest.java @@ -31,8 +31,7 @@ /** * 基本的Http请求对象 * - * @author jw - * @date 2021/12/6 23:36 + * @author j.x */ public abstract class BaseHttpRequest implements HttpRequestMetadata { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/ClientResponseWrapper.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/ClientResponseWrapper.java index 64ca1436..621c327f 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/ClientResponseWrapper.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/ClientResponseWrapper.java @@ -7,6 +7,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.nio.ByteBuffer; +import java.util.Map; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -19,8 +20,7 @@ /** * WebFlux{@link ClientResponse}的包装对象 * - * @author jw - * @date 2021/12/7 14:29 + * @author j.x */ @Slf4j public class ClientResponseWrapper implements HttpResponseMetadata { @@ -114,6 +114,11 @@ public URI getURI() { return null; } + @Override + public Map getAttributes() { + return Map.of(); + } + @Override public HttpHeaders getHeaders() { return ClientResponseWrapper.this.response.headers().asHttpHeaders(); diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/DefaultHttpConfigurationMetadata.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/DefaultHttpConfigurationMetadata.java index 7d2e34dc..47f0f519 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/DefaultHttpConfigurationMetadata.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/DefaultHttpConfigurationMetadata.java @@ -5,8 +5,7 @@ /** * Http配置默认实现 * - * @author jw - * @date 2021/12/8 10:29 + * @author j.x */ public class DefaultHttpConfigurationMetadata implements HttpConfigurationMetadata { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/DeleteHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/DeleteHttpRequest.java index 779ea686..6fe10f93 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/DeleteHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/DeleteHttpRequest.java @@ -5,8 +5,7 @@ /** * 基于WebFlux的DELETE Http请求 * - * @author jw - * @date 2021/12/8 0:49 + * @author j.x */ public class DeleteHttpRequest extends BaseHttpRequest { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/GetHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/GetHttpRequest.java index 43487a7d..71c78d9f 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/GetHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/GetHttpRequest.java @@ -5,8 +5,7 @@ /** * 基于WebFlux的Get Http请求 * - * @author jw - * @date 2021/12/7 9:35 + * @author j.x */ public class GetHttpRequest extends BaseHttpRequest { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HeadHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HeadHttpRequest.java index 472ba204..320ac866 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HeadHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HeadHttpRequest.java @@ -5,8 +5,7 @@ /** * 基于WebFlux的Head Http请求 * - * @author jw - * @date 2021/12/8 23:21 + * @author j.x */ public class HeadHttpRequest extends BaseHttpRequest { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpConfigurationMetadata.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpConfigurationMetadata.java index b251a104..b8ab4be9 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpConfigurationMetadata.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpConfigurationMetadata.java @@ -5,8 +5,7 @@ /** * Http配置元数据 * - * @author jw - * @date 2021/12/8 10:23 + * @author j.x */ public interface HttpConfigurationMetadata { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpHeader.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpHeader.java index 2bbc4303..e809cf45 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpHeader.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpHeader.java @@ -9,8 +9,7 @@ /** * Http请求头 * - * @author jw - * @date 2021/12/6 23:18 + * @author j.x */ @Data @ToString diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpHeaderMetadata.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpHeaderMetadata.java index 7984a005..12b7ce69 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpHeaderMetadata.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpHeaderMetadata.java @@ -13,7 +13,6 @@ * Http Header元数据，提供一些数据的操作，如判断某个请求头是否存在，删除某个请求头等 * * @author j.x - * @date 2022/4/2 10:09 * @since 1.0.6 */ @ToString diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpMetadata.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpMetadata.java index f56f9552..bfeed570 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpMetadata.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpMetadata.java @@ -6,8 +6,7 @@ /** * 每个请求的元数据信息 * - * @author jw - * @date 2021/12/6 19:00 + * @author j.x */ public interface HttpMetadata { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpRequestMetadata.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpRequestMetadata.java index e06b84be..4f3cec47 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpRequestMetadata.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpRequestMetadata.java @@ -11,8 +11,7 @@ /** * 基于WebFlux的Http元数据 * - * @author jw - * @date 2021/12/6 23:12 + * @author j.x */ public interface HttpRequestMetadata extends HttpMetadata { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpRequestMetadataFactory.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpRequestMetadataFactory.java index 41876172..226e7e3f 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpRequestMetadataFactory.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpRequestMetadataFactory.java @@ -15,8 +15,7 @@ /** * Http请求元数据生成工厂 * - * @author jw - * @date 2021/12/7 11:17 + * @author j.x */ public class HttpRequestMetadataFactory { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpResponseAdapter.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpResponseAdapter.java index 7824041b..fde29568 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpResponseAdapter.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpResponseAdapter.java @@ -11,7 +11,6 @@ * Http响应适配 * * @author j.x - * @date 2022/6/16 17:03 * @since 1.0 */ public abstract class HttpResponseAdapter { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpResponseMetadata.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpResponseMetadata.java index 7c07d451..3086ad7e 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpResponseMetadata.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpResponseMetadata.java @@ -9,8 +9,7 @@ /** * 基于WebFlux的响应 * - * @author jw - * @date 2021/12/6 23:14 + * @author j.x */ public interface HttpResponseMetadata extends HttpMetadata { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpSwapper.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpSwapper.java index d5f5fae3..f455544f 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpSwapper.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/HttpSwapper.java @@ -29,8 +29,7 @@ /** * Http请求的交换者 * - * @author jw - * @date 2021/12/7 11:06 + * @author j.x */ @Slf4j public class HttpSwapper { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/OptionsHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/OptionsHttpRequest.java index 0703c27c..9b6b9645 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/OptionsHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/OptionsHttpRequest.java @@ -5,8 +5,7 @@ /** * 基于WebFlux的Options Http请求 * - * @author jw - * @date 2021/12/8 23:23 + * @author j.x */ public class OptionsHttpRequest extends BaseHttpRequest { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/Parameter.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/Parameter.java index 33a317b7..09e9a49f 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/Parameter.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/Parameter.java @@ -7,7 +7,6 @@ * 请求参数 * * @author j.x - * @date 2022/8/24 18:08 * @since 1.0 */ @Data diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/PatchHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/PatchHttpRequest.java index d5be5b7e..f9349698 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/PatchHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/PatchHttpRequest.java @@ -5,8 +5,7 @@ /** * 基于WebFlux的Patch Http请求 * - * @author jw - * @date 2021/12/8 23:20 + * @author j.x */ public class PatchHttpRequest extends PutHttpRequest { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/PostHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/PostHttpRequest.java index 9e1b11d7..0c9329c5 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/PostHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/PostHttpRequest.java @@ -5,8 +5,7 @@ /** * 基于WebFlux的Post Http请求 * - * @author jw - * @date 2021/12/7 10:49 + * @author j.x */ public class PostHttpRequest extends BaseHttpRequest { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/PutHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/PutHttpRequest.java index 47e520e5..550c3aba 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/PutHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/PutHttpRequest.java @@ -5,8 +5,7 @@ /** * 基于WebFlux的Put Http请求 * - * @author jw - * @date 2021/12/8 0:48 + * @author j.x */ public class PutHttpRequest extends BaseHttpRequest { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/TraceHttpRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/TraceHttpRequest.java index 4a60054e..5dbd7674 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/TraceHttpRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/TraceHttpRequest.java @@ -5,8 +5,7 @@ /** * 基于WebFlux的Trace Http请求 * - * @author jw - * @date 2021/12/8 23:23 + * @author j.x */ public class TraceHttpRequest extends BaseHttpRequest { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/FormDataHttpRequestBody.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/FormDataHttpRequestBody.java index d1089d6f..52d0778e 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/FormDataHttpRequestBody.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/FormDataHttpRequestBody.java @@ -6,7 +6,6 @@ * Media-Type -> multipart/form-data * * @author j.x - * @date 2022/10/19 17:47 * @since 1.1.0 */ public class FormDataHttpRequestBody extends FormUrlencodedHttpRequestBody { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/FormUrlencodedHttpRequestBody.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/FormUrlencodedHttpRequestBody.java index e6536df8..5f18daaf 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/FormUrlencodedHttpRequestBody.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/FormUrlencodedHttpRequestBody.java @@ -16,7 +16,6 @@ * Media-Type = application/x-www-form-urlencoded * * @author j.x - * @date 2022/10/19 15:38 * @since 1.1.0 */ public class FormUrlencodedHttpRequestBody implements HttpRequestBody { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/HttpRequestBody.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/HttpRequestBody.java index 2fcdd8bc..50c256b3 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/HttpRequestBody.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/HttpRequestBody.java @@ -13,7 +13,6 @@ * HTTP请求Body，包装{@link BodyInserters} * * @author j.x - * @date 2022/10/19 15:25 * @since 1.1.0 */ public interface HttpRequestBody { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/HttpRequestBodyRegistry.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/HttpRequestBodyRegistry.java index 97cc3e8a..0ac53623 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/HttpRequestBodyRegistry.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/HttpRequestBodyRegistry.java @@ -14,7 +14,6 @@ * Http-Request注册表，设计参考于{@link ReactiveAdapterRegistry} * * @author j.x - * @date 2022/10/19 16:26 * @since 1.1.0 */ public class HttpRequestBodyRegistry { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/JsonHttpRequestBody.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/JsonHttpRequestBody.java index e64d48cd..9b18d8d1 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/body/JsonHttpRequestBody.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/body/JsonHttpRequestBody.java @@ -14,7 +14,6 @@ * MediaType = application/json时 * * @author j.x - * @date 2022/10/19 15:28 * @since 1.1.0 */ public class JsonHttpRequestBody implements HttpRequestBody { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/exception/SwapperException.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/exception/SwapperException.java index 81c319e6..16f6eefd 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/exception/SwapperException.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/exception/SwapperException.java @@ -4,7 +4,6 @@ * HTTP Swapper过程中发生错误抛出该异常 * * @author j.x - * @date 2022/8/25 09:54 * @since 1.0 */ public class SwapperException extends RuntimeException { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/DefaultHttpChainContext.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/DefaultHttpChainContext.java index fad0fea3..aa445ded 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/DefaultHttpChainContext.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/DefaultHttpChainContext.java @@ -10,7 +10,6 @@ * HTTP链上下文对象 * * @author j.x - * @date 2022/8/24 16:42 * @since 1.0 */ public class DefaultHttpChainContext implements HttpChainContext { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/DefaultTokenManager.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/DefaultTokenManager.java index 77d4beb7..2a922247 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/DefaultTokenManager.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/DefaultTokenManager.java @@ -4,7 +4,6 @@ * 基于内存默认Token管理器 * * @author j.x - * @date 2022/8/25 09:27 * @since 1.0 */ public class DefaultTokenManager implements TokenManager { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/ExchangeInterceptor.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/ExchangeInterceptor.java index 69b4d76d..8f3e8297 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/ExchangeInterceptor.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/ExchangeInterceptor.java @@ -21,7 +21,6 @@ * 数据交换Interceptor * * @author j.x - * @date 2022/8/24 16:53 * @since 1.0 */ @Slf4j @@ -69,4 +68,4 @@ public Mono execute(Chain Mono.just(new ClientResponseWrapper(res, () -> requestMetadata))); } -} \ No newline at end of file +} diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/HttpChainContext.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/HttpChainContext.java index 00034877..baaa3a32 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/HttpChainContext.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/HttpChainContext.java @@ -8,7 +8,6 @@ * HTTP链上下文对象 * * @author j.x - * @date 2022/8/25 14:45 * @since 1.0 */ public interface HttpChainContext extends ChainContext { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/Interceptor.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/Interceptor.java index 26225c62..deb813ba 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/Interceptor.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/Interceptor.java @@ -8,7 +8,6 @@ * HTTP拦截器 * * @author j.x - * @date 2022/8/24 16:41 * @since 1.0 */ public interface Interceptor extends Node { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenInterceptor.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenInterceptor.java index 673b3c74..d9ae818f 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenInterceptor.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenInterceptor.java @@ -22,7 +22,6 @@ * Token认证拦截器，当请求没有Token认证时，此时会经过此验证 * * @author j.x - * @date 2022/8/24 17:11 * @since 1.0 */ @Order(Integer.MIN_VALUE) diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenManager.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenManager.java index f45fcb0c..5f09dc96 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenManager.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenManager.java @@ -4,7 +4,6 @@ * Token管理器 * * @author j.x - * @date 2022/8/25 09:26 * @since 1.0 */ public interface TokenManager { diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenRequest.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenRequest.java index 3c658d6a..60e4d2b9 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenRequest.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenRequest.java @@ -13,7 +13,6 @@ * 存放Token请求与验证等操作 * * @author j.x - * @date 2022/8/25 09:23 * @since 1.0 */ @Data diff --git a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenRequestBuilder.java b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenRequestBuilder.java index b30618e1..49119b4b 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenRequestBuilder.java +++ b/uno-http/src/main/java/cc/allio/uno/http/metadata/interceptor/TokenRequestBuilder.java @@ -17,7 +17,6 @@ * {@link TokenRequest}构建器 * * @author j.x - * @date 2022/8/25 09:24 * @since 1.0 */ public class TokenRequestBuilder { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/AbstractPrimaryParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/AbstractPrimaryParser.java index 31ec8795..9f87210e 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/AbstractPrimaryParser.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/AbstractPrimaryParser.java @@ -9,8 +9,7 @@ * 抽象解析器，泛化一些操作，实现解耦，复用。
* 实现抽象类的字类必须提供SimpleModule的支持，也就是说在具体解析的过程中需要自定义序列化器与反序列化器。
* - * @author jw - * @date 2021/12/5 12:34 + * @author j.x */ public abstract class AbstractPrimaryParser implements Parser { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/DefaultParserContext.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/DefaultParserContext.java index f2427c6f..2a7f8219 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/DefaultParserContext.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/DefaultParserContext.java @@ -8,8 +8,7 @@ /** * 默认解析器上下文 * - * @author jw - * @date 2021/12/5 10:44 + * @author j.x */ public class DefaultParserContext implements ParserContext { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/HttpRequestAssembly.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/HttpRequestAssembly.java index fa368e2c..0d5be624 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/HttpRequestAssembly.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/HttpRequestAssembly.java @@ -2,8 +2,7 @@ /** * 根据OpenApi规范组装Http - * @author jw - * @date 2021/12/6 23:11 + * @author j.x */ public class HttpRequestAssembly { } diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiConverter.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiConverter.java index b72c34b0..7426c09d 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiConverter.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiConverter.java @@ -9,8 +9,7 @@ /** * 解析Open Api规范，转换成能够支撑请求与响应的{@link HttpSwapper} * - * @author jw - * @date 2021/12/8 22:54 + * @author j.x */ public interface OpenApiConverter { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiSpecificationParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiSpecificationParser.java index 29c67e46..58a0a5d5 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiSpecificationParser.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiSpecificationParser.java @@ -7,8 +7,7 @@ /** * Open Api解析器，可以用来解析v2，v3的OpenApi。OpenApi规范可以看OpenAPI-Specification * - * @author jw - * @date 2021/12/4 22:51 + * @author j.x */ public class OpenApiSpecificationParser { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiV3Assembly.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiV3Assembly.java index dde30b5d..3f00a8b2 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiV3Assembly.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/OpenApiV3Assembly.java @@ -18,8 +18,7 @@ /** * 组装Open Api V3，转换成对应的{@link HttpSwapper} * - * @author jw - * @date 2021/12/6 19:36 + * @author j.x */ public class OpenApiV3Assembly implements OpenApiConverter { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/Parser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/Parser.java index fab90bb3..0c06b6f5 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/Parser.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/Parser.java @@ -6,8 +6,7 @@ * 2.次解析器 * 主解析器关联者次解析器，在主的解析器的生命周期内，将会调用次解析器的生命周期。 * - * @author jw - * @date 2021/12/5 9:55 + * @author j.x */ public interface Parser { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/ParserContext.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/ParserContext.java index bbeda78f..26d90a81 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/ParserContext.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/ParserContext.java @@ -7,8 +7,7 @@ /** * 存储着解析使用的工具 * - * @author jw - * @date 2021/12/5 10:12 + * @author j.x */ public interface ParserContext { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/ParserExecution.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/ParserExecution.java index 11fbdb0f..92afd81d 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/ParserExecution.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/ParserExecution.java @@ -12,8 +12,7 @@ /** * 解析器执行者 * - * @author jw - * @date 2021/12/5 10:28 + * @author j.x */ public class ParserExecution { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/OpenApiParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/OpenApiParser.java index eaf66935..db8c7476 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/OpenApiParser.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/OpenApiParser.java @@ -13,8 +13,7 @@ /** * OpenApi v3解析器 * - * @author jw - * @date 2021/12/5 10:12 + * @author j.x */ public class OpenApiParser extends AbstractPrimaryParser { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SchemaParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SchemaParser.java index c27608fe..c3e496e9 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SchemaParser.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SchemaParser.java @@ -18,8 +18,7 @@ * 通过jackson解析成OpenApi时，无法把所有schema对象都尽可能生成。 * 比如说ArraySchema，ComposedSchema等对象无法解析。因此创建Schema解析目的在于怎么解析这些 * - * @author jw - * @date 2021/12/5 9:52 + * @author j.x */ public class SchemaParser implements Parser> { diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SecuritySchemeInParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SecuritySchemeInParser.java index 51a46592..31e02593 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SecuritySchemeInParser.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SecuritySchemeInParser.java @@ -12,8 +12,7 @@ /** * Todo * - * @author jw - * @date 2021/12/6 14:05 + * @author j.x */ public class SecuritySchemeInParser implements Parser { @Override diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SecuritySchemeTypeParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SecuritySchemeTypeParser.java index 34d8662d..1af5ae88 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SecuritySchemeTypeParser.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/SecuritySchemeTypeParser.java @@ -12,8 +12,7 @@ /** * Todo * - * @author jw - * @date 2021/12/6 14:05 + * @author j.x */ public class SecuritySchemeTypeParser implements Parser { @Override diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/StyleEnumParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/StyleEnumParser.java index f70f7fbb..23108904 100644 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/StyleEnumParser.java +++ b/uno-http/src/main/java/cc/allio/uno/http/openapi/v3/StyleEnumParser.java @@ -11,8 +11,7 @@ /** * Todo - * @author jw - * @date 2021/12/5 21:44 + * @author j.x */ public class StyleEnumParser implements Parser { diff --git a/uno-http/src/test/java/cc/allio/uno/http/api/OpenApiV3AssemblyTest.java b/uno-http/src/test/java/cc/allio/uno/http/api/OpenApiV3AssemblyTest.java index 47659ed9..e5e80f6f 100644 --- a/uno-http/src/test/java/cc/allio/uno/http/api/OpenApiV3AssemblyTest.java +++ b/uno-http/src/test/java/cc/allio/uno/http/api/OpenApiV3AssemblyTest.java @@ -17,8 +17,7 @@ /** * OpenApiV3Assembly测试 * - * @author jw - * @date 2021/12/8 23:19 + * @author j.x */ class OpenApiV3AssemblyTest extends BaseTestCase { diff --git a/uno-http/src/test/java/cc/allio/uno/http/metadata/HttpSwapperTest.java b/uno-http/src/test/java/cc/allio/uno/http/metadata/HttpSwapperTest.java index 105060db..cddb3fe5 100644 --- a/uno-http/src/test/java/cc/allio/uno/http/metadata/HttpSwapperTest.java +++ b/uno-http/src/test/java/cc/allio/uno/http/metadata/HttpSwapperTest.java @@ -17,8 +17,7 @@ /** * Http交换对象测试 * - * @author jw - * @date 2021/12/7 14:48 + * @author j.x */ class HttpSwapperTest extends HttpTestCase { diff --git a/uno-http/src/test/java/cc/allio/uno/http/metadata/HttpTestCase.java b/uno-http/src/test/java/cc/allio/uno/http/metadata/HttpTestCase.java index d3951066..8ed77e3e 100644 --- a/uno-http/src/test/java/cc/allio/uno/http/metadata/HttpTestCase.java +++ b/uno-http/src/test/java/cc/allio/uno/http/metadata/HttpTestCase.java @@ -11,7 +11,6 @@ * Http测试 * * @author j.x - * @date 2022/8/25 16:15 * @since 1.0 */ public abstract class HttpTestCase extends BaseTestCase { diff --git a/uno-http/src/test/java/cc/allio/uno/http/metadata/interceptor/ExchangeInterceptorTest.java b/uno-http/src/test/java/cc/allio/uno/http/metadata/interceptor/ExchangeInterceptorTest.java index db338011..48c84765 100644 --- a/uno-http/src/test/java/cc/allio/uno/http/metadata/interceptor/ExchangeInterceptorTest.java +++ b/uno-http/src/test/java/cc/allio/uno/http/metadata/interceptor/ExchangeInterceptorTest.java @@ -14,7 +14,6 @@ * 测试数据交换拦截器 * * @author j.x - * @date 2022/8/25 14:55 * @since 1.0 */ class ExchangeInterceptorTest extends HttpTestCase { diff --git a/uno-http/src/test/java/cc/allio/uno/http/metadata/interceptor/TokenInterceptorTest.java b/uno-http/src/test/java/cc/allio/uno/http/metadata/interceptor/TokenInterceptorTest.java index 069f7bad..68ac22e7 100644 --- a/uno-http/src/test/java/cc/allio/uno/http/metadata/interceptor/TokenInterceptorTest.java +++ b/uno-http/src/test/java/cc/allio/uno/http/metadata/interceptor/TokenInterceptorTest.java @@ -15,7 +15,6 @@ * 测试{@link TokenInterceptor} * * @author j.x - * @date 2022/8/25 09:46 * @since 1.0 */ class TokenInterceptorTest extends HttpTestCase { diff --git a/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi3ParserTest.java b/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi3ParserTest.java index 3f054c19..e51c4f9d 100644 --- a/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi3ParserTest.java +++ b/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi3ParserTest.java @@ -9,8 +9,7 @@ * 测试驱动开发 Open Api v3 解析器单测 * 使用Springfox解析Open Api * - * @author jw - * @date 2021/12/4 9:59 + * @author j.x */ class OpenApi3ParserTest extends BaseTestCase { diff --git a/uno-http/src/test/java/cc/allio/uno/http/openapi/ParserExecutionTest.java b/uno-http/src/test/java/cc/allio/uno/http/openapi/ParserExecutionTest.java index 4e8a54c4..fa0662cb 100644 --- a/uno-http/src/test/java/cc/allio/uno/http/openapi/ParserExecutionTest.java +++ b/uno-http/src/test/java/cc/allio/uno/http/openapi/ParserExecutionTest.java @@ -16,8 +16,7 @@ /** * 解析器执行者单元测试用例 * - * @author jw - * @date 2021/12/6 10:28 + * @author j.x */ class ParserExecutionTest extends BaseTestCase { diff --git a/uno-kafka/pom.xml b/uno-kafka/pom.xml index 6a071268..ce8b681e 100644 --- a/uno-kafka/pom.xml +++ b/uno-kafka/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cc.allio - uno - 1.1.9 + cc.allio.uno + uno-parent + 1.2.0 uno-kafka @@ -19,7 +19,7 @@ - cc.allio + cc.allio.uno uno-core @@ -27,7 +27,7 @@ reactor-kafka - cc.allio + cc.allio.uno uno-test test diff --git a/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaManagement.java b/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaManagement.java index 7d884a08..37e5c919 100644 --- a/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaManagement.java +++ b/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaManagement.java @@ -12,7 +12,6 @@ * Kafka管理器 * * @author j.x - * @date 2022/6/23 16:42 * @since 1.0 */ public class UnoKafkaManagement { diff --git a/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaProperties.java b/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaProperties.java index df3ec3e8..9bf4e0b9 100644 --- a/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaProperties.java +++ b/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaProperties.java @@ -14,7 +14,6 @@ * Kafka配置参数configuration * * @author j.x - * @date 2022/2/25 09:29 * @since 1.0 */ @Data diff --git a/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaReceiver.java b/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaReceiver.java index c7c9e2b3..89da4ed4 100644 --- a/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaReceiver.java +++ b/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaReceiver.java @@ -24,7 +24,6 @@ * 封装{@link KafkaReceiver} * * @author j.x - * @date 2022/6/23 16:38 * @since 1.0 */ @Slf4j diff --git a/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaSender.java b/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaSender.java index 90286eb4..f8fbc80b 100644 --- a/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaSender.java +++ b/uno-kafka/src/main/java/cc/allio/uno/kafka/UnoKafkaSender.java @@ -19,7 +19,6 @@ * 自定义Kafka发送者，包含缓冲区速率控制，给定超时时间 * * @author j.x - * @date 2022/6/23 16:19 * @since 1.0 */ @Slf4j diff --git a/uno-kafka/src/main/java/cc/allio/uno/kafka/endpoint/KafkaSource.java b/uno-kafka/src/main/java/cc/allio/uno/kafka/endpoint/KafkaSource.java index 9c80c539..c88d5433 100644 --- a/uno-kafka/src/main/java/cc/allio/uno/kafka/endpoint/KafkaSource.java +++ b/uno-kafka/src/main/java/cc/allio/uno/kafka/endpoint/KafkaSource.java @@ -13,7 +13,6 @@ * Kafka数据源 * * @author j.x - * @date 2022/11/22 10:41 * @since 1.1.1 */ @Slf4j diff --git a/uno-kafka/src/main/java/cc/allio/uno/kafka/endpoint/ReactiveKafkaSource.java b/uno-kafka/src/main/java/cc/allio/uno/kafka/endpoint/ReactiveKafkaSource.java index 59030a95..39a00bdc 100644 --- a/uno-kafka/src/main/java/cc/allio/uno/kafka/endpoint/ReactiveKafkaSource.java +++ b/uno-kafka/src/main/java/cc/allio/uno/kafka/endpoint/ReactiveKafkaSource.java @@ -15,7 +15,6 @@ * reactive kafka source * * @author j.x - * @date 2023/4/27 18:09 * @since 1.1.4 */ @Slf4j diff --git a/uno-netty/pom.xml b/uno-netty/pom.xml index cb32bb85..3dd499aa 100644 --- a/uno-netty/pom.xml +++ b/uno-netty/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cc.allio - uno - 1.1.9 + cc.allio.uno + uno-parent + 1.2.0 uno-netty @@ -19,7 +19,7 @@ - cc.allio + cc.allio.uno uno-core @@ -27,7 +27,7 @@ netty-all - cc.allio + cc.allio.uno uno-test test diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/AbstractInvoker.java b/uno-netty/src/main/java/cc/allio/uno/netty/AbstractInvoker.java index 60a66153..10406c7c 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/AbstractInvoker.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/AbstractInvoker.java @@ -4,8 +4,7 @@ /** * screw - * @author jiangw - * @date 2020/12/8 17:18 + * @author j.x * @since 1.0 */ public abstract class AbstractInvoker implements Invoker { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/AbstractNettyService.java b/uno-netty/src/main/java/cc/allio/uno/netty/AbstractNettyService.java index a733301c..390c5637 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/AbstractNettyService.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/AbstractNettyService.java @@ -33,8 +33,7 @@ * abstract netty server implementation * 提供一般性的异步/同步调用。请求/响应前处理。过滤器链 * - * @author jiangw - * @date 2020/12/24 10:36 + * @author j.x * @since 1.0 */ @Slf4j diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/ChannelGroup.java b/uno-netty/src/main/java/cc/allio/uno/netty/ChannelGroup.java index 54d947d3..3159441f 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/ChannelGroup.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/ChannelGroup.java @@ -4,8 +4,7 @@ /** * 连接的管道组 - * @author jiangw - * @date 2020/11/28 12:08 + * @author j.x * @since 1.0 */ public interface ChannelGroup { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/Connector.java b/uno-netty/src/main/java/cc/allio/uno/netty/Connector.java index aa5b0ea4..3ba5bdec 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/Connector.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/Connector.java @@ -7,8 +7,7 @@ /** * screw连接器 - * @author jiangw - * @date 2020/12/22 13:54 + * @author j.x * @since 1.0 */ public interface Connector extends Comparable{ diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/Invoker.java b/uno-netty/src/main/java/cc/allio/uno/netty/Invoker.java index 5c1ff6de..a384e742 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/Invoker.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/Invoker.java @@ -6,8 +6,7 @@ /** * 调用 - * @author jiangw - * @date 2020/11/27 21:47 + * @author j.x * @since 1.0 */ public interface Invoker { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/NettyAbstractConnector.java b/uno-netty/src/main/java/cc/allio/uno/netty/NettyAbstractConnector.java index 5c901b22..cff20eff 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/NettyAbstractConnector.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/NettyAbstractConnector.java @@ -8,8 +8,7 @@ /** * Netty连接器 * - * @author jiangw - * @date 2020/12/2 14:06 + * @author j.x * @since 1.0 */ public abstract class NettyAbstractConnector implements Connector { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/NettyClient.java b/uno-netty/src/main/java/cc/allio/uno/netty/NettyClient.java index 21de3dbc..ee69336d 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/NettyClient.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/NettyClient.java @@ -35,8 +35,7 @@ /** * 一个netty的客户端 * - * @author jiangw - * @date 2020/11/26 11:44 + * @author j.x * @since 1.0 */ @Slf4j diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/NettyServer.java b/uno-netty/src/main/java/cc/allio/uno/netty/NettyServer.java index 0264983f..636c87bc 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/NettyServer.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/NettyServer.java @@ -22,8 +22,7 @@ /** * 一个netty的服务端 * - * @author jiangw - * @date 2020/11/26 11:18 + * @author j.x * @since 1.0 */ @Slf4j @@ -163,4 +162,4 @@ protected void channelRead0(ChannelHandlerContext ctx, RemoteTransporter msg) th doRequestAndResponse(ctx, msg); } } -} \ No newline at end of file +} diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/NonAckScanner.java b/uno-netty/src/main/java/cc/allio/uno/netty/NonAckScanner.java index b09f1153..956a0e36 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/NonAckScanner.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/NonAckScanner.java @@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentMap; /** - * @author jiangw + * @author j.x */ public class NonAckScanner implements Runnable { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/Protocol.java b/uno-netty/src/main/java/cc/allio/uno/netty/Protocol.java index ea81f742..f7fbb02c 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/Protocol.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/Protocol.java @@ -4,7 +4,7 @@ * 4 │ 1 │ 1 │ 8 │ 4 │ * MAGIC Sign Type Invoke Id Body Length Body Content * - * @author jiangw + * @author j.x */ public class Protocol { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/RemoteService.java b/uno-netty/src/main/java/cc/allio/uno/netty/RemoteService.java index 06ef7647..46c4642b 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/RemoteService.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/RemoteService.java @@ -12,8 +12,7 @@ import java.util.concurrent.ExecutorService; /** - * @author jiangw - * @date 2020/12/7 21:02 + * @author j.x * @since 1.0 */ public interface RemoteService { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/AbstractInvokeFuture.java b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/AbstractInvokeFuture.java index ce0d3095..a12b1bb6 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/AbstractInvokeFuture.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/AbstractInvokeFuture.java @@ -11,7 +11,7 @@ /** * 参考{@link FutureTask}实现 * - * @author jiangw + * @author j.x */ public abstract class AbstractInvokeFuture implements InvokeFuture { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/Callback.java b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/Callback.java index 11a199fd..6f8c5b64 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/Callback.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/Callback.java @@ -5,8 +5,7 @@ /** * 回调接口 * 做这个目的是提供一个执行代码时机的策略，即做成消息事件 - * @author jiangw - * @date 2021/4/15 10:41 + * @author j.x * @since 1.0 */ public interface Callback { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/FutureListener.java b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/FutureListener.java index 6d9406f5..cd906241 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/FutureListener.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/FutureListener.java @@ -2,8 +2,7 @@ /** * TDD - * @author jiangw - * @date 2020/12/4 15:55 + * @author j.x * @since 1.0 */ public interface FutureListener { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/InvokeFuture.java b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/InvokeFuture.java index 6908160a..969b1f7c 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/InvokeFuture.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/InvokeFuture.java @@ -5,8 +5,7 @@ import java.util.concurrent.TimeoutException; /** - * @author jiangw - * @date 2020/12/4 15:54 + * @author j.x * @since 1.0 */ public interface InvokeFuture extends RunnableFuture { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/InvokeFutureContext.java b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/InvokeFutureContext.java index c64d0e64..ef74a06b 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/InvokeFutureContext.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/InvokeFutureContext.java @@ -6,8 +6,7 @@ /** * 存储当前异步的上下文。 * - * @author jiangw - * @date 2020/12/8 11:40 + * @author j.x * @since 1.0 */ public class InvokeFutureContext { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/NamedThreadFactory.java b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/NamedThreadFactory.java index c0331a85..04dd7aea 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/NamedThreadFactory.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/concurrent/NamedThreadFactory.java @@ -6,8 +6,7 @@ /** * screw * - * @author jiangw - * @date 2020/12/10 17:28 + * @author j.x * @since 1.0 */ public class NamedThreadFactory implements ThreadFactory { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/config/NettyClientConfig.java b/uno-netty/src/main/java/cc/allio/uno/netty/config/NettyClientConfig.java index 460acc4f..7da081d1 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/config/NettyClientConfig.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/config/NettyClientConfig.java @@ -6,8 +6,7 @@ * netty-Client的一些配置项 * 1.地址 * 2.工作线程核心数 - * @author jiangw - * @date 2020/11/26 9:30 + * @author j.x * @since 1.0 */ public class NettyClientConfig { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/config/NettyServerConfig.java b/uno-netty/src/main/java/cc/allio/uno/netty/config/NettyServerConfig.java index 72ae5e44..0a385d1a 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/config/NettyServerConfig.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/config/NettyServerConfig.java @@ -11,8 +11,7 @@ * 1.端口 * 2.工作反应器的线程数 * 3.注册中心地址 - * @author jiangw - * @date 2020/11/26 9:20 + * @author j.x * @since 1.0 */ public class NettyServerConfig { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/event/BaseEvent.java b/uno-netty/src/main/java/cc/allio/uno/netty/event/BaseEvent.java index 15014dff..b27f96a0 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/event/BaseEvent.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/event/BaseEvent.java @@ -5,8 +5,7 @@ /** * 基本事件 * - * @author jiangw - * @date 2021/4/16 14:59 + * @author j.x * @since 1.0 */ public abstract class BaseEvent implements Event { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/event/ConnectionEvent.java b/uno-netty/src/main/java/cc/allio/uno/netty/event/ConnectionEvent.java index bce730b6..70fe7a96 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/event/ConnectionEvent.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/event/ConnectionEvent.java @@ -3,8 +3,7 @@ /** * 连接发生的事件 * - * @author jiangw - * @date 2021/4/16 15:09 + * @author j.x * @since 1.0 */ public class ConnectionEvent extends BaseEvent { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/event/Event.java b/uno-netty/src/main/java/cc/allio/uno/netty/event/Event.java index debde70b..1962a321 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/event/Event.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/event/Event.java @@ -7,7 +7,6 @@ * * * @author j.x - * @date 2023/1/29 13:44 * @see ConnectionEvent * @see Observer * @since 1.1.4 diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/event/Observable.java b/uno-netty/src/main/java/cc/allio/uno/netty/event/Observable.java index 87bf72cd..36439d12 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/event/Observable.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/event/Observable.java @@ -2,8 +2,7 @@ /** * 被观察者 - * @author jiangw - * @date 2021/4/16 14:58 + * @author j.x * @since 1.0 */ public interface Observable { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/event/Observer.java b/uno-netty/src/main/java/cc/allio/uno/netty/event/Observer.java index b450bd8c..6675e5c6 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/event/Observer.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/event/Observer.java @@ -2,8 +2,7 @@ /** * 观察者 - * @author jiangw - * @date 2021/4/16 14:56 + * @author j.x * @since 1.0 */ public interface Observer { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/exception/ConnectionException.java b/uno-netty/src/main/java/cc/allio/uno/netty/exception/ConnectionException.java index ec78442c..7b781871 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/exception/ConnectionException.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/exception/ConnectionException.java @@ -2,8 +2,7 @@ /** * screw - * @author jiangw - * @date 2020/12/10 17:34 + * @author j.x * @since 1.0 */ public class ConnectionException extends Exception { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/exception/ExceptionTraceStack.java b/uno-netty/src/main/java/cc/allio/uno/netty/exception/ExceptionTraceStack.java index 2cc37f00..ee3eb404 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/exception/ExceptionTraceStack.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/exception/ExceptionTraceStack.java @@ -5,8 +5,7 @@ /** * 自定义异常栈 - * @author jiangw - * @date 2021/1/16 15:41 + * @author j.x * @since 1.0 */ public class ExceptionTraceStack { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/exception/InvokeFutureException.java b/uno-netty/src/main/java/cc/allio/uno/netty/exception/InvokeFutureException.java index bd009311..6bd35192 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/exception/InvokeFutureException.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/exception/InvokeFutureException.java @@ -2,8 +2,7 @@ /** * screw - * @author jiangw - * @date 2020/12/8 18:00 + * @author j.x * @since 1.0 */ public class InvokeFutureException extends Exception { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteException.java b/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteException.java index 30786bad..67a1704d 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteException.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteException.java @@ -2,8 +2,7 @@ /** * screw - * @author jiangw - * @date 2020/12/10 17:33 + * @author j.x * @since 1.0 */ public class RemoteException extends Exception { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteSendException.java b/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteSendException.java index 2ae6ee15..69fdb67c 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteSendException.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteSendException.java @@ -2,8 +2,7 @@ /** * screw - * @author jiangw - * @date 2020/12/10 17:33 + * @author j.x * @since 1.0 */ public class RemoteSendException extends RemoteException { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteTimeoutException.java b/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteTimeoutException.java index 30c469eb..70acb162 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteTimeoutException.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/exception/RemoteTimeoutException.java @@ -2,8 +2,7 @@ /** * screw - * @author jiangw - * @date 2020/12/10 17:33 + * @author j.x * @since 1.0 */ public class RemoteTimeoutException extends RemoteException { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/filter/AbstractFilter.java b/uno-netty/src/main/java/cc/allio/uno/netty/filter/AbstractFilter.java index 42acd9ba..849b1a0f 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/filter/AbstractFilter.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/filter/AbstractFilter.java @@ -2,8 +2,7 @@ /** * screw - * @author jiangw - * @date 2020/12/8 17:18 + * @author j.x * @since 1.0 */ public abstract class AbstractFilter implements Filter { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/filter/DefaultFilterChain.java b/uno-netty/src/main/java/cc/allio/uno/netty/filter/DefaultFilterChain.java index 956f42f6..4076e88f 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/filter/DefaultFilterChain.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/filter/DefaultFilterChain.java @@ -4,8 +4,7 @@ /** * screw - * @author jiangw - * @date 2020/12/8 17:18 + * @author j.x * @since 1.0 */ public class DefaultFilterChain implements FilterChain { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/filter/Filter.java b/uno-netty/src/main/java/cc/allio/uno/netty/filter/Filter.java index b329f5b4..7374d6cd 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/filter/Filter.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/filter/Filter.java @@ -5,8 +5,7 @@ /** * screw * - * @author jiangw - * @date 2020/12/8 17:18 + * @author j.x * @since 1.0 */ public interface Filter extends Comparable { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterChain.java b/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterChain.java index fb4ff0f9..bd68f81b 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterChain.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterChain.java @@ -17,8 +17,7 @@ *

* 过滤链由{@link FilterChainLoader#loadChain(Filter...)}与{@link FilterChainLoader#loadPriority(FilterChain)}创建 *

- * @author jiangw - * @date 2020/11/27 21:50 + * @author j.x * @since 1.0 */ public interface FilterChain { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterChainLoader.java b/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterChainLoader.java index 18f7071c..235f0284 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterChainLoader.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterChainLoader.java @@ -6,8 +6,7 @@ /** * 一个过滤器链的加载器 * - * @author jiangw - * @date 2020/11/27 22:10 + * @author j.x * @since 1.0 */ public class FilterChainLoader { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterContext.java b/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterContext.java index 93af65f0..5199d05e 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterContext.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/filter/FilterContext.java @@ -6,8 +6,7 @@ /** * screw - * @author jiangw - * @date 2020/12/8 17:18 + * @author j.x * @since 1.0 */ public class FilterContext { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/filter/ProcessRequestFilter.java b/uno-netty/src/main/java/cc/allio/uno/netty/filter/ProcessRequestFilter.java index 34009558..b0b6ded2 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/filter/ProcessRequestFilter.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/filter/ProcessRequestFilter.java @@ -6,8 +6,7 @@ /** * 作为处理过滤请求的最后一环 * - * @author jiangw - * @date 2020/12/24 11:46 + * @author j.x * @since 1.0 */ public class ProcessRequestFilter extends AbstractFilter { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/filter/ProcessResponseFilter.java b/uno-netty/src/main/java/cc/allio/uno/netty/filter/ProcessResponseFilter.java index 719b2e15..f1fecce0 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/filter/ProcessResponseFilter.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/filter/ProcessResponseFilter.java @@ -6,8 +6,7 @@ /** * 作为处理过滤响应的最后一环 * - * @author jiangw - * @date 2020/12/24 11:38 + * @author j.x * @since 1.0 */ public class ProcessResponseFilter extends AbstractFilter { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/handler/ClientIdleTrigger.java b/uno-netty/src/main/java/cc/allio/uno/netty/handler/ClientIdleTrigger.java index c32a82f8..7eb0b82a 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/handler/ClientIdleTrigger.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/handler/ClientIdleTrigger.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; /** - * @author jiangw + * @author j.x */ @ChannelHandler.Sharable @Slf4j diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/handler/ConnectorWatchDog.java b/uno-netty/src/main/java/cc/allio/uno/netty/handler/ConnectorWatchDog.java index e628c152..c725cbd1 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/handler/ConnectorWatchDog.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/handler/ConnectorWatchDog.java @@ -21,8 +21,7 @@ /** * 客户端重连检测 * - * @author jiangw - * @date 2020/11/25 22:42 + * @author j.x * @since 1.0 */ @ChannelHandler.Sharable diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/handler/ServerIdleTrigger.java b/uno-netty/src/main/java/cc/allio/uno/netty/handler/ServerIdleTrigger.java index 60b1835d..f4c6befe 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/handler/ServerIdleTrigger.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/handler/ServerIdleTrigger.java @@ -14,8 +14,7 @@ /** * screw - * @author jiangw - * @date 2020/12/8 20:10 + * @author j.x * @since 1.0 */ @ChannelHandler.Sharable diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/metadata/RegisterMetadata.java b/uno-netty/src/main/java/cc/allio/uno/netty/metadata/RegisterMetadata.java index c0518692..b0b3ce66 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/metadata/RegisterMetadata.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/metadata/RegisterMetadata.java @@ -9,8 +9,7 @@ /** * 注册的元数据 - * @author jiangw - * @date 2020/11/29 17:08 + * @author j.x * @since 1.0 */ @Data diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/metadata/ServiceMetadata.java b/uno-netty/src/main/java/cc/allio/uno/netty/metadata/ServiceMetadata.java index ca5564ee..3044c632 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/metadata/ServiceMetadata.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/metadata/ServiceMetadata.java @@ -7,8 +7,7 @@ /** * 服务器元数据 * - * @author jiangw - * @date 2020/11/28 13:58 + * @author j.x * @since 1.0 */ @Data diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/model/Byte.java b/uno-netty/src/main/java/cc/allio/uno/netty/model/Byte.java index 88b46d21..74ca8b65 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/model/Byte.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/model/Byte.java @@ -3,8 +3,7 @@ import java.io.Serializable; /** - * @author jiangw - * @date 2020/11/25 17:51 + * @author j.x * @since 1.0 */ public class Byte implements Serializable { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/model/HeartBeats.java b/uno-netty/src/main/java/cc/allio/uno/netty/model/HeartBeats.java index 031dc782..6e810a23 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/model/HeartBeats.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/model/HeartBeats.java @@ -6,7 +6,7 @@ /** * 心跳 - * @author jiangw + * @author j.x */ public class HeartBeats { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/model/MessageNonAck.java b/uno-netty/src/main/java/cc/allio/uno/netty/model/MessageNonAck.java index f5e1c754..8cc9948a 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/model/MessageNonAck.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/model/MessageNonAck.java @@ -6,8 +6,7 @@ /** * 还未确认的消息 - * @author jiangw - * @date 2020/12/10 17:32 + * @author j.x * @since 1.0 */ @Data diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/model/RemotePromisor.java b/uno-netty/src/main/java/cc/allio/uno/netty/model/RemotePromisor.java index 82254c91..0acbbb31 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/model/RemotePromisor.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/model/RemotePromisor.java @@ -5,8 +5,7 @@ /** * 远程调用的promisor - * @author jiangw - * @date 2020/11/26 10:14 + * @author j.x * @since 1.0 */ public class RemotePromisor { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/processor/NettyProcessor.java b/uno-netty/src/main/java/cc/allio/uno/netty/processor/NettyProcessor.java index 27a14d31..c6446cd7 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/processor/NettyProcessor.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/processor/NettyProcessor.java @@ -17,8 +17,7 @@ * 使用{@link AbstractNettyService#registerProcessors(byte, NettyProcessor, ExecutorService)}对某一类{@link NettyProcessor}进行注册 *

* @see Protocol - * @author jiangw - * @date 2020/11/26 17:08 + * @author j.x * @since 1.0 */ public interface NettyProcessor { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/processor/NettyProcessors.java b/uno-netty/src/main/java/cc/allio/uno/netty/processor/NettyProcessors.java index 6fc3a26e..9693b7f0 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/processor/NettyProcessors.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/processor/NettyProcessors.java @@ -12,8 +12,7 @@ /** * netty处理器的常量池 * - * @author jiangw - * @date 2020/11/29 18:25 + * @author j.x * @since 1.0 */ public class NettyProcessors { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/RemoteAddress.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/RemoteAddress.java index e7581ca1..3ebed875 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/RemoteAddress.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/RemoteAddress.java @@ -6,8 +6,7 @@ /** * 远程地址model * - * @author jiangw - * @date 2020/12/10 17:31 + * @author j.x * @since 1.0 */ @Data diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/UnresolvedAddress.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/UnresolvedAddress.java index e6252748..fa05ba21 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/UnresolvedAddress.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/UnresolvedAddress.java @@ -2,8 +2,7 @@ /** * screw - * @author jiangw - * @date 2020/12/10 17:31 + * @author j.x * @since 1.0 */ public interface UnresolvedAddress { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/AbstractBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/AbstractBody.java index 192c5f60..57c38a7d 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/AbstractBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/AbstractBody.java @@ -2,8 +2,7 @@ /** * screw - * @author jiangw - * @date 2020/12/22 17:28 + * @author j.x * @since 1.0 */ public abstract class AbstractBody implements Body { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/AcknowledgeBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/AcknowledgeBody.java index e6403de6..7dbe6901 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/AcknowledgeBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/AcknowledgeBody.java @@ -7,8 +7,7 @@ /** * Ack确认消息 * - * @author jiangw - * @date 2020/11/30 13:37 + * @author j.x * @since 1.0 */ @Data diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/Body.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/Body.java index e98fd630..4c824f51 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/Body.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/Body.java @@ -2,8 +2,7 @@ /** * 作为标识接口 - * @author jiangw - * @date 2020/11/25 17:58 + * @author j.x * @since 1.0 */ public interface Body { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/FailBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/FailBody.java index 3131f4dd..c6053b65 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/FailBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/FailBody.java @@ -6,8 +6,7 @@ /** * 失败body - * @author jiangw - * @date 2020/12/10 17:30 + * @author j.x * @since 1.0 */ @Data diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/MonitorBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/MonitorBody.java index 18487336..eedac751 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/MonitorBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/MonitorBody.java @@ -2,8 +2,7 @@ /** * 监听的body - * @author jiangw - * @date 2020/12/8 14:15 + * @author j.x * @since 1.0 */ public class MonitorBody implements Body { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/OfflineBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/OfflineBody.java index 26787ea4..53d6c3e7 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/OfflineBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/OfflineBody.java @@ -7,8 +7,7 @@ /** * 下线body - * @author jiangw - * @date 2020/12/10 17:30 + * @author j.x * @since 1.0 */ @Data diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/PublishBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/PublishBody.java index 90b3849d..92fd1a04 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/PublishBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/PublishBody.java @@ -8,8 +8,7 @@ /** * 发布的服务的信息体 - * @author jiangw - * @date 2020/11/29 17:25 + * @author j.x * @since 1.0 */ @Data diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/RegisterBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/RegisterBody.java index 9832927c..19435077 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/RegisterBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/RegisterBody.java @@ -7,8 +7,7 @@ /** * 服务注册body - * @author jiangw - * @date 2020/12/10 17:30 + * @author j.x * @since 1.0 */ @Data @@ -18,4 +17,4 @@ public class RegisterBody implements Body { private final List registerMetadata; -} \ No newline at end of file +} diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/RequestBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/RequestBody.java index ff3f0a3d..2ed16ba4 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/RequestBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/RequestBody.java @@ -9,8 +9,7 @@ /** * 请求body * - * @author jiangw - * @date 2020/12/10 17:30 + * @author j.x * @since 1.0 */ @Getter diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/ResponseBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/ResponseBody.java index 5d891042..629eb7c6 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/ResponseBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/ResponseBody.java @@ -4,8 +4,7 @@ /** * 响应body - * @author jiangw - * @date 2020/12/10 17:30 + * @author j.x * @since 1.0 */ public class ResponseBody extends AbstractBody { diff --git a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/SubscribeBody.java b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/SubscribeBody.java index a5699beb..95643735 100644 --- a/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/SubscribeBody.java +++ b/uno-netty/src/main/java/cc/allio/uno/netty/transport/body/SubscribeBody.java @@ -5,8 +5,7 @@ /** * 订阅body - * @author jiangw - * @date 2020/12/10 17:31 + * @author j.x * @since 1.0 */ @Data @@ -14,4 +13,4 @@ public class SubscribeBody implements Body { private ServiceMetadata serviceMetadata; -} \ No newline at end of file +} diff --git a/uno-plugins/README.md b/uno-plugins/README.md deleted file mode 100644 index feb35f3f..00000000 --- a/uno-plugins/README.md +++ /dev/null @@ -1,12 +0,0 @@ - - -插件的架构分为三层，分别是插件、组件、数据。 - -- **数据**：提供基本数据操作支持。 -- **组件**：提供基本的功能支持。 - - Http Component：拓展了HTTP调用，比如说：根据`OpenApi规范文档`生成具体的远程调用对象。 - - MQ Component：拓展MQ功能，提供简单的发布、订阅操作 - - Serial Search Component：对于时序数据库，提供的简单的api就可以查询到需要的时序数据 - - Model Component：对抽象模型进行定义，提供基本的模型或者文件模型 - - ... -- **插件**：组合不同的组件，对他们的提供的功能进行使用与拓展，最终形成可用的业务插件系统 \ No newline at end of file diff --git "a/uno-plugins/design/Uno\346\217\222\344\273\266\346\236\266\346\236\204.drawio" "b/uno-plugins/design/Uno\346\217\222\344\273\266\346\236\266\346\236\204.drawio" deleted file mode 100644 index b37cae9e..00000000 --- "a/uno-plugins/design/Uno\346\217\222\344\273\266\346\236\266\346\236\204.drawio" +++ /dev/null @@ -1 +0,0 @@ -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 \ No newline at end of file diff --git "a/uno-plugins/design/\351\235\236\344\276\265\345\205\245\345\274\217\346\217\222\344\273\266\350\256\276\350\256\241\346\226\271\346\241\210.pdf" "b/uno-plugins/design/\351\235\236\344\276\265\345\205\245\345\274\217\346\217\222\344\273\266\350\256\276\350\256\241\346\226\271\346\241\210.pdf" deleted file mode 100644 index df0ea615537096ee9e679180172d2b5f6fd0de2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252094 zcmcG$2UL?;_bxtG1Oy~VQJRPmgaAtKC?F^i5b1>8Yv{eHG(#1E&_O^zdM9)gLhm5G z*GTUHq}>wz=&x?~}&(lDM&xLEk zi!^Fs1fMzC}a_wL?oORxgFM`FsQxVz=E$gw4OE?#f((CyK=%;r5_&RWL(tflfOqB zXG6$em5n#>$Z{y_wVKZ8P5Pa2g)5!trfQL8_aTYmmo-cUiC1K4DZk~;8(|SrrbUh= zpB-_-oDyI~S7j4&17$x{Y1qOZ3^s9p#!*vDQMpH>z%-}Td|tdYwi3@V;H4^~PIwTJ zK~kV>DdlzTK>IF1Ur#{=aXZL)nnak=M!QZ<*Uio2B!9Vcz7wIhZl-_&A8xP++#+6( zT{$vT5YN47YumlBq?2yf(_X!FBczFcHU-<$xM*GWI95HX375y{(WT;8j+c>c)+60rlb|uZ!B$iM+i*aK4~7^xEy>Vn=>-GYeGWGGkfT^UGRdK{9=|4iB60 zu%V2upGHlTT4^5M+0NDwYo&QpZo%`|h)6{sI%l*=@S$Vq0{rFv?f8t*i@lrt%wCw` zO`#|J%@ZKC;Yvb} zcHg%@$(de$a&ULz z%rr(rZW%D(w2&qghO|8G5^bijzh!hg0Fx??e zIUd7Xxbft)Ju&3GlJ@?GT~D(%DGyLwA(e7bUbTbytUP4bq? zxh|C?;pIjk!!6-0?||WR;UD_1C2U?qO9Bs@NxuJxlVDZgJJf(+P!AWRa|w2fF}xAY z!+G-_zXJI%q~m(Di2ChY>~Rd;cc@w3^1No(Q`itESZ@-1RmZn2o+T4SGIrt8e1Muy zSX=WaMH#2$J6w$83l8PkGuW(-#J*!6DW9z9A>MgES|Q~gHL<*}94KR<>wb)w`FB43 zXbKx+|NQa`qJ#u1x+dFHAE=_kV+T@Inucztms>cp72jKl*}DaW+A#De)cD4_N)y;5u=YLAEz?dIh*-(% zb0C$2MfX<6>K5S~nU{9ZTC7fJ=ySY?Y>6lh6s{a6+fhdCT^p{u-gf=j=&ZR}oa^l& z11V&WP{~cp1gSeZ%20hXd98(#d&8K0b29C-#ReAM-jPoZnTc_d+2v_AMR6Di3y{oRMi zjqZoSG~zZdQaitvaeCe9^jfNBEfbfF*7@vb8Ryq{Wn*ZPa5;)z z@#_lLmL0_(T^e_|jW-P^SIIf9do;@-;`D|4r&DZT3uPdvNG$hH`7$Ep)QbkM;t@pY6RDkK8B~*9~dEs`{C9hcx%T zUyQEeqE2{7&8j%M<+5t6z_9ky&b)%k+oM}n=4cfM!2#{X6BRG>SFgr!3bX0b)+tm~ z^0^$45awG{vColQRl&zhQ2gRUU+w_*OLMEN!*^sk(S0=%}SV$6N?p3uM7!O&tgjI0

Hkd<~z8=lBzg8D>t8V41)@3pxCphT-tDNB!BT(VBF_<_h z$Z|O%3hKLlDqKAvR@N6Zc2fGLh=2KGv7+f$xx69ar3wb$xE&sDG3X^SdX#oc z)8VL3#z|z-edr;t#?}#$&Z*cD)DA)i+#8^F_&5PUigi#GqKVA`9Czue8~P#s{V*n{ z0Q8$ywHh9c+DWsfr_&`#1sfxh$V3hB&A&3JI`gb+2){hgx}c`9CW?}L;m`mgqv`9X zJ;i5Epz9E#)7XWAkJ{VD(?VGuo=RjDBGR%%Y2<_JG4*c8&3e|Z?Qg(48B{m3DZdp) zyS?|@ip?YIf#XRFaKofFoMc> z#fB}r;)i7q%AlMBe&&MoA13I=lSXDkq1RX?ZL-zW%{OhWHe3S7yH-ZY_LSWZi zPC{Fw=du~dbS{0_raYh6)lc-bA?xBh4v>K`Z&j1^We!NSK|Vp&T}eG6tX2Ao>eHJC z@xJ(<^1RFvD`X=oGeM>Sln%$Ghc-UtW@>qz{+~LIYwz4&4wXvL&AMl1S}N)@%Y~0548Sgii9>e%GzzCf zn(uE}>dnvSX>6{`O(ZhmPbrRPb8S1dK4d%ZRr!49V(sc6nrNr!!T4=(O~|{Kk@bBe5V0=Xhyy_GVf-Yx}#ffpbgvwj$>z1nZ}k=33Sp4_*_h zEs8G1tI8Q`#Z!c>@p~E=#>3rIh(&p5pMq#yJms+&WREbfX7(6~1sxW1Gj2WFNF_)f zTtdOGRo}FC9luqPMTs8S%YPL3gdSzDdm7K}E7mue|3LhanpQDb;mznb4=%`baD-)% z&kO!4v(v(ii#8eE=j7{$ogQ)x;8fRI-aE{ZdQ>$m$Ok(<*?FVIZ@@=j{p4_GBeE}L zXFMIJJiX!a1xOnd6R*`KJzNd@HZGrL=J~*&?z{^x1!yOlWJ2iKf%cUE$>x`GpAIAa zXnQSv+pT4Utp>C>Pp>}s9IaL;#K)}Vsz;QUwnw-=gzbFnrI=!*8L;aw-G@APH-uK> z{$C9-_*VkjOe9~k*kI~7X5snZ#&#d5XFr)Q zryhq%CT)jjZG<)J2!!VB;hRa}S*JTOw?EQ;b74lzDe1ENk>fRyotiiMeUpz(Fazr! zzY)GHp%&WCY-~!%lWcq)NFmuOq>gM+EIwCrE`L>ElrW&{!~RiIqYb1;>nTUnr8nhy zv-F=wf+r)NJtY@S>M|?&ko6#2TVp0&>#>Rd0!K1=c{f_v3s$u?u{ z=(5S9{g3<)G=&JIh1GG&jNRl`2a*z}68v(-?|3^pXKjuyR3bea2R;At_9q<2Gl1*= zx4Q*= z^#65-t@hR@6Y)`|&c68MtmnrMz2j8Fg;4Aa|eul>|^>h7-ay&6b7JJ|;Ki}8(`QIBO%&mK_2&En~FS{=D z>F1|PY{-w6no=XCkqH9q?C<`|!D0!>p+9$7*WaqhJ5{ApaL%DD+WKDH%bzD(T41`W zSn}ob?~}6N{Mg}-GXRg_d}TkjS2X>C_uP*&*Y$V&*kLR|Bo2T5&oA5ClKN(isc4>_t=-QHzF5*+i(2mV#8Ji=wA!|d8TUpf3c1EsUOzq z@P$ra{7)CA4gRv*+0mB{zpPeci$#Px_8oU?!p9C&<@@@Iwm&zA@#O7)ZGbrl?xWop zeTf~jHH-RCV}d0(b+PY;}rS4ny$eL%k3!>jApTQePfWLu-wqe zA9J4hJcg&_TFRVKQbtC`S}6ljC~|*$ zozQub!hM4|tfrX+)@4IgFpnhiFv-}|%DbWBGXHhO4F(l_5rQsb$69fo2toY_Tj)|) zHrqQeBY8C^b<2VRtJ_1aM9vcx>xaLigGUMvCyu<5;wz11bLstJxi&MJHvO05I;@f~HP4y)EVEJJ6@5(HDh!Gf$Q2ZfD%rH@7CQzC~C zEfuA4f{U*pqyBk|qzn-P5z91t7ES?&F$U7r)AOZj1L2TOl3-NLmzz(O3=kUC^MwO$ zjFfb53k4l}D&By9rq<~t4Aa#J1Q>hpY4}*+CME$}q5P%2XD|d_wT*kKW=!S?|CYc) z9`8ERvQYN*simNWRYQqun!Bq3IfePjM{3uD64$lif`yRY5tT&OxJla#)GZ%i2QMbD z?^rgyC@n0jbdsYmJc@45joTsgF!BT%CTH!i6eZU$RxwtlsX4o>9~N zXR0+YL&(Ao2Gjk>#RTU4-3ysDqsA+z-KQOKtG}i22=bE;F`w>Kl;02=sH-npI2Cb; z*JBx6xqf=EKO553%Ko_s<)M%qHDG7xx7`c7nPPZ9Nnn6?z1%Kc#6OJL@l9FjmYKs- ziDmY~h{m!we^gviBa?^90ZsI>v1Sa|*uci4%6jB!I%gw>9D`NYPsj8Rv{DS*^(p+F ztjf*`03Vw-dnwtfdo^!S?<Gm_{qagj^^AAYfmn{=aY}j>_5*Z1dQUnpb`PdI z`o>jwpd@WV3A;pMILF<$yr8x#zk+=g!Q3U(z{o-4R8rKkZtixUkF*e+Fm9duWhX%WlieaItEHCv~ikTshbH+r?Ir)9e3}idc?)) z83L=b>RnV`iRRW=KAKBtys_41ww4f3h;GXp=c}?lq}CGH<9ZjZK4AV7$@`qfT(#+- zl5GoSr6XOPiEFfrz#^SaOVTTvhK2-aA&-SuIb<)&6Tj6*5W)F`y7xyy)_Crz_bB(P0_Jn$j;mDh8|F4Y!lstp(UEKA=30k6^0m0cHI5i^~!~y>M+Ob zefxXLSg*$`vrDC(ip6+Afq`>%IbT5YKh6Yi0Gw~{cE!(EJz&@etZ6+Oh~Cw7gltY! z=v`*3V%DY>LLDvd9?tnyK8DReE&7&*r*>0p{jfI&c1COsmYp{67rw3uT%MR#ohffQ zOs1)H>zAbJELT2+t;a@j*>X8NEO-3tm!w*;i)B`IEN}0Z zPY=>hEc#%_upf_%`CxfM^C{$(H{3s2uh>@>)6K|H%jEcIXy13q;OnfAS35`wo4-p% z&d=cxUo}&3I+^NaSv+}wB+|NR95FyP(Hj##elR$IdX1`@?||RMV8@Fr9jqrZ6op&V ztLnPPG&+Y43Jv>&{`zydNr7tJ?*-<@yZSn(NI zdMiuT8k48mw>+P4i{nsV8|4kjwoni8Z~GF5^RiOi**-l7k%<93dE7P51QX^%lAOUpZq8&k6t_ zN7wW%xwRp*Is$_Si<@R5-_+9QLvjVaTEtF(*g7Z53)@H;Do|*w%w?Kr;?N-OfP5bt zt|CmY{480xfWdr@thlAX1g}ZZKL53RbU;y(^UKB*nZO%v=?PnElWjH~xW6ynSfLH@ zzL{$ad)zX(F-7l{i_&`dV0PLFa`Hq9DfP%9TD}QTdLG!p;YAMEV`d;g#x{7iAH&UR zrKCt%l|AiY%{!kL8`9}p8b5*RI^7qnWODV;+Fn}dbX5zHafLF$MmyKXd)%xXLe`^i z*(9W-?$Wnji2nr-&l04);}xJP&p)g(6FTNNJnD*CZU!+3SHt%aQ<|h*pe~xRa_i_r zZ^CI;N8tkA>S0yux|cK~(*)^*n$>{BvYJSU;nPQ?+_6p^+GhQy1b1^xBT)jR{6LvVv%1TTHE|Ne=4-|TlxeS^1)-2m z7fGZ!!icuos4Kx0yApq&R@>cJYn$Ei*|#|AULCpLkeh}142no=EEmQ=+DtE-AxKgO zK5}4 zN(#Rr%}9+$x29x=dvRh3;t&E_OkzmDawnTYHEq|hxRaybP@cb>WEFOX3$2&diW2Si zVCyOsGqx$nOS_QGZ#~T&1i2hTSwo<%uCB3yB#-Th=r`_`+dCEXMB@&-ry39JKB1lh zb*fyiBg4~fsdC~Nz@!SxEj_Rrhx^o}L_+TOICi|Kc~R9~7rwZtLRW3}FIC z)RM}b*6NP3!Kd{P16evOFe%)e0)}vIo3`sshxJXgA;ZP8+he|MJHIGLF8nvaQqlcM zL;m(G`?nW<5ue}2g#DyuKiL5}>zEC26@Sp6|D-%Tl&pQr|K@!~)4GUXM*GDD|3S7| zg=PlBGw2^k!AWDHqQ1gme~6OR_6(EVU;ybM_b+M&&?(N}4Cp_JUdR9Z)PJbvFJ||P zpiU#b{&y5^*y_(aP3KwnxhzfTBwBJr<>lqaEdVxo-ceuwztd;d-#IiZBFpNNb3xmy zwZ(TI{MSzPCXlHEWzPN8A%Kah``+fLH1$e^m_(T?sU&EG^Z83Qk;G=ag)CT(-yyg>0Gc zK^16_@PLzrYb_Q8JU83S_srY`cwL(vM&x`R{4;KWs(96l-OZ@>u~puHHTc3?AZFWo zX!I+WcmVl@n)>x(;K~i~fSNZy=nC!YI8rwfA1Q6^ zyvQ$~5D|3aV(?C`Z^j9FaGu;v;(U> zt|FWFE-=WxS{VZg43{$Yb-38}HcO0WJ_~-v_2+V(sV^ZuB!HuhK5okkggo)-5M~(W4#OpBjk6HQ05gU8i)VNUN(?oP+A)ZjgXp#6W52b3FwI)oq=yWk}mXmY0QVRmyVYNXkqo zyQvvR4w!86Q8wF^r_3@cNM88Wv0R*BVa-U&BfO$^3b1B=+CvFNX^7JLpRjD#*kC?P zjgTCq+|800MJr8$t}aW~kIKMdrYzUV7Gm&~D3Y@GRF?UMLRr?5l2VO`qDmOG~S@ZC9w95xKLc9o|^qq|PG|kLQ3)$@dqm$wFVKlMegxE)Z@DEXq(<| z326#MsU)ZhYnlyvha>k}D7*NV8yRv|=k~+=e3wd6VGOrREzA%(O3?zQF!$N_bvfsv z%lV=2bL<%^O3*Y=r8mqu6{Q|_ClkACgV9fvt2|Fnn%!lDlWAb&nU42<>V(W~XX@cl z$4-U*0d0S1veoS)nh;9$j)$3FcFD+WnHfLKoO5PAHKmXYlvI9FX{L0qIL{&%B{2vi z`Kp^}8;O;pPVzgxAt|u1_DWIxfzT=hMn34(*GbROzMGh$e|P%HsG2TK}2EG#Ua=K-kx-QgzlL8riQqV5tOls4HjsKMC zT3t*GFi%P7m$UuE?+89mv4Zl~cLcVj@c+I1+v_3B8ui>zxdASM-m^jYvA+NbaBT1t z6P1xQMI;;Z-?I1X8iS1#CjNWCS zmjp^uiA!6IPx`y8WKy`{zvS#-!p~}vPF7{ZDg$xqDpC636!1XC|AzweA5AJ}jNU^! znjdtgej*TvwNf8^o>$Be>%WWc5apyw&Fmo*?*C(%`=6rRnOy&Wgl#`H@;^}V{Mu`+ ze>Ek3BdUewUyAw{N^CN{n|IfW5b-`aPdFT_Bay;9|Vewfl z3%x~tcPqa>qQ`iN`H_(k5)eqF78uafxr&@xp-UH%R6{#HfLou4GN%>YL25nA`_(Bq zYZ~;IfN3UxiGc&xPqJwr5IU%C2Osd{0ph`7pR z<>fjQJt#8mE*nZRqc)=*wpjf5qNiEbv~1az5&tF0-m_K-^BPbK}n`eHA_* zFN83B!n>9p-7Q5o1`5!0Sz7q~L)QTvGvcYh1&M@)>AIQC=8RRHQTjr$KV`+y3sU|U7-NQxncoQl#oDL)R);fL3ebWbgdBH_ zGfgCO_9zok^S(<3r^GOE=D3PaHHE$%u{`gCcGCX2P`wD{=k?u>XaD18`XHSKM# zWdNm;t6ZkelQjQQow@RD=(Ryay&~gNA>Iiqi1iWUW~VHl{g-!+K|tP)JZ};;V%Mjs z>Vq1sS*KoDzw`%q*q&ua9hQP=j~uzCq@vXlYISm>5L-f?bcR@H&h3lJ9*DMjCQRbTN;yA+IR06>P$g)=Gt>PR?c$>r4e>YEv{Sz=K)BTgLloO|6pZ*`_|2;Zw_ zwHSpbV%9Z02ZChzlUBqWyez2&&6dUQ3<_vYUN+3lzS=HpF4T7SfSWw$c0b@8CGtvr z{S-qBE~b-@uz*>g0}8paKPdlB4-%189PgfvJ zkF75J>?w8l{OT9~7t~@{Z}1Ov0koWRwaT%gw9&SerW)wqZPnc~jq2#yij-P9m+tue zqF&yOm$QuUPYZk{l^|5ng_%STv;Z$v|^D7^exgitlf^B)nE^Upa z*7)~eTM7IaI7h{l@C3gTdccJk>sj7L80)89ecBxAcg(l*;%0P9l$!3n{p4}}ato6= zv8Rwfg4A~@WLC^7J9K=>QL0qk^+s(%{!~S7?+Lv*LZ~Y)pS6IcJ~$=|XRwpT-z{Gw zb~b{gz)k#Q);_U=*aSguGY>&PtmTENhMmWX`fnN_8ib>uPkEO?m4=%Bo^zi&Lj7i~ z81#%L4r+<*Oc7ZQQoo925zt)fAEw(Udvm|>)$wd{Zi5BIGTRkLHA|O}_WLk(9%Ge~ zPw$B7ppcp3mBCm9ksUWdQIW7$IY<;;PY()Kz8R5&0!bi<2yPrw6-oIP(fEjD>(N)D z(8RJt1+)y*V^4=m)I1Lz`iEL4wTS5tRwWVigd(>`{}w^RXCC+hs;n9+Aq7k^-UuNZ|1BA(&LB*0Y)2&?kfW#TX^oAf7XZnwsMVA9J5c$bJHa3|r=X zeO-t9O9BW6S|IEiYQr8fO|N&WN_Uq#-_g1mszUY-jF;C-5*8Lv?%0$E5+bTa16vUZ z7cqjEx|!B4)qnuKYNN$rs2SZbn=efqv1?Uh*px&mVJ@u@=k=>bmz}p7i%hZGBUN5p zcP2cs-C?iPqaUG#zcj5}2rsK?T0PjNa#HZyMD;HTjnsFjXp02J@8rmtS9xZ8d|U7v z%UN2EY(3^G>~x>e?RYUW|G{H zf`FKWQZqz)Y7=Yh$yhPZJ(>d+^rE=HeF6GC($FkM&vSk4?-yiq*XaxxmQ z=8jU_n?f{p;&C>$MN>GLXISjYRHNg$bS{Vg02M;4b$3gg*P89@l+0HANlYLGH=0-) zzouH%ad@vn3aVxD?tjDu_O$wnMJxK1xP=iy%uK+WI&Jel;prCq9hfi#ZtEhXRpO)Om{y_LcI@!bDZD6#ZY!h^I0j{CZRgRp(c)E zq3<4MV{0W9Q1h^$Yn``>b|SO|3#~+5Lds|SPBWCHHX~XK_*;@c&0M* zs`FQ~^Un~=?{|7XSZ+e{OWf6W0366=-2Ne^s80!rwIbG z`Z=8Tt7cEvt)5+_Gr2}*wDx$kHYXb7>8*9ZBfrMHJdlH51@e%cW3Cn_lWxh@YYJX` z1F)jOY}J%|?9QyJ36s0Ijwbw`iY2A_Ou*XV4lcAv@S^Mzo$!`NF z2}wyG+LIPpkF7q_<*z*{w~21A&RB*xo3NQ^?8g#XbC}&GZVKW(8~= zpk)BUN}auSva5Bvn-&WnDK_c5KqUAUb%CWKEiKJqZS25@%}qyFSJZ+{1<=DpeO}<= zF+^$ly@kv1h61Ju4;I_+bgU@?JXzIYczTaLQAO9gHM4F)Hy?dvo;htW_3Q=MYnpDG z4VXkvVN0{&rkj+MhfB(}G0LYecwaq7GOe)q*5P_@ks^5wmWgZAo>3#@Y_hu1XmQ6; zUs&zYJR81bBr0RYl3K{ct_{gDT58dj>KV=D^%kyS(*lm^)Kbi`C|73${KjQAV9f8i zT>&?qxxA%xP1*Bs73H}I)oLA;Ly9|&SvT2s2}Qb}+N6s;K}p@O4#vMETG6mmu>*)^ z;Z$`iD=QYL@w+EHmTan^<2eQq=aU0W(Yh8M1F$qm1(+_n*2@C1b^(%z6yc+zP*eaU zDVSEoW9Ms6)i-jw4`SK8udbOgE5$uI>yGS+?GJZ(AW_bc^tGz(&RBQ_E;R7Ds^Spr zDv~0}?dNL&H4qTEDB)#vmfI?7786wmp^`K$*`9!#7@?$CGO_84q6c_CqA-t5^2A5^oR#Vrldqq3PQA-xv+qy5eHZ;^m2?6NK*qt5<|4;_=s%5s*+|K5>| ziCKcfvbZekRXp5J4<~6UDcjOKnM_l0=~BsOog(Whof?aZ^6UYM5NFhJ z!j37IY3|LOa7ys=yRlxMdD-g}s!6vy#qGa&C=lR^WGo&j_KzSd-y5psS{qmyXmOHV zV33L3)=;-NDx3&&>Oc&K$xMX2b;yCCWcm(b2kpgZfn947PIo7XH3d_*jdCE>UH8_i zPrfY|EouoNdFA3&b!Sh$PVfhfe;v1NRMA~L`8vj0Q1-+Jt(x}hZJ$7~ny86)r+vbU zRU|pb2XGZ#wl@bfvmym$AJ-$ST(FDwVkA85mMyB%Ph8n9j1Ou!j)!>cq?{QFT;r(j zx>_>4W7%4Vn+T?Hl(24BZXZQ*ERaxux!3Ioj1-z`bexexRO~izqtCDCp%UJo7d{+L zz8d}L$=LEnkk@!MN;33vyl#`n1?13!gEav#<@(s`)aG4@`jMxThm-_|@8^ys6(a|h zi)s!<*L_H)^ZF+;<`Q^uF_nk!CP9*#wrVwZ{R|QUgDNIPB{fs7wF1F+b{_%1TXk>^ zQVF?mT6U?}baZsA4i_=Ro=EeVHCDzu??DE;8_8v&a{Eo$;rdG6&#iqX^)I()t|G-y zOzWD90V@--VE<~%wFDFj-RXH(O?Pj=e8NHuIYju?09R2do40^55uxLpu0M9Lc264- zfBLK#J)zh}ogq^tK^N|)V*NcA<`PY#5hP+_V$PI}QqAsVMQbOkUqCp10Ufm@EY_b= zMm#x}PZA}=q-V=`x|a#KDtUwxiGwI^*?hqZp8po(_D#DCBtVx)EaD_P&ZSv2&0pBhimk&WHk&N!Ml0uaYq* zwL`4aeMsQZ-hwD_56Dk2lj}AA7*+V1a89_0dc|Je=6k;qt*gWKrvmc9ptdp!=*poF zPb*0By4rjH%!|k}OdaB*obDteT%pG!Ke+CBzLlsytz$x-RqKi~zUMQSn;cvP7xi#yd_p5ARv3 z4NK^MM@I{jM?0TIs)k!2dw-Y|Vi)kTJ& zMsyx8u^GbMz8n|~vPsIb^E?CbOqasjuB>iNDIN8i0%%-$q{rA-DUN~)&Mp=BA~PQq zWlqyir+hwLC6ZUS1j&t5QBzOmqtdjl6Y?xTf3*5hdwjsGH4f_&@zSSvud^i;zf0ex zyM9(;T5Xb^sPCUoQhz)xE}4^Sqpo(~&z##l%AzDXz!A^!b+T}5u`u$8idBh5;wgxh zSQ?X;IZ!%wQuDmo*8HI5GO6O0kLc1XrGxsmEO z;CjDR12VH0Sb|aOM-F978zj~80S3Pb)H#9Kc$`KYkNE)-8j?d3-RU8fiy1I%?D)V?<+>DelI!yDm^MQGXbOw*O-FN z@W&3nw_QLT;w%7FtdsY3fz3%}{3*WnUzV7FUmS?mj0ApT8OV;n(Vw8u@jxEU$}C}t zl(Yw4h?{PdsL8Vf%z)N`$h9gRR$J446juaW!ry8u%VvXo-vNvrO4SUT3%Ca(SG7*2 zMf;OniI4zCX*Qh!Azc@Zvy(l`W3ExLKA+V45vU?~%x6{P3`AW=mi^cty;9u6D&|2KPv=lqK`F~`ujZG5g8*9F^6IAaX@ zYHe+8aT6W9pRa?AqSLmO70qC41$s?eow^D9R#TrwO3ZLBUq(VyUx>v+=cM&z=br1c zuXjRnzgM7+<%%Q(Wiu=|H(}9!_|2I!Q~mjtdXcdCI)q}D60Ri5Wp^nwG<0})xXLk| z4ZL-?kimwL{oYpe-r9AAABq0AIa5H_WfZnWt@k&kf&YEOd|TwKx8hU%7jyFZigVoS z?)Tytf8dcwG3^F~`45kkoFr;0ci{V2!6UUioF`o6L=oBkV++;fKJs;{1L=c7y)fOh zL4z|-edGkdVy^ZyI#V$V$)=UCrx~tv8>R64qBmFufH`vBs!F2V-*zhGT%hec73Sg5;I)rduNn9aZk5Q|CAYCZ zA7y3!PAe9#IU{|32M4L`*;!Nhq|Dyt^ z)AYZx1H2%`D+KVrq>vwZ2e^;Q+{dFmq=+_Upcl0l|85&n;{=e$GoGom>ZS1GfXMwB z0FJUmg9+zYwi?270bmS1BcOV_@3dN-rH_QL<7t%`Q_Oeq%0Bl z;=U^7NU%H#QgRAtS(qwZuzS%COwx@^S)pNRemFUU4Yb7h*7Q#GPF`=c-#3f~k^>F? z3QtM2a8zFLlAM6hgqZNr%z5yikQu3Vb>u#7+o?E@2OV={a-SCO7k) z*SU=-0nNt{27a@aw2EBbE4DMS+(W>~T8jvdMy?S8CpN6dI{c$)VwV2joC_3AgR_&T z0$Hbo=tU>c)u|jDD{ zYqILf+A1CTxf?T*#c{^diGlSHm{RWTy__R}+92QtXG;8y`YEd-FF9T1MqFJBQhp&| z3axt0$>c!Y`1`0?kwug~B}PP1PXf{J@9GbMSpP&K`w)YxatAd zn$Uu=Yvpwd<*2H+m_Q0z{|)a@#ejsaa0ygZY@uf}bD`#gYfL+~R^ogHLw_}?=<2~R z_6L@h0t}=zc~@~K3Eu%%BVwJI53IKaT)@l@~qY*#^m)kKL(${02e-QNm_T#Gqh-ceP{%+K9@QUqU7oD zwN9tBeB!9m1sY{VO>kaKGJ{KptvDt%3i0o|=F06b28j+ncI$Hrk#sgU!V9s-iS+w$ zv>Vj>9{xcZwMS65^*e zIv$Xe3G?QIC+UoFRx%IFT;lCrT$C@YSLN3bvzc+zuU7C|whKL0s#_dRA0&_-Ypwzt zanY^*Kn=;Qt)D=YTh4=zEyX#lYHc-)r|eO6pDV*;4k5+mIb4b3R1r4x&v4w*%2bJ1 z18#(ITYfDSa`0rwdI-Q%-h+d!cCnQ16B7ZnWBt6T>+Cs$M(%r;@E9s00Bx9K>O7J+ zGfMKLa+Qe31fM}P(KPHf5xszxa;hV{RJPXN3oC*NnguSEd_<3DtZ{%JNWb2E5}U%o zMEZblJXm`yGIpAH;!_8|Vfaw&i5{ii0Y;1M| zi1qB2C$EQ>fRS07)Rb}e*{KR7(7H@eDoF2JS=s|H3qN*j{*COw7pfZSC0&Yt&k4X6 zTYF6r1jBokS8BR7WvUJ%4GM^ z5_pQ-$#D7UKpg6EnJUI`eC;k}ehSueB)D$0niDxB#J?E7buPwGEI||F6k!SjKy8I0 znz3MT&arMnxy}KMM-7aEex64Z_YOYYh9*}F$9lTN%k}6ZSuS;|K??2y1r_MQouN~J zQ3CV_X76<1zeW0)r?|W#O(m-Nl;SS4c{h29hAm`i&stftn4*uO{G#d%e{xG}Gbq-l zCYQ1p?pd=Zo=)FwFtEy{Lb<|9LO0x8CO5O+;>d-1UpGna02eC?15l6W`o7?4{`|za zeeQLY8K6)D5e_FUnDI7Zzu;AYJO9jtrk_|dx*L^LS>a=cy>$0_)V4*AJt9adospx9 zu|W8@`~twhS7(4Re0ZlK_{;QsRuDK?)rHZjJUG-j2VUzGdRVC+%hfa{WOw@ZS*Wd~ z?b@ZSuK0Jd_#dZ`Dix<{j&oBJrIcXJa5L(7pr-&%igV;zfjI#4#BM@Mp(UM`HNia* z{B_6h!gjT(y0zi`$3w4agp0cnB=MqBlm9#Du)FC`l5iTBkM0#`(rLL#Tub@wuI)i& zOORDUUyil2Gc4=GwmX4h=FmXUq@#c{1^wvIf^?+Cb$JhJ9ik{rzlt0xS;j^Ne_pUk zQQ9VYk*XP~;$iEgs%>(WDf6n6>UL#Ks6L85nF%=_^UN|@sn(icRU#Zr$VNr388hU+ z;#oa%CM|ssn^XM*;QG6mWy-{?bf8pBCw8=-!guyL+#|d#2SN&!uT;OaT z*Gb{rFxoicgTRna3hoC4HUEpXuMDU%?b@ADM?^&wL{LgmLQ+LS(m_H&5R^^<0Rd@{ zhEd8*3JORlBGTOrN=r)TrhC)fob_xN)S3Ct`F@=D$2;nN@_z1n#kH<$-APOK*FMkw z`IVfNKjy_r>3ri)dTo*W{`@#?6U;Plw}bJ?a-qkVt`EO!O^KZYSsp{1Ur(gIX2C#T z@M@1+@HWP}F403w*^F^?T|X`1`oI^49rcF4JWg#)3f>`lUDAETGW6NoP@UY&lxz~l z)P((riy*BLYxDlWZX*(J;90!iYnVzvU|k>O$dWtk=lsC-wl0g>$}7X~1UP{&@xAJ; z**P<9GZ^QWK68(fvH7sn1#4b!Q1SZE7g*9K?D;?gRTG~TAitN{S=I%!1yQFT8!Y=K zJgg947cObLGirhUUWPZ!BqG<~PS_dKAQzgVM+*jVWg>E(EnBKJI_iy=as|6+_=KE^ zzIS=r6*0zQJtoyF{wc22kDMCZMAZ~MAvB>L%l&5n2bj|r(pK!*ohswZoQ%m`mnXT5Dye6B!m|KWtK$5(+H;!c@?Xi1 zGTfuiDpN?(3XJqyRE7Zgll^P+_+KW(ueln{|NF-rL4?&5u$q zFfv>sg{lKxA+-q zc;pDv4`NsV0K1g-ax5^=^R2TC5+7BiO#ytOZp#W#2@nk%!vX?n$1MlnO2e{i#&GFb z{G!%i2!6MZ5d0liiyETR6=6)N#}s-dZoV&$Q|vZ{JSR}$hR4T}_ng#3)&ctDfkh1Oowtu*lsxLboS#x9 zWQ6a&`1|Jm4mK(Se0PIo_M&rmaO~=|QJIH~Pev93k8}E+TCsqa#U*m4KKbT{3}5@cpBUGT!lb>>U5!)f zD}K{2DK%9oB*CdaK~0Feb%7O!3f9u)L8l zTO?Tr6^JxQ4iO9#feDfPD4yV_bW;=1E=i?*ya)@<{VUf*aAPP$O~@X=8nU5P!br0D zABpSV^)TdSuCA_Wvwc~ED2cqtEhHT`jGVyc?b9#nk7=>&ISQ}~W&ZrwP@BCl=@I14 ziB0f-dH3VFrqh0)a6jjW@^HoA&$GxCX)GEMFD(fOSJ97&0&nR|4avQ7UKk|zSLH;I zq#YMvNCe$XTk;)Zf@ogc+|x;ZTjP`XVSvoCaAqgc$E$1_4(IkIzixBxU-xJ6M7SCd}BUQOCk zMHb^IR$z$cvZoYt{!SIZX`z472x*(5!r13d=-poEIHbh;zL>Y)Z?-STbn{IUWqDQ^ z4DO*zEiV5+Cq**`%Z67LFY}~e9C&$i?IX8cH#y`T&vp|KKSw?z3seD*LVc`gA4Jp& zQPuGw=qnybl)8a8H(bYHaF~Z;KIv7SM}f>RAZ7w8@!(kjpQ2OS3lHfdsC$bp>AvkS zuW_aR(Bn|lEIlPPNRA%enFfOOV7j&jEx5 znB@UPOs!~A(qa`NrEzDQU9=Vfx%NP_Gu3kYp3)N-M)oJt?v)VG8bRX{0R@2FNuW$w zEhj(t9~h>)HY%~w>|IeiDfRQ#;)pVC%NfXD|KF9=fQWdOUU$L~Sd0je{VT2tz@AX3 zs+{mX3W$jIk4^lD?e^a6m&$119lAkxLM`mo4q)H?YNYC^@Tbj~YI+2DeEU;n`2R2N z3wiu6gc70V`Ju{1sC#?|7T!DY-5dHxFQEw>9_~j|FLZN{>9*xrV89bvt6;HmSo#$9 zON~Dv!cbc^7Yo(ehs;m3W|e_AkOw^d%a<>H)M9!uW~c(x6pGCK{wO-AT;@O1-$UUK zMKQ|?efHtiE`;&2i3Hw;0FGY1d^tTm-Fj9+O>`eiemKlJi@qAO4;}#?{`V+1MswM% z&A}ZPMruq-;;sN@d^L^UG-S2tti*nLi=b`rIV5$ZF}o8Mtp$?D#-6W_1dbIFQ@_Rf z30o=7{W2QFCI^r)bxIi#W2k(lUMpOBvDc$XbU5I+`(Hm0uJG{isZFE`js;?QdJf~9 zVpK?Tw!yV0$R#?jo%Npahtb60+&7x1F1?LBj*S5oVWcKoQtLOQ66NM)Y*Lx%8tRowe3Bn~)E3lR_E_Wt+i?>CCp zaQ3tK=FCN47iBhi&xTLIItE*qSCIZLHboDC<-lk^gMj(~Da2M^uyFi;fV)2xIRac{ zY9K8C)q(FV?vz1i#sozK7(5tQ2uKhR{!c*S4iM^tBom3d>C$ny%!CAh(Ezz>oC;ms z^8#xWPYv+N{w{m$)lps>`hP*{DF{6J!{6*zYW@q8MP|uWEMGzX+#XhaKN%C#D&sB2 zz*@*misI2}F5Vj&>KXI>dCwDf7{P!4D>w{fAOMf_6YMG=^?!j~_XiV!TU|c=3vS*2 z(vMN`vg-Sz`Hyk{K)05AcsLw;kk!Fpo~Cro)Nem^@+8d8&wqy{;Z>jGB*JSl;#T*8 z=Xh6{8bSC*`&FvL?>&;ClH9(xDpwvKtV;ABu{nahf-8cjglL5LEQZF@dRuJ+vBV8$ zMqXKj2f@zCL*96e=V>AH&N0U``kpMz66~ZEq=L@EHFhEMgH{o;M(c;f*>URR6qjGI zm{-tTKeo!mq{FY7nQ-3ZH}r8p!4C>(d+=;`Inl)2Kq;()nn0FH+1S5hyhQIcq;Aln zg)G5f3#sP?C7CqUX|agp`0hKU_GMu4Zi zf&dZ)Cxhd>^z6$>pjz*QY)qn{tdOCFU{uY`t6G7r8;&+AtqC3iVr07JOr7kl0N~Cm zVFBE5bcI#TSXLn0?3}PGsn-W#RQjV|P$Z-fc|3n`zn0Y7NJCdBXy`8|`CUuVKdMIb zF#>4Il&p5SHm9T&nJ9iEuubMx?IK6B?NAur4CstJ;hLVQPx84Dy#}ByMR__V(e;eG z)L`f@j0D*A);-6_wz@$|G61U10&`WHLNJqm}??%F|NerdL+N4X@L z_an@&B-KK$?M*3Sg7fFBWr@77m5=)e-T~pQFop@erjOTF?8^z4)5%hCFTt%GRBXmX zg;?l+%uz3(Yu6^xY;@H!5GInyDXsCcQFbvKPO5fQNCghTf0Pkppa605TaMj3oEv+b)|ql8@D7|%Ra)ihDcQt*C!$RC z%ed5F|EZir6T;tY&jiTt&-}jwZ~m`37cp*DGL7SK&8!-T?xff-pC+s#%g&8?M#3)QSEy!;lOg9E)@<5p9m0)@2v# zsG2k>(+~RF{Dnz+l%ER#X?|}L|M0HIQSLtlWU6K9n!jglF-9*5Ji9UOue3(HeJh>} z$2H=xe?=aTbjwh>KXYoNYA+ur!`n!gH z7GYK&W4jPZqAHPzF&(F*&6&8eaUtc8PksQ8NXBqbIs%XY7Ych10SX+DAAE<0m#!zv zeYZ4SIQ}M4{ms0#yfUX!@$4lI9#KaAlv1;HZQIh-ur`_{m0TI2-@T;cA2`aOXHw zF*=u60&=h!X_rKDv-wV(oKK={fQQmuwE8h|_(6BMzjUM+#;k}chSsR{-- zSt*-2{mHpM_li~j_KGNa;E^G0QGqTAI`zQ~WiRDbt>{C7d^ z?=(HSiC9AVpn&(I){J=i8@3-=f4rXAE;F{IxDV|lI6qsOu!vYfTA_8)u|kM0_&YY+ zMkdU^eB`HUY{g9tVO;zJa6zyLZ1TM^VIi-9{Sk|>An^uLwxVhPqL{1CQ#~fUa4*u-I1L++)oiJDoxztL~5MqVcLHYC5izT_8L4i7X&eHlpq6 zAAJK9FV8mrN$TjV;QP^>-jljMwPxz#bz2Q{=j?lhXO0gQ<(^id`QP|px$UJqlW$>b z1+N=g1-mXih(h1s^;h=_E_Di!OH~PAY*727F64Gc0Hc)blg&CBs`}_#$0}JvvZ~SD z#uOVB1jLCopH~HE?p^f8lydA;!)LY&SA|h{PB$5!CwIoUxxG-rOVup7;Zp0TmGRP5Qt-8b()W_{ zO3S{~%*uh^n9(1z)64!mZ^SGS_$^T}xnX1G#Bu&N_Tj(4tVs19sg@&b&0&%O zR_epr#RfTz@}pk2xx^nD+}U~^!Fb{c-UZTpouHVH*S(p8UXhI5^hvtTXib0XStykV zO~mIp_Qq(HQMOK_ECy;ja$k+NoW}30EfjDWO=~qW>T` zh(uZ|86=K4xU4#Ode6zVVVWOyMn4fqpqEUKYB|=V*XGi0>ag>?@7#*qj&CnJ|0*fB zwVPIU59P*T@2XyzRSwJ5@8|6AeEhwe>}Jz|Ul+wgh5^EI)rH=Hz-1_dlS zErp0%NF^+99k=P8T}ou(`4xFU+e!6>{@q zHp%>nob%18%=Kx9U-X|@{*w4ktug|5f>PZQEIh+>lpk5ErYcU%T5oW*_Ar?wsc7HQ z!)(6VRG~=?=#Vmgm;D+`fN&v9J4MEMd)ir6L57g3!Fu-Yiys`7>E1$afJ>_EEhdtm zeG9mpQWh{<*T@$Cfo(y~s;j7qPR8J9v}JA%g$PR1l?-j;WIXr%f)=?ry1I{`yE?U| z);osdGh3$ylgSj-B^N9dM7MQ+#REaf?A8|mADQB)cp6v1=VA&919C;{z)nUODFD)&* ztQ>PgKl#ZW3N2JAGuH^+yhaqjGLX3uWt4en3(Z4_hH!Eusp6&2xcM6g0I7Z7sKxYv z;K;LBsNFzRw(a~NA+wNTEgNnm0*zA?{N7FlP)QR=}AVl6q0ME z3#r)(U+>GV1mrwb89jTFwDFUxUc|YNuQJNY$I}Sp2jhq&Vq zMpDkyh2}P}G z{Lc#c*h$9glhV0L8ZEI1{Ex%MBHcm25}ZB_*f00BYZu8>@@G5f1gMOtY^mI8qs1iu zBXQrbD#vX}|9`-jdj|os96ii~5Cmfqf8u`p{9`)=*yNN~oXr^q7%|NlVJw~GNd%v& z$)RP)brGz2pPcLk;@vB`yRc z{E1j}06Alw;A_Jl0nh=3gC(@z$@y=VIhML}@Kcy-B@Ql@23XzpzpHTdoJ&V|H7#uf z`g>fQB!zUE^e0r(;s+co@t)hgrsm6tKSzq;Kiu#E@evqW2&nthW4KWZ-_70w50Kgv zu$3U-*>loBUIHNPSA1&UeV5?!-GyHc=xRUT60+n=EfM=43}Jf)DGYiarv;|l4Q{Y2 z+c75)>mTnf9H{j%OGWk<#1Em!0SgMXS9VC^5YfE?Ot%F33n~FGx}GawvyuZn1$IOs z+SHit%8Zvwp0P1|D@;{N)e!fo@dqtx4<`K=h(*|pN%O5TL-73B@WB&j_{;SDmkA51 z(&PTZ;@3A!qW5Dwm25*5?W;mD!T(8&i1zs@4BqagQoG-oSLIH){Sk;x>bj2~_b=42%$hT_$Wp~0kAJ1rs1^J+ ztp+3)rx3x-PpnyZ)sm)xQa2Yo`69bp{FU+l&Sg`e=>o_Ve#}KUN1zRvSlr2pe}9kr>g7w zpk^hUNAwv$6q4j%BEEF?Dn;u)?|-h}318y={o(2JVo94IMRFxItcn7vHF8yo@q)i# zQKS<{G=R40>7ei^)2(=1-C3=VoAGMfllAYp7gs!~+Y_^UZ9p;uxXxLLi*F+{RKu3h z#PH5{v-buBkzMR;&QgNCL1Y&`yel1Fop69yj8&lg1LQsJIt_{H^Kd~%Tu$RVwj zsvhcsnhNwq5BRsu1F-l18BX8V2xS*7CnnpCFaZD8n)KVkIOw|g;dv|m{w^+rh!BYh zi#W=>j`a7T;H@s5lD_w(DOe`ZWbgG4WGFSreDPyBtJl!y#~XLYfX>D3qH^e*DOT1Z zwUS!K;Q^|b84z#;?u@KTVs$zH$y$%27~g5jF0w#dwDT@hUA9)LDQX!W9u8nqDq6`* zCJJ{vBfus7ql|=9)FQV|gJO)splhjc)}F=4snd~QoyWNU_MeE7NeN3lJ*YE?R$c-@ ziTPJD%sF-=8yha8XoaWZ;^Ju28m3jWWuFI2QA`#wBT@ixkpY$wf*bBvv?7;J)6mc) z<&Fk3DPDTzyr^kg>532vs`YK3%izSIorE<-=Hhwo6QJJPy7O^;xX$- z1Bo_{k%3j;HW_you@bvintcVf-&OUCc z<#}ziRTo5PPJ802(6r@OYLBA4vC38rjZdI#4e;4SSq1pu(D&wb>_o=UlU%9efd0%FD7~g;G!F+DhncQhU zkHr{|s<4fgXy%;$mp+bLLymJej*kneY@UE)0vV@mdw#Fb2bqyus}1Q2`rWyls0q8Z`S`h1k-N!*(++uGZ2jJ@~=Zw@Z zGJ)@EQ_v|lv7G8K84c2z?01!!;VE@ddXm&3DnB@*Xgjddahy1b2IM1qyI;s_koOpL zXW923rhGNzuwJ9)0E)w8CsNs5XasBMoBM!wxrIS>-u>WIZ&{>QH6r(hJtB}-z$6#% zu*fNT~oNyr7xGHe7+J5#=@P5;m3Hd z!X&X7VNmP*ukqep^V!XT>CHJ4&A&Z?tQf8wb${*#s6frzX9$2X$=U^STS zfXU9&pLXfiWKhltKG@wu17%^%0?WF=VI|$9$AdZV=}?8&kEi9netjMhZvSgKA{}4H znHR#gJHzaUFHJ#pif(fhXj#>*tkxdvE&`1OKkw zyacs~^agzK?&6+V$KB0j`)U3Be?A#9Qd!xB)1IvL9WeIDI2P}278eiui7^+<2@F^? z@UHgYgN1|7FuAs7MYfu}Gnu?o>bQoFxMa1(;P!%fFQc>Jz3cUs$BFG>#v${Eb1c+M z+UpVnk1BLh5jI>aIl)q9U<>Tb-JQN&Tg$|6P<7h*x@u$`r7 z@H5EJg8msC2`ek>W%m28wyG}s@NCVMw(YtbRf1OCw*Ljr$_(0ecY8I=ac8}FGrw3V zV+eW>V}4$E6BdPnMGMsoecLmZ@q?=7jY2x1Cc?9}tykr&VGgzq%z*bGcAO`6374rt z7ujzj%5>1m6U|vc-+Sl&9#3EP53-&3;SQ5D9aw|%|#r^H`=hRau$c{)N&#}EuVpv6NqWG z2a~ijSBh_0xedmAzA3QC{Mobn)2f*xD=K@AjCa<$0Vo4D!$qrwv;LF@3d6`~J=(Ky z$~pFB+qF7;i#Xs{Rj@umzj#HzJKLx|RSvg@;xhEi;YgWohG~Z^#X9YD{h3O>l~jDY z{=@H0{j-1eVbH-cE(eCx@zTswauXeG?cO<84rQ}Cwrwl$k|lW0unr&+{3a;-zyBd; zm$>=TL#1opmxPy*?s+k zm{BE9nkjn~)*&0HE%!nft#WWxv+(9fv{Z(^_5}^aLov0DhwB!ZJt@`i_on55E2--4 zMtehTtzeeBQJs-ZbBH$uZ(Qg<4Ev2j2|`N<&Wx-|NkQZ`W12|)3OsJOKdI!zp4)^x zYhFR;J&}X`SpECmdH$VBHwv4WClDqX9y%~4jH!GxkY4jGh2twY@^6eslw30E%D8$s zDS>|YJaZ3~nG5w!87<$X;P5=o z&W~7Q)#sgBK_)6PR}g;~usH-{I{fBA5oq=k<&f`)g!f_FQ#uxA$jU8;`~=yn%Bu&G z$1tMyrs5q;@lHtbIw{5{pUU)?nHOc{EW4!Y1&iYa>x3*I<4G> zWUF$91i9YbomFBcQmty%Fr5YEIiBKSYL@e)q=d;^gDg8#)=B+i>tHb&cHwUtBh~&$ zQ1L0^~lS4g8K1O_9)hKxLRzbi(YcEB!|qr;y)Q z!RO0^_Z=U9S^~L-^XW;JZN$!tbD+<5O7n%8l_g(&B!b-%?fUgb*b;3s&=#zp6AnI& zT?*XnQcF9*>IOuGA?q7>=$u7kX-QAb(UV;YOZGTEo9-jP9h&k@%w= z#LUQ*<1Xs|G4ybQ%q9Hz)7JjDk)0_Weh(#|Kj4K0BHOpYxWE%q@H-UPAZ%qGN21fr_;q>}!;G2!&Pu z@92QFJCqxz(=^q<-i5uE)Ohh9V%panaqRkn?nbl~zE4~5n zStKMR6nAgkxUm3{zLEjUF>+4he%7${`z1Og$P37PM?$qEav@cRG$!C%XS!YF>8-8x zwBl9E?)1^iR74_NNVO1~kmZ=qssAC&R&T>riAI=jr9*|%YN>v8@j)NIuez^}uYs@G zh#WsxMgqAzkSNEYsSP9O9myVJHQoNF%zeDPRA8bH4S~e1hOZ4-nBXbsruq;wh@0qZ zGy1)qaLYaE~In191bC#*n!w7+hPp^m>X{F4%!{o}Raw`*z} z59%R0bK~C{$Z31I_Durxm$6(&1_lLV3JRaxTS6=k;BrQpiiNAQyBlh|`haH);HANc zO{N-!I@wn@3Z7q=TXo_lS4=yVd1c0)zrb<3tZKa(f2XwevfO;~&0Rq^cS9oRs!Ou? z?JA~tDJ&E=X#4v0>%sk&9gaan1=FgkTPQ#rpKq5j+l0|U3?b#**T<0_PPEAvdbloxhyZWF#| z$dfnEDDlAy3#H!@Tl{t=slQFh$VjZzrmB_XYtqEqj0YewLD*Mls_60@+>7a<#$ab5<67xg+moRM}+?> zXRG?1>hcRM6WDk%Us}}uLUEDzqk?)9CpQK&Hy&}yUNs}?Q=00QZ6K{0Z^Fxp& zsdsXJ?TgH`!5}B%6vI<-Th95VtIRbUtqyBxFv?yMad2y#lbl|2CdOz zFR%VtcUM6Dn(645$7KXKN%Y2qU~>YPRpPpsF8t1zD)sAAoPu_@$W<6Q&fr6V>d+WO z;SWV-oPvFwOCAr`zW6F{V)I_^OaO^ks9j5YJG@9U=9k}JQJ+$lc}FwHT|fVu*t4^_ z_hi_$avliw_?@d|CIhE=Q3!PfkX$1!j>2IoP5< zlLr-tKtBVUiMtMA-68FA3hI`NF?olgj2=41&Kub-Pan5qi^nycaSEZ)`eY=oPZM$| zx0b7UnB2KXO2IRzH<3%Ni1B^W1)8%_&dBHlsS@YVGny>;ewwf_Win}dN@OorAxYgy zgn5Rl^vpwR{6(&G<6d_3x0x`pZjbqIPuLriNW@OIzCj*a3i;?RVhjzzY+{*8HxB`U z@5N$wd;6H#A@0*b)T+Bp?|S1$;ndHBElZUjKf(RP zMYY;T<~ZvklGnBNBs#H?0^J|AqPixUkCS@feIqm6eI4}RhOSMx)TffcYr0l)p*fq6 zFNv2czhZn~#BA63?MUSeMNM{&RsXXXv0MiHY zpOs5s43GTMc8zg%wJxdU_tH3Nk(zsh-#sVo z!pS67*gJj7kFoj!Ypg2~)LN!C2-Y5vo5mk+hPE=&`9hb!fB$}(v-o;4r&Kqc$%AB!64`Clm}O+T1iXWpi1qT5hU5!H zP|>reO=@WG9=W3PD817p^47;xbyo7EQGMQv&PJb$Nam?FzohE5zORC@Np_}HME$y!~m*{iJP6DNo zWDv$)+{iR>L0-e{jsEA* zoZH~FF*eX#TpBEmFx+IlEHZJo6DLdX%ZgQuRY`j%-;?zSx51~+@v@jq0$++UIyY`y zkXe~mzVun^McNVTuFn$|I}_<)ziCl)r1|I%>e>m^Ca1+jRk3q zQOcm;g6|D6#MV!K|m=lW9l-!idE~^SVIe0S+Qp>%@QFRDAupv zGSKJeUPqK=G3MJTnLq=nG8suUBr5 zc{us5-i=Q|6O5_(WZwag+PVlj7oT&CMp7 z&45ESIBzWPGxYBC2&1-{QWrB~jYT^cQy1Ce;;EUP(Hk=L_Mts(257e-9wrk!dc*74 zU0n+zxJifCl2B&+noK&cN?&t_(J5S(>==LkFqelS?bf2eQV(D5)c~tPwm7Q4lH{rc zzP$gles=b`dw`OL55~ZyOlGzJ+hQ|UlVa>0f4=*sjH%ktVpSFxuEq81O2MvnU@a+-X;wR*pk>6BKoeSpNt>O z$*!Ruir*Bv#|=>iv^oPaIAakwf!;>%2W0F%%&dI#N-c9qJ>j9txH;2*?uiHW3a^ld zB1J?Q5rG`qiMIU##;;8@?3@^5_-KZ_26T+VQIsF-@rp3VyQ&;@oMqIyN00YhfrXmt zm)&yIgjTY9E(@Qe!wF_|_50Z<#SzhI_XRy!!YfJ|@rjvzeFj6$b*g5yOdf|h)oy1R zCD`rK^BZhQpwiUu#E0sG&C+klj($ZDOx~3J!Tpru;8d1`*c6HTYD!sVOwOre`6mgu zPR(bP_4-ioV87r$i&Grrf!!@biX8uv_zE;5HY60Ncvc!800l-G*1*;qEw1c za2K;)Fhni-kci@s7W7eP6~@lk1$JzoWlFIt#~qVOLd7q9ebYWM93UI^AVg41xpIli z=rQVz4_K#oFZsc)WNo(J#X^tJXsBqkyImeJlI!Yot;63mS_l$Va1zz6$*Lu}@ zy+y5&pm=tD{HxKoLq5c`$Hk7U@p_r2mtAfPykFgW(W2m`7RU<9jd(}Iep`oXzRFh5 z>eR-bPT0JjV-Xnip4Y zu6vptNwzT^Ei22guSvQq8+uHcs2Stub2gFl_tH0;AGNQ9f1?fPczQt_#TKG!S>c_; zSa0>ESo&i`#O03EPshZ_@NH~u50A-_VZcFt(PG8@HNuckQ&W4~PW(RXr1Ip`_X3En zdH$jh><}~e^Kl8BXL91MiG!q==Q~KvQ}1de~&AWx^~oE(8Jtp^oydxe64yp zZdfVs=IzR$xl(MK$fg9NTyKPU)T`nuf#s{0!*Qc~oE>s3s=rKRzvVbyaohK)uVFoz zJOjgrTfySVq*+6z=SnH&Sct|aCyzf*pu0dqA~}7|>$bhUeg9V5&B7VGvC&7|ln?)T z$rUoS#==>X5wBljUvJ|-UZ|*%M!H z$C_LIvhVjJQZ@p~C-Jv5hRTWvSs08ic)q17r)s1^hu%t|ku@7l0JcvGM(iW?^Ne~6 zP5;QtV5$#mD47U6e)@5&G!g$pC;#H43wgC|_N}vx=dKg`63-`JRl9OC$dfsIn|BjG zncQ-wgKEUU`Ha*RIY=3Tk%WPMFMjm~gQ*ds8d%!O5SZT;b}MZrpK{uIX=tUB7ia9t zI2{$^Amb+{4Q47e{j|GJn@H{mu&AxgNn6vabe=C$B!2 z8SLTark_11s8jR#8xt+VbY{BAg1ZEU-{@WEg^}pvF7KF3PTdJ?P+1#Ce;7($CR6)8 zVpyN5o~r9>lc2zx%6A0xGxlQ=Nit}8x;IqeXM)u0$qE&kgGzy(>W0Z06#RxcZe-_# z_eRm3CdWd%mwjyaZWgt-K{@Vk@V}=g>!6jjl0P)&v(VP8=+b616s!3x>``Z6z^FL* zhUv{Bw7#L~Ca7F-sz;9hPJ%4T(wpi~ScpS^BIhP0wR8w3r#z>f(_BMfne;A{<4Xx{ z;MWxap&NfuAB8h+TO}xE*T)|dOK4uoYYVbgQo2@=#3GTQZD(9Tpw!DHu|j7O${>MU z{I=Y+!um1e_n^Q|WCDw(B8=jeyZ?bF-6ZYW7g{A6Vguterc}QP3*_MMCxaCR)w$0y zCx(LRQuK1E7dM*81mhkc5r4k^QfGkG?9r|$G>xeEC=VgJ?>WQsazRd zh{b{|oje#)tdlu?)5{E52)NHh-97eqN`aj5+DV&#eCp|YOa;A|NQROLm51l~4+WoE zjmlBdUdRR=$Uy^Nk#W|~929hLRWbb70d#uC>&Oo$k06;!61;S6OKwjOm%5F;s{7p# z(7s^@-q{W7fFs{fw-G_tXgJ}oxi18pNNV#9rs{*oDCFNxQ|$W(3}>MP$IY8JkJPj5 zjnzdQB%MO0<2zNHgR_%5-3b*BiJip$!}n+9DC_`1V=XJ=m8s4z>+ks;iyCl|pMNv! z*Cc7e#?c`2q{Q9*b8N?_n`@PwqMLJIE|~kGbEDMKjmCCCACJ68&H0x+gHo3bDNA1q zi%oTL?PhHraU-Jj^SP4D*@!OcFJ)Q{h=_5mPsu0>+6|S@+rhnf z>b0JUmIpx-LH?lgcy4r`qx8D}5rJm94V9KvaT^Y2Q4)(;ZJYNEAbuFW9Mp{2;5Q`f z)A3j1y?FD@r&Xar{>wLU&Efg9Qv6-5))bd591Qak;!GM!CFL|w@r=BhB68<+c>2}ozc)6XnUa^v z&~ImMHEcWv4vDi^UgMYrbpVNg%6XMphaoSHL-|GHTTl8QieS#>*?>!MdIFuk#0dp5 z%LwkoFa)W}6@sZuDf@=gjJfDMg8j$TvQ~^}0{wkLAXQO3MqS$fXK1Ksqk@ug(LL0R z8T_3=;`Xr`>@z{r0Oa2h9|b+vPX`c+oeWPZBalmGNCm&vQS4Z(m;LleN*UK;)lxUc zon*PmcWVW*U_&F-*|dgt6X>MnXTj1vk>-zY1nJg)Ca>lf-at{y3N&&g(wS#3vv|dZ z6vYk>)HNH3$Z?iECyyzc8I_WejSpqZthq1To)3K=#$=q4HWdr7gt~5EG{rcQYxx&d zQ_X9tHU8#>~r}XF>jC{B51S%OT@X9tQknz@&P9zAL zIdmwH$&f5mPtP)DNo99h5)A-xJun2DT^kvs+^{%YXZ_<)fP3p)`7-NAL4(wP&>= z^;jt{uBwY_wnWZPYt)^Kmn6%qcld2A)ssMsDnK5$Mi|AUMteeSLsTWgkD9slvEyCo zsYfGfUeh18>_uX0qM4QzvQ-uKGUYUkfAW<`eW7`=!rjb6{8J5gvB~$R#W(8a)Urf? zuRa9Jhyuu5lAwDBZv1+cE_FHR*}y5STp=5I4UBC~kQcj9pwj170;PeBW_gWH zWOl845VjR*V$56R2OsXz7Y<0;5q&i!H@<2SU-oB+@_L{$zSz{%EK$-GcF0fLGY^R= z2LVGES&Xpi*1r(wiw0U7j|9l~2u^LDo#As>er11rh}BS&8-jM56Dy#QPc19D+_87J z@S#GNl66Ysw>jhN?^%et6C?CvA7lop26Xo6zwLlTk}FNg(K6RB=M)Vwiu#lw^bk>% z(~x-)a_#2LB`9>o!RY@*M4J%_xqwzg*~*`fHw#QLFIH|DMh4wrHu`NtNyEcr**>si zntiOLoIvCrV=BRh4?+71b1D=FJtpe-jOR1TA|Eo;$b}l)?)Kd}HKmTK5!{Bao?IH) z=Ff*8z9}omhGMB+o)Hp4LX*?<1joXyAboISCMnfq$v!K zXv#+FuGW3 zNN;>?mB0=SPPAO;oTG_Gp24LH`Vl=zSK4R=VG?#;Iph%^c7yT3eOcm?aD zA!sx@4liPKe0mzTPt1`YX~6p;cv>vfIFAv}*KXl7?Rigg*c}}U>7B&Gi-o5LZUuRA z(S~0CR@&f^1Q+?in`gvA1!WhN-rS=J;5`4tMrApVApUsgkyckJ#{?*d0gdIwBJB0N zZ=q4tNyt}F4>q13ET8Vqj$iQ%)`T)Plpl_Vsxe-7hGh+=^hr4?Skyx@KVxCA+{1FF zC$@`y^5lHs<@*j}4PmophunVW5I@$6J=8PFa+AdM=8m*m4`9)Mt_=uzoQuu!>KZit z9d3-z1r|TG?DV84qltfHQsSaf{sZF@d~+afDP@|q5W=qCx9m5}tB}{(zc*aaakIN` zh5q3Ttf8)V2+*aX-gyxo(4Ivz}g{!?M!untb0GXE2^gEA@o1G<@kO!=O zWwTmI=~zpb+Axq7oMOE=>T-fOD?2+r>kZdqW8=A{iROn3+=e|lKmu5sI!)4Z^OCd} zGGI48^`g7GySut3Wr9!hE5yTcy27sB93{RuT8EjMlAfk}dc(=d ziDXDI6$ zoBDSM#+EjH=!2cAJLJuMla!hw>#~;^Lj;4e$+JAO z(b}M!x_%A1WJf=ZxzDDL`LK-EK?oPM7s3%|Qbt+cAz{@VM=JEY9z7>vt~^%W`)jAe`&ZSbjo6=#Lx{VSG$8n}ai9o6!M$A{sLH zQuM|vqBddt#6R#@KYsjW>@;%2@!v5|sF;xJ5NN=4#O3UCmO3esUvw+Gjfz!@q{NU1 z8J1@=*K9+$p}MHkJ6o8|?=g68o?3e9F&bu7d%(Efxi#d1Yy9aQP2Jrg8Bb5^4BiiICejI)v9H@* zb=(b{;|z2Z2;+S4f#;TS9ZhJ1>X>VX0VET<$le~~5k3fyoXO#iMy#MEuU|`}n0a%O z?Ogw#)Ok_m=T(5IMXX{j-sUgwuN!^`{)qj1qmUdvgq}g?xRAf2UzuYtnBui^7FEaX zWwo^uVm=`F?IQeM%I!wV?VZ`(o!PDWS-Tma`$ju%(2DTt8nNV!fAUB&-M`9E<48HK zIbO@Q6aSi1T?hvyuT4fo#L)1!HPNYpLR*=qmW^MC z*+eL;ZG93JZyg3ssEv=0zxt0W2NKhMXOmn-_)XBryFe7!qZ^RY35PRepG8K4LkN7$ z4JLDV9_G9=6FaSH+pXbu+zLc@H&4u`u6qc7=X>vv_y2t*!0H z8w$w{{o~yj zaLMbEsN_asZ*sM1Z#r^Ns6@4g>wla9eagmYh|$siyo?96aQkgE7yx^q@_ZF7J$QeQ znG|weWySL<(-!Nor(mqext~u#7aOPl@o_7?NVB2$+2cs{gE{qM#E}WmI05{s9UxDf zl)WJQ?`aC9PMA!VCC<1A`8B2KTAryGc0oP*%#cdoEZ}CylLtMp;c+)MHo*1%-(Kk6 z8yYq?wm<&!mG?&u{5&Xl+T)jiRT9FgBXRbhw?n=NsqYL#5(w?e#$O`nhE`jG!oR;e zvf3V_5u@B1Cj)L2?3Y@e`2<)uptggryJ^&0fUs{dYP&X?nh|n!B?NuOrFaP4vl!u+ zW0d;xASy8gmJmXb>f4#_GX$TD&~w4yuD)qQD51n?XUKo6Groh(WoD817#}tRrZ^c` ze+a9T6h2Ol$q>St#3kfbFL8z;vYp8t1IAI#?#?EQTG5ouA`}uqPn7bkGfhs_dL$Dz zPJ-##YqwYj?dptra!kNXln{8>5VZb%zf;}56_Ngpt*UZ8gZ|^e=XAg|pkZ+tZMPXA zY@s*tV02fZxBq*-ychbXB!8X6LyhGG5%KW|E6!nd)d2~~UPo@$vNqVk=0cM|KxoI4 zG)sAieYcEpQ8HtS>(BloM|YT8n;cT{vH-5#<_N6jrbw{?i}Juqgv|p?vP9wRs9?5N ztXLZ-^wWBo%frLNL)P(`w9#~(hMjV?t#UXwzCAHb+hEWW`I;EW{*j4<{Fy;$wHx#v zK!~D@8b!8y0xpeIVqR-Y!lO{^tg}C`pNN%fRkef=4onttD_#Z?2Xis z$%8M$Kkk`?n+GxYCPL*42nbNrR|RP;@H5qbW6Q3xXYa&=f3YrtmY@$oDC_GW#F0}= z?^sUxqDCQ~2EJ>tN{+F*l}hveyZXFk z{~fWxa-?WCN{2O2mBmGka?chl!aV{bNris(5{OBP_zqFu7VJT@t?vNaWC{CFFv-c; z>>a0Q-q6wLUw$5cE%3Oxx%m<9b1LTc<`C1q#m)=D$j#Pd2aCy;Sk*|6b4(jU{5wPT zn=AL)|F&%BR8TWEWhq942ex;5YHBN;f0GsS!04`d4*zB+!r!Oh ze$L2_p8J>SRSmsOj7BKwpy3&V9m+D_S={-TqXj`Ib6#O#VXm5iw*tqLUvKCo0&k7X zRO}C@RR~wgawQcy8U?2~{;g=_Z z&NaQ}(XQrL$aiAiZB56>C|T3PA`DckxfIkF-3z=498W$Ocw{CfCML+XX*asSM0Eo) z0SHR<3=Cv!-60eL9?>GdQSL|pLW8tW=&>5|l1o-4;(peX)0ijJ4?kO*cyxSCjkKd| zXKHL^OtD$kqYleWPG-?{8Hhb7)xHU=xwGoj-?cpZEd%H= zp(0eI<2zt&KR9emfRWOIg;cWbaJ<@hPc`tK&t7qhsi{z_CIIYEO5y6=e^Q2Y<3a3XwxgOE$;bSpM*Tf zx>L(i+0@|?AKdf$P*GA$isz#`=IM+ZebyMFZO=w^eOoZL1nY^8`=lV@+psz z>VkOWDH1ZWshOF8kUn6su1z7;gx|L3fL#S%QdQpL45Nv%_-SSd>BufIy_fJI*f=;m z0LXE01hv{TpqT1BK+YIPH>mt?(XjH8r*`ry9c)b!QGv_ zCb@U+%)I%%@B0VNIbBsCSA+s=>j-izI5joIDBqiR!Ep$23vNz_iKB%cIZjY_i^7ar_Nc0B=d}3s*q>$_s?}@Nm8q?SL3b zVLkv}X*U##2c+PCAmRvY_O3`~(QqK_)Gg%w-U5nNP#9@kAQ+MowIO}aX%7} z&;j`6i-ZmmDB{Kbo7rf91`@3UOQ<}+6uwG8e>u_mS@O7BA3zRa|0kMQD3QD&5A#yO zRz_L*1t;zUNQ$egtKVuiP|sclh!eq~V#(fSbPTzYBqS?%BKTEbR6*43)kM5t`{ByB z8|5M21d))2;N4*KVkteoDEDgV>#G4C0L?%B2i}e`3-(V>t+E@J{&3`SKiUmqacj85 zQNa?P5ZV=bC5$di_fb+w`%)cUrEY!Ry{4Y)?7VGf4qF-b8yxvjF4Q9yuJ9B zR|}*M`dWpDfFtjWnm>tzu#|0OV(>?v^oM$R@fh8te$X}8IqxPb9_18TF5e8&j;VVS zkav;!kPA?NVaX2p=sdhF?Cn)opGQb*D&-P4DGbUE$_pwCD&Fr=f&{K$u+4Dch91u3 zH;Dyc_mO`i#i2RU&`T_Odl|%7JPID^lVOB;gq4HVy{XsF`=sOb7MyPU&iZyaFHHrN z?O!VW>2Uku3-I(=cW(Bseub1x=S`E*XiENz@C~Az?QEpj;n7M6#T#`!oDg8RCTLv? zY3AD=oZ8Qmc0~~t5!DcNWx}fM-D&msq2S=Bu}tc2yeI(f3mg`9@qgQV3Z zoqp}Aw%rOzBI+O-)do920w){V%w3Q6}r+q=}*#Z%^@F=`;)tPJ2uk~Gl}TwGkhc5Ws`@vg|< zd8NN?&h)sbJUvdjpFu^c-GE47!_^Ib zM^G@JALAZdMDfqCnY!To$FX4I1UZ-gf(3Gnf%iW^*&@CNL<1gGJ>2TU)vT zT=IW5sq(q!KRjqzAbrP~_CGZ7k5|AFBuG_7(1VgJQEkb9TF!bs;<0p|N3hR$lIEuVE};jG(S5vSq4s;Q}8bM(o2 zco`^1STxGmZ&k=UdB@XavuRlZa-`vk+|7^u zlre9!Kn*D#U;DZm-3La!;^sU~1PR!xo|kz67@lA?>kWO-X2_T{ z?~z&Z_j!uvdR?1M;M>ZAQ}>8czeQ|~+GnFxnTQbrXkgFDbod&DC;uwrU}OoZDo{dA zMn7rq25ySIdhm1gX4Yx}nO?Alx}*$9T_;m69YZ6S^i={Iyl${w7Z9?B0f6)`qO@uj zHoagqC5eo*s(wg4GvPrbX$y7}N<-8T?X}E?3d-i_$AsE{;L&vWm1;q*`I;){ZmQpKYaB0`G;(#J zBHANizU<<|SS%io5=Z4_UWW|>o3z*A-i?IEco((c>tsz*5a5h(sOqkJ3USLuS1vlGccx0H=7opXi?SrM4%BOiS7%NtU^)=b9>UDzUH^ z40T$gDR7(dpi*<}DVDEQQWg?qw%3)sY=9Hm3l*HVw3bMwx*?ZI?S?p(JkQYnIfl%G zedsZoH!&o?j(>Z~B=#5G!qn7^;OcG7ORra7dYyn2ZQrs0euQ?XZbDvDhum>)Ai992 zPgV7DqwN7Al!K7IzE2o8OUaCb3%otseOQ=;*2Z78^K}^e5|)uEW!pSNQuiu7oQw;wAY9^w-V+zdy~$q zdUB?p{U2og+fLkg`=7rJ&~JwkNBAXVyY{2Eee8u)Q`;lVluTyUa{gj|C#CONht8^M zEud?H2$QHJwR+h!mhg%7r)HY*$^x6S@Rwl;oyZy~mH8hntPV9jvr|9U0i@OY;sFRw zxJ~PL9YqH+b7%S763R|nmQ0ypA9#*cvPobD7DQa9&z{P^6WWvCf6%K|=&nNkVD>Fe zCh^ZG_o9)SWi&>WZioy|Tcr}$VQ46SxNq(y+L774g-^7wm*28|hn=soA+~$5A>_Pc zk9A|U3JG%}k9rY5o_mCq?42;*PnUOA$njGN5O>h1EHA(GJGs$&qi>`yOpwM&Q^%`@ zR`y#%E1R|8c?&%tF_C&;q#XvAte4elm(`sMt<=>G)~GgX+)_QU)6DHzqQ2pr`_~!%# z_a5`l96}Dg!CftlBXl-zl4W&=GX`;A^eB!>7c^B*!VEW#!PIDStHd;f!3p!{z5O31|H4!{!Z5)mG^MXns8Q@JHoR#vNKdRRv6I!z-L9_?m(R^iLXV}6b%jt^n!D9#zT?I z)9bCy^^M+rZ`tTUz^lpBgBiHwcv--vfH%cj(7iv|{R!%J2gJRW$i~+Tc*<@A;%}Lcd3#^0&u*#mZ z_kS;6C0Tn3Dm5>HzWiwf4kN9!N~gszJPWEPtMpqV9gU4a%FmdvCEtiW;~EMJNv%Ba z+%IJ_r~Yec0yHas_4fbI2f>4pAX#ndIe;Qv}Pi4r~l z_Ue|m_v;r$%D>_!#Q$j*_45W`A9(Z55Yz+m5aTaj{#fzz|F*;e774(w{pUL9qJash zKL35WE0`Mu>;Yg`?mKOl^nWu3kU>;0ugw=VqjvDSf3q!0*$DnV@L%QwD(T;A{i*NR zzn|mJ`^?{@>-p(H5eN|QB4&wF(G?6LXGqpx(=Q%+o|uRNVnl!(or7;FrO^Lv`2Ko% z0}>?P|6IQRGznxfJC7y<5_ZoG5@S{NM9V{{`hB)IHthm@1MCA#CET~I|F^OD1+a%P zIGd{3Hedge^Nxs!(C!b(SzXn98ET1S24Y~2fq=hEWVTlhxQ8Bq7cx{qy7;e_0ULDL zy+z9z`?4UYGN`7D%GLWY)_v=2G8LvqOIaDvJpdL8cp}H=!igC`6~!g?{jzDAJJF-s zIPs4m`yo3awK=77_ejw4kge>0nx#fB&u2FiuzAe}e-2eu2VjG<96t!%5x-dP|FXju zNHtdrxlsO?wdOe*{Qoj*|E~X+(HN$`mj1&B<7!6kNDZ0&5!fkW_Lx1F3$sbCM@dM< zK8E{uO|m`l+6AM(1z)m20zM~0Mb6km!W^hlC`%O864XGC1y1`;hgFI&AHrh7I>N5v z*hA>wPEf*cOB&G10Ww?!B;#OO4cwF}JA`r-4q-82ZDFU}fzPkZ79UD7xd7n!6mlzi zGMF&qrH$fgwb%NYzyLl~R{&Z$n-XASi1W$c@gwpD5@+P^z;%`~RA-)hh98_NRA62_ zKw+`i%|P4v=gvLAvRAzy3w$f3p@f_NP5zJbC!}bvTk>M9>uc2Q7tR{NnBxAnIO4RBa(*;Z^n%{SUNOO-D;gUt#dG9hx*9+W8tYawW` zUk)*z&e767NJY1XwwOe|`)j2GE;k&->}j`#<=Epw(8$&LW!12AyOQqfx|* zQ06_dfUfS`3Zg4pIY&ZMe3iNn6EuG2hsadP@9Zv_4=>0@{DG=}jU?3WW z30fRFUhoS5E~e=!S)?S|n=i4vU@lZDl|KfeKdxW60?9N0$g1c# z?xjW$7LZM*sBbQR42d&k??vQKIsjyg%UA>S5ViI757;l$==Du-8K7hjfY*}u29Z0J z^>@knR@Zvdov)-lbK%p4(xCB^Fbu{vAS;SQD$5a&{-So=`=wK2v>pIv$qQg-v(zdZ z=qVjj$Wzuo2cm)Kzzhz1ijYT`npOZ!0&+8G0{b!mgI`uw#?$`h_c{H5+l+5{8IAh$ zB@isVT?Zse>Z}3;NEsx6{^SQhs6#!;hbH7J6UmuOg@;+=Y;bB4M;HW~kguahXjOUcg(!U(`CL<>))l z&mI8b9n5G=GS=e^Fnk*pJO)E?0DKzm^a_M6jm!e@=-Qn=z)TnYrDDmA+_ondHItI_)NrA&_Mc-6i!DABcno7(PZ7A6BNK<931&gSpNpAEplGU)k6aa z9xx80?`(=463M$Ga5z&^Qvsw=_{>rFLap@}$bbhhN)F_Ff3fCz_JK!Y+fzfp;CTQ6 z>YqPs}D=3qalS zv3OyJG0{@B&8>0%7MLMiAX)0LJn#trgTPZ-cR2S{zP|ps`+29@WI^)<;(sAnUYL{r zrv%`yLI8I6TPFYzv;U(iD=whTtRtIbrXKqP`R9D8{&$k-H^%|6fM5UOki$h^XsQ4H z^{?;18D|86M*-mT|2p|gH{bogIh;Q;&8(!H(~L`hxCGHuwa3uOGm`ta|`r_<)7aC zj|%}V@Bgbevj4%({@usFfBpOWZcd5!@vpbyWYBp9FfiiN z;lF(1;)07N?>bS71QG9k? z@A<-%H9VoMY@W>Kzt>2Z-Jv!9fv_6jg23Z^+_!q${_C<(jq`R%OUvUvw*BeKQ|tEG z>|&HSwZXT&WqGCSDY6{5->!ReCoyxiDAXmgKJ%9Vb%^$L!t!WJoF(tC`*Tq}vn*ba zr^)k|N8VMB=kdh)Of{_aX7h0*~kVB|OP8%WdYi6y2EM$YRMA4Y(_Z$l0AG z?!uTwr-~mpZ*ajQ+#=4KF@snS>Z{cB)F{smN{X~vv&$u)&Mh>DyKgV)BIjtgnLXn# zIt^n#eT`d_u#Wa~VMeH4{xW12$xNSoDYau8MiM7*L(~U%H_{Nvq;Heuu)5bar|sjM zf8axYnOdP|FT9y=+4^g+Hq?AQQ{Iy?wZG zPJCxAM?LrEOsmYnn1H(!`otma#2$C4RJ1e_;z;d2TW%d4b zh;>H;DQfINJ>P7yI)6+ceMdo`*T2Fz=_{s?`sv>3;VM6=S>IqTOCV+${eryub4|D- zLz7WyQi`~lN>JXU*6p!^dUg-Fu~Z&hSB~|eqhEgW*($@f+}I#XScH6Y>e#&p!J6H0 zJXTRzYEQUP-`8dd-}hmG{H)00;IQSapTObk)m6N9IeKE>@lPpjs|{Qh`S}!HwEAIQ zOo_Mk^BLNI@k}A2Nyn~lF4Rn0 zwpY8{X}D6HlnR(c;g;Oc?_m9whQ(q(TG0LTxQ@+#HT0O#m0$ErH^1YdujZpeP`#6r zat{);h7M>1ZiZ%ZCfq7mfPOY?N=x(ESFT!Ryz45A8r@nFFl+j}Ms#X@>1= z;-hr6hTY>`A_cD6h-0f)$ly@c-Vm5PUKaL1M%8k4#1T8cw@yNOPjXC_6_O%; zq4p+F3F?q$>{JH76X_jXbwRJ7oViYS7J5EQr6_v0DUSg0hoV=RN+dEq37zZjA+B!? zlid5S-{b{kg=j7hU%wWs>cnSF3SXX8XYAby+3q$mhh4^b@b5^{^Mgv6;;Z!j@n*w@ zY>@92f<0!Cy-cf#3BTgni2g=r7D>_IUELK7C5gtO_-ON-N9>y}j=t|CONuG;hFgl~ zU#%NV$?Kvtt}uwJm1jgpUza57g3wC%H!B^KQSSv?%A^=Szkds2)^HItIs_LiRDAv6 zS4J02RaS^D6vHbB*PMy9xI_u*78j;@POzNKtK6$D_H~0u~`-YbFYdsJ& z{$S;R(-jN`BkWG2+`UZS7n8@_rou>~-w8Tk5V4m;Vd?!^xQvH|XW?(mR(pb;Wn_j_9SrZMvT4wCJTv0*9*Lu=d z4jq)Y1Tmx+CT^iX$n_!`%U$DOIj`dqFfQkAzoAg-bAE#q&xE?D7ZzhW1R6i=qG6Xb z*DTS_)!!gfnUi4clkdfMXKanuZ`_c6S>b#JcSi=t|(gi9+b|#f3M-6}NMsmnqF44T_xQ)XWey)poViDO>BZ&lrMG1Yfz-Df{+}e-(ypT#$HNr9?nIXy_=Z^ zwY7kAJqV4)v(lfKe_4IC$pA@sL6C^#s`vcVYF|MeW;(8XGH!IZ8J(HtT=M*&s1w)t z^&adqjlyX@YYKRq)#!sF)OEKwlWF#Cv|Q{qtqF~6{QbQX*XB=Q^x>gF&_^0dQrhs= zd4Kx2KFu!w*u*}~^R7WqF0I2lRX$E(d~Bk_lE5J73omtC%eN{&SYlf9WsmHi`Jk^v zWh$=OKdpLyx=hUe^ar)a3Ur~9E~IryXol#52c}bi)p5o{kD#L>P`O}2-(E8nelk6c zk4`Lr@KjqGGS7B7VnqmP2$PMALKD$UL3*Tc=A3;K5VPoRqVqHVs?xL#VY_Ppgm>FD z06V-CZa(E7T_5{{vBrOJz}51)YhbBk-m}vv5Mp-~pE{sxVg!k)xSP1+JUB*rNxiF1 z)%wk~D7kZ$COP}0#fc|A>WQSX)bjC24{t}8E9GnZ~Od6@AHH>!g!-)8ZeULuCNl@IrFm8XpZDjC=PIBzJd2(!@wOG+} zlH3zP{=K~T)%Lfc!PB}Sa{K~?_Iw3T@uC`PD6>N}8!ukq8&EJ!?uk4f-aywByjKqs zTcpcxFClIpo_r=Pkkq~pZZpyqT@8V74rP1WVw|D zxfSC4CVBDR)eba!?H|>GuP!a#fB2|FW*D5@LTi)Ll&HdGpir-`a8nev&zyTd&uEzC ziFYZQ%-m87SF(d1d-3>iC2FX3Vt*Br^a&qoigqrb^W>pKj{Xb7&lM0Ofd>(gz~7y$ zY)Q5BfkeW|&Fz#YdUOzeQS4kx;%9a*N4;a~Qq{^~wZY*>oL&nm6%!3P7mmD3JMq1} zxT$IO{6cy0@xr)_NOEpGITxP%OSkfv3-bIOkodUT?*r20+?gdm-Ng6qqNXm`^LOOM zrGesOQmegnx_z?at!YDke_x#yL;+Hh4Rs9-#!SBl73a|6n{CD#GVOg zZ!czQnmoVIHa-nr(S}2Da8I4MP+m&9FfC(@ojcve<+F{;y@J%Z3Ngq+ircgOX&`N- zscJU%IVAEbrKZN6`Rc6gC|5E8Df8s+eQ7_J$3Nz*JVYlxx-vf0BxF%{+*j^V}SauADJa(VERBx%OS)Kwmc zB_Nb?@73U9Hl_y#NUEtA0Op5N7M1z>bZ7`4eVJ$(WBw#O^dbrIZr9MA z?MEnwvE3p$Zc{ylF0^lXC9$?b4M=~>T=a}?CTya;p1yJ)N&EWF7Yn?fT0QA9(Mf_X z{`u-D9?hAY9|nmawQCVKJo|OycT_fNeSzR=f&i_>$rTQ{?=tlA?GUk=xm+K0J`Bta zQnCd=6%Sqrhg=trS-Scc^qnUw8!vO8SayHkT}Q?Il(v3JF?wThy(Q($n>6UYCiW5G zi)Qf6bH+^ooR?=S?7uQSavOg$p)vH5&><6F{>g8ijKsB&6 zv`UG{8-NBH%o$Qd8hWy%M7opA-%g9NGS(Tw^g1Zt94&!rC&1s$%!?yqoaAj#DAS3` zqv*Blh$~1cN(UpcDPCU+H>OhNA>9hB_QcEiQax#h)w>$7a3zYGyK2Q#yDR=&AB<-O zQ(Bnn=LBZ#ov&iu<;;7`S;r5+PohPte5>9nO95?%kWImYQ|;|7Q7A{JSa?G$mGGzI z5?~`DY1WQd4QhvBva9Za-MXa^=*^6e5xG|m(J_s=&83QWcp76B~==#2jDwW>yofUx*jI$msOkvHTK*O$nGF_KU@i-`-s;} z$1P&4470`wMw#6SzC$8W1DBoiyOQ+NMg}veC-^*SUp^5=p+lPBurc}r%!Pn0q%IJb znNwtKnjj~#m~3}cUiZ><=3PKw@q2I+3Rmbxiv(h(<~t@o&&_RN+@B+_Q>fd|tUIVW zoD1sGUE7RaFW@U1>||Jqt%)fctgW7^FW4v>Y-(OmUt6uFC~vI?e_5B^YM@LXGqqAi zlw&!rowUNYhA*$St{8>(%TFjPFOcud;FOfTubwv?9+sP@DL;Izo|>UgEnz6fGMGPu ztb@jfUrPIdo~5AsOz=X$tEGduYs%Dw^Jl_y=y85`^x~q!O19A9Zd<-DLGzZXVgsvb zuungFqmgMWcyU9JDd|AH9PCl|y7B&GBL#UyNlQ6+S+G%_z>JlvPb?_b}wk3irQjsG-A?rW)x_ z_rE)01ozQEgMbV>gi^tEbx!7`@&A@M_x$7^aA&8AX!d@BuHDV>m6YHl@8{Ppuby5< zqkjbNq9=M~x`B|1ktEJvojW9`#55E3`01Sw*YMjPI?wmXuf17tx7}Tdnl5({xJDk* z1Azcoa336}Bu7q!3yU3{)pVzqu6SkZOm8uQAHi|-UMG9!quDXlpV8r5Z!`cBw8!go z@1kmA<45nnB19TlHs>US_V~cNVy=;9ScHp&5|#Q>x~_&0jUmz1Lsav|Q#yghFpVH| zo%8GOa!s?yh#&1f>iSt9d|6O8z@|j}cq-l_cF*$qf|H}JPVJMXS~u0+LAa;s-T<()I-M1IN-4vP$LS#m5>(N|+PEL{0ySqWG&VXYwFZT<3+7};y0_qBc{iH1= zA9Q9Ux*R#lb3~RBFCGKYJFx?RBxZ@GsMTaQvSuV?zhehI%h`?eNW!HO#Lg zc#1ZK){Zu^Vx=4Du@wZ-S&Bd9>B{ej^?v67waog5T>U&1{F+oD-kWhAA#MBZd3%m@ zmFD0C(=EW7yLpp+(}iRC{;=nPkv*f0=SBrxISgwvCpNwtRq5N)5 zuDO#3x&n#>6{tDs=4_k9TbPF$TIRX1>9wB57}+u55LI?%yQ44fRc;VTq}3}0!mfK7 zq2deKRBVyzxF16TBD?)<5u2=Oy6OV8{EpH>`MNWIc8GJPuxJR~X~qbw-CD&RL7YlI zOM$WI-Hjej6!b0N83c={o@+;`hrs!cZ%vmDmCwl7KsK&GE7-+7jg=G5b zej4a#1e}{8Eg1Ou{?=8Y7oo)}VMroxueus?Oz>Jd_7ep6?jgb|!M8T}eqKhzGwY?m zVQ%g3Wy#W97b{i3cD2_Q%*~=t?|WVkXOwX9i<054?)iy#B_TzUGX}!R$H6T|(@~Ur zAz@6tl@VM*@_G6ck10$i27Lrlw;l_=*UR&NW#SDBX%=58(wODibsvk4PReenr;ZQL z*?1GW3~^<|_m$w;BE|$-8Fet5$PZRwEK}0->H}sVxa{?aG&qU%k7(3oBK0Ru>fH}6 z^i7duJ`NE*iYEq^`20(&d^ACh zAws+Hg!B+7@85>Bs5IDuK1ktcQi0pjV$w4mR+C7%HgM*tvdJ|QQENE_u>nj)T*I6?A9sig6 zNRbirXd$JoF5aeu-$*d%dptX$?qU~$lK10G-@!J&!~MZ_=b;orNp*blhy9*)1NO!2 zoY8BcbT*EP@4@tvDB&De3X@-BSlCSGF6=Hg3l4P1#F!Yh8kq%{AAhwg_oBSbq>^ckdtwz#;TRqH+TrdcQ zMcvFujxC6g^TEy19Il~3szB!324<=NH45u43R&r`NTEzsuOpAY2${!w3MQ4ablGf; z(37;{Em&Umcx9zH`}7FeCL< zeYWj;MA%g5jgW3~yU(7ek+dIYpSe}&$OLvcdCP1O^8CLjG}iy06dE%#Jgk=tSy+D=CKMIq&c z7n&GU3FQP1Piwt{nYGPLHjuw zm$t{Fwan+M6PjPdH$5c?#9K1;prN5n3 zr=>=qGML;kTGse%%#fW^8}!r10L^Wtd3r_|hc51OC|(qHqIJz9`i?!rr`GQg^!G`` zI)@Mvh9xxc5_v&3HCcqpFt%dRteU32kL(gq9*AQ7K9x3yAW*nx`CNiac|X}zO6)v$ z+J&OETe1Vg;81O-o}R(Gq1rxt9$p1hrmN4ct1O6Q_xqy*rW~Daj_Z8`K21pSK|do> zPF9pc8x@b)J<(dbx6u0q&+Nu_70>856GjEk9M~1Cif@Zbr#G!{SVFrsOn1$B3Uf09 z94PwfE**k>d+xe2Y=;XiZtWVEH6pSqUD@5Psj!XZaU=T4uMrzSogcdj$s;6^NH}c_ zF>VIR_X1L>6daGJp6>Q|qei&{J)%9)9$2UD;o}~0yA=kHO-_bsrB^C2)KBIJ&$V0{ zI3`CQydi1ZVLk|iR@NTqE*~Pc`}A#}H#BR+qVT9EyN2g9>uO4Q)h_nvc2GnhAB#+g zH{E#;`7=oOkX6-t5AH%Ijm*hoqW|nzfsV=N;X_ohkSgX257BrZd;73Minqe{2pKp> z#&fBI&sMeBPJ0&Bm4o8{^rD5##WBSKA(i$rDoV6XtFT$2RztCdT^Jhc&%n zePOTKd!#NMs}Amg{B*Zm{Cy=7(tC7jjP3Oa4=oBPDtd@Y{?{Sw8w6gCgr>#zFxp*U zA8g@tB&of0BW#j7nj`dh&5gIgsBU^;u|8yt{6HXmg<{fmx@Ci|9o?cnUjma8QZm;X z2>p%A`Q0tf$Ac~$@h^NK>?x@^w!xodTQ0MmNN30y6XMBy6WGb;2F~N+hd;%&4yPt; zDdFf_k-yf=0Lw}Kj#36+pH&A7c?9OSY|urqPs=8yPA1cK+RVkiL4~q73#D`)bmC#3 z`>hijw~9%(F$c;4B8P(BM-vy0&LB#Tqwk9gS2#`n_bIJoxts5I%M+L9a_c>z7Cfw8 z@v@VUsEtZPhTlDUytr8RTNu>xCsIsn1*8mXquvHn!fgrO*DS2&cA!L;l z8B1Kyckh%zW$!g}$44+4Eg!-~^#v^KTml2t0YeknmPa8W5ap-MYh|#J zX6;gZbmEWJgM8AR;NVooJStFL?w90LbQ|nh`8qR9r+QqauSz3Gg5d)6W14BqR3s}u z46Q?WS=$*O(n(Hy6ruA6BBjbow5KL3^MZQo>9jj1SFM)uf-F#F9>S`^i}x znGxAwnqg<4N!wrhv&Z(%?qNYJS!5!s<5;fo`t#6OthNV3b z!E(3;wC=GF3bity`B7Yd^$$z`x+6kR3U1ZpkMy{&4}FZ9%Ei0S#q-endXxFaANnk! z3(8JZN1&;Y&c|Iq2ck8Xj$lm|-TRn4%*$rHQyYQ;3e18Z()T?poXCXQ8|3p&Z2@+S zk^AJuEoKj)8|PHH+06deRQSd!E&Xzp~Ltb zAxQjO!9LEDLWoRof+0V0dm|nqgMBm>*y1VOF|aE-4NQMB0*j-+OXh-Vrw?H0?-_vl%Txv<$EWa%(g@J92r3Hv*>yc$zDFVH$g2(B7t z>*?un`^zGv9AB{svyOD%&VIAzDF6@pkh%pniv)d=%2G0kX9^~n`;OK1l^iCY1Gv(T zt%({s*?=&C7FmIT>4U_^oUSJ>y!qY`%N|VRJc(L%qo9_)e;$gRReV_(pKnpr>=YWh zEd3@FlNgNZdv1Rl6b5Fe!922`C``mdG6R;Al0G>W;j4?`yOvNP8e%}^C2NVJWcGUr zkqEhI|4rwTk!Z`lbvSw~8yfR3c&c;9&>?r@)whv|ajI`hb#WntePQwgpkOM4V!lDa zM7jF-Otcb{VQ!EGEayTyNXtYqH-tim7$SX$Y2ZdV%*ZmvU44(zTZ#hb!w}kuPbTTw zaK$*5KOUMc0v^!UfOA1;Hz}wbBO|DeiyF=Jx&vFj>3`7IMybEDDatUnkzK;zOZmpzv*9EHz!B}=d7E+sUWE2n71v)~npq81R z1W|IXnIBcKz8nLC84p1&VK@6AgKYAE13o?lti{E9ZXV|#jgfUdJ)5kf1$H7y3HX(w zcm20YsWm!_fw6rf16=w`sm?*p+hTJLr%|d{9#9C;RU`-|kptcRzIZlw6t;s`lQWL?HtZ7?6(Tyj&9;voILU8+?hy+$UMZmIGN&G5z^3hEl zXXKqc>+(LU=j41ng>u|?-|v%~ZkS=N?wIiCeTXsW-^zQD^(n;-4t#^M{lJJ_lWMNJ z&A$z|4ccZZGv5Cm3pCYVDA%$h?-RVrYDbZ62Dkr>8A^sTqv;L%^;3XUzLj(#M02h@ zH0V?7+5|bj@Q)5V3jeK1tEnOscn;=c?mZO4#zJ`#gtvMPh4N~hA6tN>iV0Y%kowGA z^_5zTQfOeQcni+}WNHb&YT-CJT6b+!m<*Qgn~N~;o&OH?8V9h<5V4-3Zgr~m3# z|ASRn@hz2Vz1x}s$J!#Ez%ZkIn4GOOd3!Srzml8n(UWkVhds5pOq=K)!fKT|xu^2Y zRMU?NnpqE(?Xm8uBLAq|1t#|g(;iF>AgiEf;cG(Um1r&B1M=qQ{X~+dBh?JsajLx= zM%M}~Lj7B<9UY3@a~GCtw7e`-1D#f~QS>N3T_q?tA}~;vu(%T>q-_y6>gTviak?}v zx(UMG4u8AZAi?~I*8Op09NH@gc?agovulLm`>yVdjzeLB*;8WBK3_kla3|kkUyuz) zKy*pB3|&Z{%~vYxv`sj!>Iu4RM}xHIr1xLj_&!d0d3Vs<<;oYJEoPI;tov=wnjmZA z13_YMB~%P80^_}X!bHylbVc?m$L35k&OE<9S6a&7nl37H!d6Mi zu4%>>QOeESp9MWwWjbV~V42STJj#(qYA8JR)!b5?+ZN8~E4$U!`3cc21(6~+ck)#h z`oVOETtpD8xCA(+f*gKj6c^pc^va+>RA!I2+(*VId1}el7SfHuX8@38!u;V}R<= zzx%?at$lZugz*~AB1KH(-6gspsfL$iHR$t4TM|mm>q#@y>}ZVF-Uc__KT<+`BWdSe z4gYMl*W7-W3=+(c^)HAQMV4SE8mFAsPbJcp@=d754YGz{Ay12)RA&j#dv{Bx_CDFq zBg33p1v{PB71Eh(N^{=c$AA*XnQH6Og0zNi#7ib9x36#Wc9GGRC?yQLN*)#dsEm=c zlPO|LoDl1?Qf>EqoX0lmnA`>K)@5YY^|ZxoyI*1j(s@5`&s*LGQC>e$Dvm%=-i8XP zXD6~>GX_3^juNq4X0NVHmMB;w2Dv?3XF@*~%PjY2CpbXIJY;l|a#^Zxt_si{IY*EP z@o{xA)KmJb%c3=uA;KZ_IYz)G8vuMJ@R%JEK?}6UzBEZvot8>F~86R_`o$ zzzz9xCF8{1wgJ0P6;?m-T4_OKHy2a6<0x*VF*oFRYbrv*)FR4k-y+7WD=Uu~!I$WH zAP0QasN;0+YSnevqmjn)Y5BEl_l~pBb;O(InB2ZMd8fdbVFP1UQ2;A?J)2^y&D~P+QgEF^d=wfNgtWA#)MP{g|7n`rW)aa z>Fd{7HDpYKWhJ^L zC(ofzdg+*)vP+GsxFS2OusyqvY)mK{w^e6sQ`aNdu_Pb+j}`oV-3~_f=)${IYnqIP zXiaO#k(C9dFq$!M(${!%uH@Cy&4WS_u!=?9}fZ&S|S+de5euy5u;n=5H`m(?X1u*VcEE(bSuonvSr>ZHrt@ig5qqXgkhB z(8OHK?fT64SIsN&kcSS+3EKCc*~8proh4o$XFT0Mzk(V& z`smLbHLl}6QE3EWy2eAb@G3`(JMNUdoR&gNtK<5rm*E}Xx8ZmRD7f%i%D~#!OFMYm zXuaD7CtJMklW2YC4Y=3Y92y}jP)%8C?rQ^uEi(teSR zHTSQ5>n_=$)H~#VJgfT_Du{S%z5j@cDq#1V()HVTeMk4^{io;vZx7j?GaWQJ^aU?$ z3s(zx3FKJt`O9^gwPIVjqwgp=^c#D+=kOGmS!SkGaOg$DX zX0Ky$2TtCp@u|aHEm!)BDIrgMKz(lna>~4yUf<&tGXqkHjlEe29_1v8s~p z-`^=lH8|S9?C+;3x2Nxq3m=-Shy20DEX$rzD1v>fW-k?OLNrFiNOH76*gQ>BzC}2u zbFnpcgI62+rJij4X!z;4Tk4mr;4iD1+0EWrQM`f?YJCJXZs#!ZV0+@qm?@-Yxiw|V zvUiqF4z%a}n$>7G>qD;7b@$f>Zb~Hgg!GHwsQc@DkhE%1rB(aRJGs$J#o32sVT<(rCGRmLF%5V-Mo=KkKrB#*^J$d|Mk&0?| zzn<#x>${~>`!UVj+2ig9tVR{LibZ5cNQ3>{xog9S@?d{u+?EuPJ$>Yw-{) zwW7(}L>|tp4JGpSmFeX;fxW9cyn>p!_60L%WmP7jy(iZ3%!8Zu#XC2Q_yMs_~W(m8|Yuv-TjaxA`G$c552L`IWTs1tVs0?ej^fXRY zqKJy5QE}5owl+sx2Q8Ke3wQgf76Njq;}oM!|1d0`X9JwY?Fer1k-A2`akSyp{1x8`_+shoNC~W0#u`Ijh9kmMzOouP2klR9ykZRU_RYd zkk)`Pxtf;}g$^H?0VLnh=#n_jikQO$*T7PeCVNBnG&+hjjp~CY*R=XrqvdOm4>~x*?V*u zY_0tQzD;2xE#!%w$+B_ygrLc?3giTe$+8o4vAx~dw+O>rlM9ZB!y(pg{pv8OoDm2a zw)pM9GkzIm*hIU3Gp&TYJ@^&I&VHn>TQ3r`=IC^Oy1&KIiHcpX3I|s$U8PTsWe;cg z^92cPFUN=e!KkV+=1cQ4l_OXf2g%Z0kkPMRj;1?RtUga^{CVkx{cbq8<`nP&ku8~} z3tO3#EbJC}yomEMww>;8?+e2*VlKX@r6EnKci)-PcBUI20RRcuk)9&c5+BR=B2DdP)2>G~<@XAGMk){ot@!=#VXIx72lb z3^pkuKrdvXFLJMY9Y98zs)ats!Ar+9$Kk8*+JXjb?|9UzIdvjVvz+ax&CP=V{$O{d zTo+ZVM4dVNy*OgaSONEdvr4j^XtLU31N@mLvN&HKxjJ{H8K-}Q^!OS3POf^Sdt&jC zOROr&;&QBd$^z4r_bvJTN#6iXd-DGn>oPO^A7kDBF+ngAaxgM7v9tYWr^G)nGb7Xg zHRrwThA}{0*v-`ou3Z0*J7L$CM7 ztMBJ%%wu*sV`?`0VS5hCAIKjL3gYi;LQ?H7h<$jhu$s`)D&v$kA8&{qyMeD(EAePM z&F+8N-D@`xi`akRsh(qY>uusd76koY*%{L4UUdm4>$i(DK$jgGc+U z?$~AeN$H?5vDsl?iS_QF`*s!!H$kiAJC_>>9P^%#y-k`Vk6k) z^*0+{QNDumy&&^|yV>WoczkAq<`71G-hI&?%Jz7w^2|V^KBj=uvtz;9Xi`shv=BOD zr~z+yQD!dQ=9d{<+k1gG4^d>VAEiTWwGcZb4`(;@1A8~X7fJ1XvEO{HNb?K1LxYaL z9*8Xn#UG4i(XMY4|Cpgpo2{N$VD_Y%V#XR;{0PU&2RA<=qG$5J384K z-#a)*0vK(P?TY2WVZV_BzYpqi<|YK-kIYEN!F#Qr2!XqNuc zV8R&qwK@$}FND9yQ%}?qfLDQsD}fguw+sa)@nEV2R6CuvA1G8Dq7b|chhHqJkj;sJ ze@jf8T7e-I|K6YXMx87GR6!6Z0iqDe0(mga`8&lD@|_4y7;DiNal#webe_Nxv`}Iy zAvfe3Q5ZV}x|p$CL|8*Xegd-@OByt(GYa8fC&%0C>}nniYadpQi2c>?fJ|19!8RrZuBfy28$>bO6z<>mBPY-qul*!sZpQf0HO-hgpwn~r-v?J`n z)?)GtoQN0kgwqLo)N02Eup3C7pf>lb6icRuK5|(Id-BT6eIk{PJ5x;yaKV`o+k|Ll z#1+7qk>tR$6XpOr#m|boLs*1$NSF`EN|+Dv6tnlwWF#>_oRIV&p%do7;7Qm8hGgsw z@n{4;nze%gyxY+Lzcdm#f$^AhA=`*_L8TLRf3=zWLPQ;COW1{&N~HC-CG3JvF^?Hi zRtvn#o{4yJdqV))_Th`C3`|cjy>YHZI&lGt8o*WdT`1RsS2z7T5;y*}({=}4_6Un9 zOg$*8gt}larhI{22DFPS_3(h5Ti#;bdcFsuZIC_jPH;BD9t>aqN4|Fc2jJ=u0%BbV zexY~XSBDe!dcD%UFo*qLc-usP*(*jd!qDn;-9C~#GC=;ovRK;yXHneH>x9=`rZi3%8h}!d z0_f{!&TuoNz7%>Vy%c*#y%c6*MCFNdhUkueBfAVvi{}HOC)o*k zWVj6N$q=rG@C|*`bO*C!|HK72)$>2F@z5_}>;o-g9H4xA2SV2fD>|6OS(L^bg?Oz&9j5D84a|gt&t5 z=%3(#ty|zl;aj4`p4*ZD(2(zbh0^&;q*d3r0iyzEM#0>zZ>GwIjBOl%D!2wWbg703%9|xqL)QkN6 zrxN_3eS}{m-U)A<*?~?HKcIf1?-4RTu&2y*{g&zc2gLlL#7gWrHM)`qGwQGFP-i2ae54Nk zYSgJitA{<2mw?I}^@vhthd*(a*ee5*?^dB+1Fg>e4&e@d0xPi>2PW4{8TDWPbJC>eese~*a3Y(BDD}b+9^(%X$3@HrxJbi%eZQlGU$h+U_%u$_O;5LGRPnDG?y}XBZg5fLAgQ! zWcF`{_yc+&o-$}mFyk&s`6=q3@sLtDa+>uPtJDkvZ07P?bSw5>!xrj5)3KDITVVFW zGL)Nm8g(j>uKcTB$%VX-3>3AfSB(B0d?iQwUamZ4$p>4&snse{vw8J=MakLpz^OOt zQgqJ;|LzeJqTiala+IA~)qVx2c(GGEA1Q@aqwgSF^C1-pPuLD>mXJfy3ZvB-W`G1XLCJ*ic;R<_rV{ID4Evqx2M5E}S zyvw)S4ZcHVky~fj+y3oA$;)szOmtZsQs=JyK3=)e_c=Pxov^Cae2ckdzs?XUy(%!#;dXtdv(#bnrk~2+ zcG+Tg*Y*Qgt!P8M_9VRZyN%0>;G@W2^NP@W8C4_atA?W zXfypD-<7XZn*ILpeVGnG>BJLOgB~F}&nt+T$IRuhQhqQL8W{s8d=9Y&7l}|^Q&C%q ztAG^sOdps01QR9|1nd_vr+rE3h|vjsp99}TJNE}^n!HG`Zfa)X9y@k~qbvKU>^`h5 zIy;LBb2pXgRs0pqZjzzE+?xh$RVZ)oZ%riGhxwe8B{AhVPF5pp+a(ZVuFPFRT^vUK$)RL7`7!qH-v_kPbi!|(n6TTubinR& z@_h7FuTY7pGjyi51z9QmlXSBy0?z^1ay(?k^vQ#AmP^* zJVUlbKu+!|ia2n!dw;+wkbw2roZq$ajG4bzn`T42Xu^%ylXzRQSf(>7i zXA7^bW4%4JrqvpYz7bb+XnQ1#56G2zez#;PE&HVRCV_o}2z{XX}En za3Z?~up}3*4DrUp*G-FKc#>1w$?ozvwy)v_eFq8MQ{tV>AFDbZkhhJ!H9V%$9^t6` zJSD35gI>l`*|~vU-Q1HeE;Rsj12OI4`D?p8z7nz#xiJ)1ARJsybH_>E);BKe!Mwpm zwlV22uV9(8eGl>3JJ$m~-Zr=jKTy2Ky5@hO5i4RF!Od^t`wiO%v~F+DXrqi zZBs!cyUaUT=h=+v2R#6*_t(8OvSQd%Zw@XFKKBxD!&d68t&>IZT<)CSlktw-S}(JS zx=t}))+6L2rj`gCPCB)l+FSk+Tq8T@nC^oZVQN zIzASHj;}8jN(fTm95WA@Tq<=sO&sudA%~9$(^fL?0hcEh?;;y<#v|onY*}gZKo^T* zUt83!B96=kaiASP{?=Nb_hoTv0txhSn>^!?cBprz{wt+zoK5et%>7+xVJrq zwAY2myGBqOoux4ZpH%Z4#g1Ss^YT+Kkw15bzLOCpEkoNbsjKBZ!C)%c15ZhbRsJYM z;Xn7um0yEq#S=eK{>{Jg?^IC(R5Qmy&@;xlnW$^0cGY^~cESEAO@< zHDXJk>uqf3aPG1NR`PnAcuEm$#LSiG17<-{_-KazD2H zYZWH`f+u!$do{RKkzz1jkLTOy`4>K+y7#>ky;*xG7X_%hilXh(1d_SiM#E7YD6Wm? zRP;s6*3^R9rkGo=6T}#5*MTC5Bv1b}8*-kK;P?pK!_SNzxP!K=E~bClR?HG5nSd(A zPXZJ?&VCZ9;l>(%%Q3lCu0!^F3;1zFBu8u-$w?H%*aX@QakCjkJ9i9|A+4Vo+=w)U z`?gZj(TN?foj{FFW$yeJtMER!s;=X6X-#MCJ{tIzDdR5!T#?^;T+VvZ%x|JsoHb=X z%43%vy>&8$uPiCC^4ND_zkFsYnoxamM1d&Ac6{yk3WWlp5NNcYLq@F;KV$+uaLrGb z{L`nr5hjs$CXNq3OuL^x@EK`+h`y7(pjAgQN49VCgpcb!gq@wAp7}X8@11_^r9c!V2>YIn$uI zUz2~l7|*Jq(Wq3)|L1f6KOa7s%e_?p?b3gI?Nfei|5WwAEHL6ne}1F*zqkB97W*${ z{%bEu?nsb8x5T(rSAMlCIzJ(83=n5~&-CYQOYiD&{7hs?|IQETm=%}`rgxfwd{H-8 zwSG6W(;3aG4|iZ|X4i~_A{04h_=H^D#u4dLOf--{!GPIEo*@S8*}%4lKGg^?BRf@C z!fO6FkNt$DHbmWb(8B@d0a~9@-kBE=icgv5qazE@1p_%qts=#uhJdRO83c_1vC*g% zN!_Yk2HAJ8ceMAG_a4s}P5o-~$HEeZf;H~8EXksdiD`dLhPDju>70`xv)%2S4GOL9 z@8AvVR&;GFUMtg_{Y!F`VS`23k$F%nLlkQWKJb|KreDv4L>%B)o2zSNXQ#MlcFC%0Cp%(9z@pE(LZcHv(=?=G*Ko zlpI(j7sK%G|NZhtm#$BgD>0G&h=ZTC-Zs z=$^j4+=5mO0(R2Q8eFun#s?OsjMTRa!#v`xSyaX~FeC{f>lo)?p(CT6{rm&T#Dy_BLiR;xWckti!MOB@8Qntg4ydti-6 zz{y)U74~J%_zgXQ>kZ{CUhkk*HA6l>+Fd+@UeA~vqeg9mV~yP*4)E%kd|!CN6=s{H5@>;LQV427&8k{a@kOfi}8U9w~PUo*M37n|jMj zSH16Yy-N1}SkZIwZqGB4I`oPzEqqjAa#sWJf}b^%cS{1*{1D zK_(|6cfd?d4+a@l>Prwu1*xUMdGOsVEhD-b>RapuiL^D+)psvRRno#|Oi5{=;(~-uE8HbOjXD@z4vA8DP(I#cS4xuw=2bj7o%(<= zbqVXFHxnf*$E_c~)WwG8%Kkm)5fC6ZpNuS51P96rZ+;~}QFqM3bFEm404goKV*Oi3 zW)SUAd@)<(u&5fPkWeIT1Pv(0s_`xti&r8Kiw?WN4 zE~xZz*2Xf|9NS&%qFkrq@Hh=z@seaI^FRT?f6eQ3J?%fOxS`W$2-EGHHBA(vkcEbPghHa&)}$&WMMQw zR(NR1;F8HH|7iA?if3#fPZF#`T3EIa=|Ss(88?Re?R#jC3fdHa>K}mG2yRY3-ucjnhTl@!#)SBxL-}F-?QLXIy7#tOFh;`mQ+$x zV&w9mXw9;cK6){gXx?H#@sPk+aAq+k9(J`!;hBb>HnxygF!{D)$^Bi!dT@((dd3`0 z8ea_#m)}gKgDDQ{l`AhvLZI5gnnUgECc~)0l{M!aIxStEtUVT zzh=5%JETPCNoI**$cmGj_h-Fi0NSX=)^894fi0lXu~hgoG0O&WkdklT6W@_9Ozy{_ zB)qS)38Tfs`7OvVaTm`Po5q@*(gTHto3@4|o345;OKz*BVrvT+=`5*?NTr740HuOu z?a5LpNlMjkhsQ{C4v7Ym6N7#tj_%lG<2>OeEb39UbNl2?jhu~t?Owl6k6`tS@>EY5 z9k}pNjqFTh3v(4tRsPGgbeUw`gvUeUawbR)P!^j#7fBd$7*s4VUX8?wn$OEOA|)uJ z3+ax)neDCV?KBdYw`;reR%pd(VQqYSTvJgL)(SET3vG^kz5GhYUM^$hgG0Z%1A%#w zCfMwblgrd{y~|#9x+QEXeF<-^d4Y7=1Fn$i45I0CkEKacW3n1|1jIfXb$+dO))I7X zJV`qr8qX+kdenu@=PkT2}@6Iq6d zkSOlg6nH8|5%;VDuu_BZi@nxM9jThmSS?!m~1 zLZq_XWCeb>cTV_jkgn~uTBW4{wsSOq=hD-f44xtqT}cRxM(ND3hdhvjU|VfuCk za95Y$MiG}F<=ZBM&2LKw=$77`%1zaqW{gjT@zUG%{!Ew|UiHm;yz8E2oi3B_5qFe$ z9K%_ZE_qn&X{*s{$-s?wl^9EPyC$8PKL4U`RMy*VyD8!Y5Ujyp>~PQs+KSg%v^<8m zLiIuMUY3n8U5XmTDGsHz_*CQ5=B-FvWu+n)t(LPosdc41>oaK9ugXn7Up@Cc&s}EY zU+Q&P*fkycCcMQp18P4_wBGO?x6qyCo>cq`Mq4kNP(dqe;$d1CX@fy8cdl;9Q_N$ zQTLyZ@s5tUQvgj!)JarZv{Fcz9YGzpZXa{Iyu3zJQ6Bq3vd6-K;{2jVZ$SCLaFYiw zcP7^-cPRG|fA`Q~M?n^MrMNWHekI_Kn7$&d8uJQB7I@;B0Fw!!141@a`~m`LXh0A+ zY^2EhMxdPexGluvJhx4C|E6^dU0Pq3PK)FKF#_zJY#kGgvNo2&D@W_Q$ z3v*}PNBc*27K%J5QQ-wGA6XlAte74a1AlNeSR#gCTzsL>`Ki%#ng}9cOt_}Nonc#Z zW*Q7*jCw1FFyjsEKS&Qo^+1PV!ppIWU8}%3Eb$z$m~tTc!ZHfNG&(Vw|D;MJObMJ- zqCey?inP!^qx7qh?@d%@2{SsYM+KnrDHpvGv=^cDLN~|I@@56zI#52QbtQ2!SyDeV zs>)@QtUdHSJA{bw5*|0Y+jmwRz@Fp5I zzsKKkXY-Rf1(%7NR-az%w7-pG4#@#goVAS?V{iyB&$-`eeZjU7nB7Ra8#s5h@BnrG z_uZlhNjqM0u5T4NN1fpj0G1QSm({?J@QEgXXX1b$uk9p4HAh!}R>Qt3qQj1o0DD+` z>5~aC^Pr5L#cw@nm!Nk+-k`muPMhgPL6!4vV3*G5v#{jcdK|;vCaLZ;x0Jp};uHD& zrr#gZUn?t(QdRxMFruygfQ=A;Yu zWxI+!{kaw8=jc>XlAo)+cOrKc{Gh5esh|<7!SZ_SI3g5f)cAv73l! zbQ1iuvaD!CU5mO%U6YWD^e9Uwmv$~)$~C^UQmimwlck;0C`J0rQrSk|=1WO^J|vJFIQbb6HM)77cGQN&b=A?bZ2XkwrX$Vbd*DTSMwq`X+y%wlkxIYTB^G++RhdI}OO@OwEj5+rCvjPs`-D?p1v z;A`M_cuHt0eCV4jX!)Vt0f&Jou+nUMetG+8MbUfOE~ytsY&k;;~>|@d+t+l zO4B5uP#|!%P|luwvl>q=w83o1hnfnDYz?JrP{mXn?8ROOpfEy59lf6NF8tg|@3oBR z{HtNT(q7@doNNEfw{E1+0+gpDb%H3?@}cB#$&QAS#9`(hX7NMm6mMEIR5VIKQ8j=_S`~ii45+eDb?1nxfh8jXIXux~ zS?vruwG&a4(XOa%V#>(cO30Fi$_<^f0vM9wLHfM`CQ=QRQ9(soS+lt|JdBwB z8lV20axr~_IBP{9OeAbzu3c9$XLfQy7oUU4Ql4q#<`65_wFk!rV~(H^xvE^eZg$hm zl&j{VI;)14L(K8pUutdHnkG`U*IocUsbZG;tF@wW-1NaN%B0{Ul56ZhAmkGbV3<5? zDtjehE%qZjWYiwHsTF0*?6O`iV_Cz`=axt#9-14pa0apXDZ-o~0DF;^ow!RKm8kkb zs@t8d!Miey6O))YAtO4LsN#0&$OQPyCZEomp6loC;OPYM-~-sUYPwjpNpC!@*ixs< zYqfTf>Xc8^(~&<(O5)Xa^+ep_&|5d&Dzf8>ouH`yQGPG#JE!QC5AKz z@_wwMo|l>xcv-`xGu|%F2YMn2P4-IsH3^Hj?AMh91di8fWb8(Mg=rhRo6&r+%$Afr>>pS`W=q<>i53qrL)T z{{(#VtL1M~ta0uNM3jxE;os0jR7QpxVM)+-d6F-O4pzCUG##z6J4qVTx6&m|i;|h8 z7u4S0>&7pB4A!G{1n;|15mx%`A2R~+n&c%?=sUdOXRzBwnG@%x)hMo;#S{{p>>mQ1 z4+5S;vk0tTCA*K*i_va<8>yWyF?lu`EuK4bBKes<)J&4gkBSzz4Kp+-8#L@V4NJ7T%&7=-9l7`}F z(CEN~3F8ObQsV9LH7d6Rte5liJOEWTwr&T*`;F@lH$F z3mm!bCJmoXZjdqNc;DRWy>~%7qwQ1dA?|N0yVORz$}c*U1Ss z$8NvdROrrYL4XR*E^{_ZHmf}~+^~QyYaD+96XGb4vumi>FZK115FacC4?d&#?6_3C z?`qY$!cgpRwqZ*l;ALu3Ok$~G%d*~%6Er2+*CK=`Tgkdi>CSPy;50d@j}3MBXKZ)5 zbAU?|h2=swVGjkKPs5gq+dIvMTb?r;2-#Slch=6P*Ht3fv>ZTmqixnA?V-)+5hc_S zc{eEV#4xHL%iGwkv7I9srFh5iF^$YyP=6ke%8|1HBP`O^nNOFkZD+Pqv4Omww!O#p z5~Gb96{=u#FN211=#M&+d~P}>eJTZ*oW4-2{gG#EvOQV$^#mj!9Ffi_Dmq*ywppA7 zhxkS`eHPM?xUq9|E0aWIPHeiHam=9jL`WhNZrunmL?Ft|Hnp1PFR=awu*HG{9wTwSLgyu4#@9EV ze@0OOI%DrZAE;XalW$OqLNJ=Qe0RtvB*xd9Vy+Z25>0nuriAZn!n152V!p@MDvN{=WCmL&U zi<#hzIjePbX+vp+nKIm(qA(vw<1e-WMuQ$lJpxt?;gz(+1A597=1(Iap9=Ec6mzXN zuupRyuV@MzZ-_ady&-0sPlsv^zJDx_(2#j0?^2R{6la@Gc)YSYV7;=#f>7of3yrP% ziU6B@v(A8A?L-0zmZP8~jvR97X(={MsCiBDs)}()3to++gx+*AK%!P_2xbyZbK|m}loPRjeyOg6lQqi}o@V*)9n2i(_@v@;&y-AZY5Fqp zCY)KSkdfq_OF_@6%5)|&Mupi}Dh2Z2s2KCUP>l!@-p^F}sxfm883UKSKpBc!yOcF% zR!hd|yglaQ(j{M#v*QOQC&}N#N4A98Ui^m7#bfm@i*0>dGMjT0EN+s0dpX}H_yCa> zmXJ8MTM+-yS*fsUb%$^b-_3mDq)j+SYwlubzKYL7G>fXC_i;bqz%64eXWId*f zq>UauxQs+Mct>tQc!9SMJLEpKgc@BFE#oSIh|M?^AJ#13c!HW(uh14;Ic9vk`{xdf z;At>Y=p2x;7U~@9Mym;|NzJ>)^<=mmuIzXiJ@NKkR|aJm7-Vn4myGDDT$_^g3ep~! z99((Mxa)OWlk3Zqd})WoGG>LxddReo zPMuM@(ydbFV=QYciR%waD9V%WB@QMSck!nsiqThtY%^UC7~Ch#(x-H|7b^^Q`7Bg=Nfq-m($0vvZHE;zeuduY8h%-&7yHTZHyAwkz9|l zV>)UX%;7*kCxbjKn{i>P;jE!8F0K9f%7JMe@@r?Y+qA3E-{YT2|M+nK`69nyq+W_f z(wv;ssu+_UOMy;RU0s-DX+?X-wH=u&_+~?!s%W%WbZ|3!>Q01K3|5k}nP2W8<3^FQ zc%IJ7`6gFwVf97j=qs7LZc~4fG*vVELht+Q{t={#-WNl-Kqp4jwX>he>$jWs!DrgV zd6OCh(Z(oWtiA4VN>Ly2h-x-9`M4h@<~&>N9g+Qc267UUi~l{lTjN%}N~=4nKbBe? z7c8H{MfQ}<<@jptCNKZ8!6|aNfoYewB^2#$+>#P7!4jsJ>;P7HTBQ%0j@?-K)R|DMBni zrXSNRe5@a}uY7jQ%i*N8srKZ0H`7MfEWJ#A-i_JhIFoVcJPzx+D_!ajdO$(Gz z1uh3Pe%+d^-()gsx;yKb({761=wXRt>|Gvv6+`#E&w>>QJ*8PUXSZU}p@$|SbfRn; z`4210usF4FObjl7|L~5?T~z(|x8|yFl!7@n>*uk1HGOfK$Ba@6Z_K$}NJw(B#wu-` zIf|9KnS*gdh%*|BDJK`}QrQI>T_Oe+;T+-6U2m^Q#>lDjk!1$rMH7Uk+z|Lj?Y>M8 zTcd<$%&=n8vLwX#HnL*?rc%Yp)8ZeyiT11>X`Jw3Kj$$e%UvGDO;LR25_zcr22CoL zBv3u(SeIO{@9hfZ)7-HghebMox81DnUX`CoN-CDpT&bG$;^|fKy~%q|5ZWT(+;CX? zbIgg`ZBd6tcjgxAhXqxDA5*lKgblq5p(Czi1I!kg$}KFg7*mcW zf|P@CF9`_#E%Gq<@20!1E^Q3ReWK|=ps@?+c`%n%r_=y^K-s}Ca2a2oI~Mm%R3((B`a{q_Duj(}%nW_u8qjC1kL87lQ@+Pn3>_fTohOzExA z`MLq0lAHS;yAR}W7xMkb56#83DP|su)2*3%>7kmL-XH=z2$-wGP#Rj$F1`R|d)L6p zURS}`;24M=18+ZnzK=#pOx}rnCZQCPL_j2*L6B{bDOy``$awgB!XQ{b>L6l6`*P=K z=X&R2r8(3Sy*dgI3*aEBS^{|NiqtWXEzDuOnf1op9C7k>9f{Y%^fcbb$XrQh zwNSk`yBv@W6f`U70E-4H5rM@w)BTqSBG@YvRD=r_%cRC%c4~_`qLJ>ub!D( zd1E`??nl(%K6DY|V6g^lxCJa#r=6!q#+=%w>GhhnEnh);bC^&j$t66-u{lffUXDJ_ zG1AdVX&3i=NKi88ZLoFzw5!k3a#P@OP}$%RNq%stqyM??(p`I6$iS)7^f;NGn`fs> z`7Y-rs(W=BS~4n`p+XNvQLEZ$-x-G-Wiu{w$VmV>`fFwkVT;fHjM?J3YO#v5@tOTA zUmA2QBB2-`GS@5!DB9n3etzapIxMvz%;hgy-6!p7|5aM%i*`S2u>BG+l?~q(4*Hsq zWOaD&9DS_NcQ&;VBs#LNl9*30fT?32i#k^(pXtYvIi6MS2eCZ%wD+vWlKFboIE5qK zJkirLzDZRH+~P|gxAC=%5eZl@N#1WKPkp25P7L?kAqA#mO-M*!#(WMxUoYQ59vXB82_$H*LFE~>)9 z(FbHBK{>fzUUqhU%^>iO;rObRddzEVO?02&iRJ_{@YJWq&_WAQQ&W{$?1+xhmXu;9 zD>SO6TCo!A#(6FkWad~{7=vak8nL2)-JJ~YrPqQ4C`<~RIqZ#zQP)Gs?fr6F&sFVA z3uffe^)#gS$RR~Cc>;Yy`bKaNttLIdu}3HM>6J;5;7qs?>N~pQVtq0jT;#lHwH#N4 zLe}YL<&4;({=NJBN8z}a+7V&u9wnBytGLwZpMpmSwWAk4G9Tg`U!#?&MPme6 zkE6kZAq@Nu29MR{T_v-vV8ysSkL&<5}n%=ZSlCGU?6c`*=4lU6**ak-?$w7M%)H}Q`7Th`IJilx1stfynaJx zOsV`rsJ`ALc^$jX?<|{=-&0$-9@wFD4F>?&tU0TKs6T*gZQ2C}>v^dom-S14O`YUv zE8l=l+lA}W`UZa{g^M&L@-F8`=ksUOR`}B<9blVSZ@XKCYo{T>?}P-?trY?XdDSN% z8drs@%^S{>aejC`C%LN8yZJi%GeLe$reN2#P5tA~0@-0)%7izFbE+4>r1a;KDr@l3 za75Q;K~a2w^(;jGUP8YLw~f7y!jJt^DC9td6o}aY5fq}>>c0OhXcEt}NERWe`BvIu zA^e7a^dKk!$>_<3N=2S)gs{RiBH7oG&VpX|n@?@pGb$^JJ8BKBEb;~I1=T7mO47mg z{3|lNfU2|_7ND(+aWlpCtVp&U{`*(XPC)=ziiauS&t9bt&GBRe3$3(@$R2+)g#i}mXNdu`}YH=9h)*8#iQ)zrqNNcAiA+Dx@Exv zg>}Vs&GuS_Lu1{LViYW_h)%-FL!02MglsJA&8*c{``vI^II--H`=f+`tDDoCE^t9W;H+nt znF2Iy!Lz?Q7`vaCUd>}|A{j>`F$2~Q*6%R6+8g{ERd@u*!*@+IHLD*LD3z%``b&f? zwJpUh%_~ZqoOLbbDYZQ<9W%kPHY9V`m#LYE9TBPN?Yf4;)l>O;&y72(uL>qmF7hv_ zgiRR(N-E=s7WB`ID>v&LR|G<;STt)@$SEvqaZ?UTOeOiElus04;Ec}W5KsC8vdquZ z*RGRh6in-3GY@qK-!o7eKzZ*(>AOwFwo9ClL!L{ba!n^`T9f3>u%2$rK)a#v~+Xvb)oVpI-R{+Tp?H!u1lMJ%~1o#0VwT3#?Pyn+4dmLQ@B~43Z04 z`R^YPCSgpUG?@DB+P>uT=f!2l8jN(zC?cB_X(pl1P<2|kiYhJ>xQ$gjAWJk}>LFM@ zAjXYZxh7p z`ApF}hPCvKd8AiTE~qU3Y}r-Z6R9Umjff}Nr3SENOazt?Wu_Ma*N)6RBEF}r;V9X8 z!aw|@Ndh=OUXtA4apMa=US38Ms$8!&&D?!+oJY@h=5J%`_ftt0F}fwVie2>oiSUao zQ`M46dN@sTmIYTEu8MU%&jKGqUpj5b0CViq$EnV;gjG`!II<_sk0NK-UqzoU^CT6* zc&xBu2?vG1mV8wcGck{GPktHEL8KZ-aa1%WXV=9W)p(Uxx)n2bxg{qk=BToiwL4pf0OQL}gnhb12^9JlPKL>wqz=Jqr8OLuc_6kGpec#|p?++3nMT3IZ4KE8sUa_;{(qj-2IJT-*BR6a`atC&Yc6W8xb0_Sui)$BI7h^ZLV|+LF zw|wibP&Q+OL(S^x%S2S<<|m%-DE+Bt{KJ=TOiKz`KQv}ngDB0YlN#I=w2!04-aW0= z>Ohj!zd!lc_Yerl5h*1d>b^jNv}Y_H0W~FYL&vI}67#lHDBkMr?$BLR8+xWxhUca= z;(dAPnP~oX;{nqj_b>F&b5nT)8^;r1FgXfmO(ki|+X8RY(4e8V_mwbN%0=FCia`*6 zJ~L5FPCHn#y=)$~J@B~QawYS0ST&DcKl&)XR!%lF?g|fc*7TCtn4?)n+@i1d+n7p5rm_RiNBar z-tyd`+R8qTbv!Yi3uW#p+U00KJ7f`jPkJ`?yZPz>o^)6fmc)9(jrV+IHFBjhh!@Nv9 zC*|Ipj3rW(Tr^gn)K4f8PQOt<-2|^PpjOl zH)UWpkKA7OimJuWO>%fZoi;OjXQW#Nd=SQ)u}>HFrkyFOgRbJ)>7-6w#j;b{+Kxx@ z=!P4uH+`SU2H(x|Ybx39rLhJ*sbKeq2d$V*R@o={6_j9u77z(uZksk1g7d4Hm>@9u z&F(wyQq-r7m=4I4%oVNyfF7l->N?IZ++&*|tsy73J`Zj*8669-Da3vz%hZPn4LHkE z$d1jr?r4>n2Z`MbjOm!)RyCZw47w?Ot~brS*$hN)~~TP`5`9w=iep=@h?V zPIf*rsyWDVRQZ`j6cVHNkd*=Q)ef^65oHtzHY4*j&|Ec&cQgUd44QHtmGXP2&}9`rWx!*Xpr-7r9k zOIfr(*do(h#41T;tO*`RpEb6dntl97%Vln`{{;k7@66`(efW5IKRK6unX4g9DEJNZ zebRgXp4cXt8-o`oq{~S9@b2mIpL&cUvQpV@f$+rR&I3u62UPHD8GQ4z zMAZ`2Lo{uDe_p=Y)2*{6(UFl*vL9>z+FoqYyVYLcuY%6G8Sxr=B)W7Gk8C-)LT31J zh$mT`T&IhecxWO;sz5>lj_NJajr1)fEr4eJMj)s>;(^kFc8zfl4*BKDX@2W)z*aRb zupVPUCV5&_i3jqq*o}?7CkMTIhkSDJ)Y|ig+zVD zIO9O_)p{R}4V=R_;dsc108*Z8T}Q`#B(90U9u-|?M(xhI-Prid9z1z-?#AQH@AUxF z{B{9yOj-rG#27&{Kd!Ud63||9CTV^uvbov{BoVXEx)#$qJ?sVffBU?)mjbbFq|wo* zWmk~nTfnJ-rc7n6W zsPI7=HPtoVrQJJvIVMJ-JP8U>yV!Z;P4KAd0kN5^{s*X zaS9wOtsNUx%7?iiVmv~{=R1#1^5DVyYuWk@IXXhjWCiVW;JE321Uwz)A3Ku|0Jz6+ zIR}ycRDE{Z$K|u(vnjXhbz}6TUw3pGZy>NHtY(;N`1=4ePI*+Egq9Wq;;=C+YycAe z4va69$oz``>e2cAXL%OB;N=gTZgP*~K7=VdTQRKO?%*;t2^9{)rX-DqP8xonY^BHK zl`yn1O|RgmwGK=ppZ|DANC@~DXd>%bt~KVYh(Z`!Wqmoi`(~z_q*o2v-wA=pwHke7Q$v+9Bd>h zH_mznudgVT-OBU~4>-)Gqb=%}wSp-~hrl>Z!gz#4m9&ov!xtJSyyoxGR3dv7*^Eoq z^OXeKYpvn64l&M0TMZb6(fX~+!a7oT`;aB;7GzNz>^5~Jr~syNtP z9Gw~EC80?GO!eF4q+0WfLIa{brk0Kzn%`Y0vDyAmYbRAFy5Fh>NR4+llz2#`EoJDu zS=#@!5AeCth2vAlP(W(f-Rh71xL(wm+g?4UvEp6CSn|Nojt6%#**i$PV~q{kGKpEuG+<=zKZvVOKlBq zjSqYk6odW5=oQ1$SguF-4~SyFd^FVCeq4WBddEIzs?@FGTicYIjt&jDdZuiy61v@v ze7s$+4{bKo18p~#JEOc?)Z%`Kj-<-;&BkD2r^fh++YP7QuCTaX6uIBa4(nQZwpy7w3?>W**|LOsq4QGn98MN{kfvbgXoR*%hdq~QQ(IHR+-ucR zUYon>-p6HXeoYVU@8h}~aO_h(1RJJHtNE;QN3V{P+&>O&1WJ-_;G3JK_P~&pDLyn+ zq{$em0F|}G904tN^%#IoEpvpRPqbEBtWwrV*X7z7`yAZ_**I(au183Z~f)vAYBzN2sq4c6A)uw|k9c&`!KE{#PWR zD)d&nkEM^WMVfD-U+F3XazLbdBQ=fOAswLaIvasC;9l2?`2V zv4JoT-e42SHrd+fC@ZULxV=8lJ`~31%~J$hwu|@JE~Uk&t=GcpCR9MZtPae=*OFOW z7O99sOS2it%J4x&Ce{JT+;@k}m_6G9v~N5k!@P8Lw}y#VnAm!4tqs^!7AO6JNChulJw%F3v;S(c9kq6(mrK`bBvZi1Qhl*{)ZC zOllqr(V0kXo$s68&-Z%X*c^=5WHUDm61l9qvm}8wC%#~{gf)kIh1F%{ib`IEd4;na z%^3PH5)rv|37AO4(QJOS^dB}@FIKSQidxM;`N2F(Mulg^O{6{_79{EE$MVrva4X2k zxg-F{-OK=Ca*YF3)=ednD4FmN5XsNld$x=YjP1oGTQBo|o<;bZ`@I1V61bpfog0bk zzkVIqeqxgz2$I<;!xvQ#E>n|MRacLHH=cB!ATS~Fc`lv#EGy*$gUEGvN<9I1>(h4WS!4OFrFFLi-5sSmrfV=I+OSqg&CBFtQ#-$qGiBq`%il@TQ&@rWAcI#e1JNAURjRg@#CHu_gUQv%J zhe_f?@c7oyROTjGzd6?8YbX;;Y@}7vL`*W?!(ebKn==@RNS1gr`xXTcz`I>%U)HrH zj3lydozG?WE^c1xGE3J>^iFzqv(bgc?&Do+maK0dst!R0phUN*FQAU{{wpb!Sjd!O zVLIK*>g=78ohFa?_oL$NE2q>8sPHzsFmW71=7d10Pu-wiPMp-Sb0${BYD|2`_1gCD;xi>U< z1-GBCN6%^Asm%#vg~bW+BjiQf+C%FvpQJ8rhECm!u0-h#UM3nD&wXDhyZm%m zb+;`m(uc97-x~4A%6#37^?;{L!A{mL!;aW|urycs+Db%EkH=eb_vu<$*HQaTrK9>( zNfNfr4+OeWJRRV>urR?^?ySASa+!BbQiYO3nV{aGR?w3#!<5dt$N6@F<@+7pw*Go{ zKEQdpxGpSki$~V=7S=*b^Vc(6Z!h)ZmgOsU{|g!Ftx!iz-x`UV*KO4E+>D3C=(f6xsUiVS^sGEGj9o|!S7y07k z-G*1vKHk?!o)?5mYv-zmoX*cH>wD7M4y9M@7*9RDTgQtX1zBFc!(CXd>tA`g?jbO* zSg+~waKAF`ID!nJD<pDm`LINQcG+5@rP{K{Q;U*|xckv@ zDTn4BDc6pH^TD(oFJ6?Bu1fHU7wN{0=b%QR|MdDq6ds!UhBHm6^>oN##(H5q9KP*< zdas|UR8LXRW)bPEpQ=(a5w@bAH%MQz68P@Xy4VX!L_k8`VG<=PTt^f_lD!%Ox~@SD z=g;J4y;6v(TjlLd7S1x2`x&?6bkv!({p@_52V=UFQ{TrLRA}W6gU{QmVP@6N+N@X% z-~Mb1mqXcDJQkGtFf>@teOvF>wUG6|yyVdRY_N?RZz!VPhPyW6^6Ku&Gp&AncUI;} z+N$XiKiYb}df|G0q+{u1WkI1vQX1$e92KRq#9+s+r_0h#cuz9ul$0l5lE%qh##l4`qPIKd!P8^#hnt;G@!B{0HQG)Ujq|zo=S677W>prH*I7NZ z{V+VLQlYa@{Bkk=c)iV`dj7E6X_v1}x7GJ@-|DHs)byA!EN7t%-Qc6-VbXC(JW85< z;}ksORpGZ9-O%tmKMPDi7Dv(Z+3PDo%4=b4BOkC8#ukE479ZLvlvH+Ryse} z6A}!NuyI*Sja-tj?P!h}wR*wZCDaoT<~oLI?K9>ME=tFh=HZ7#YZGZhbZ%0G*7k~4 zBXaWm*(QZW^q_%Jc^%c&p>nzGvt)LseZ{9gvJj+D3YX%*o%_k`1>cn!9%IdiQzeH; z?8eE>nE|`)VU`v-vE8>TY?{?!x<#`U{ry*aEB4{DtwWm2F43cR48LVV4f9&R2Mjiw zx`ae@m=~Mt>>E0He0$?)uF(C>tSFi3oEHs@Ny5kz6r&wVXSAdL~_bJrjc?d ztjth*2qXTX3~MGcm?le6{?eyyHrB?QL&$HR6uXkwjdg`uJH8TE2aUC zR}U>AvNeen7>=v8hb@2}G0hEbue1H~SqR(^SAq|hA#rKYi=7EVUoWLqaI z^VL_`^Y*oUM$goP`KDbH?pJ7^u%>iWGCm*dwtG%=h^4<9bIT5fn!chIeI zou$G$==Sr8FoccqaF;lpBNQj=%hnZ8qumq|$>cUpSt6Cs&OO&2qE;riA;e)1od%Cg zQ1$zp*<0Bo#bQ3&ZK$>edH@?*7u~q-o>RBw3z|bu&MMuYw;WK+UepAK3u9N84hv@> z#u>dcTG9Ll#)ifDxOU#Kn;O)6m&vcxOm@xxmNxAmMi95?gnkgtJY8~a0ZeolWw8A-wRYKM`nDh3g z^EcRBZywsy>X=&CB#}kw#-?m53?Ho_daQ}wc7@yK(7_~{Kg1Kg7~?r+9!@v*>FwT& zAd)TTo+7YGSgzBg+4kJ^v#2f7+T~*tD{b8q(bHPtUVqSym`jh#T8ZaZY&%TzDKDSl z9U8Rgw-OtIQC3+U4r!~aBwn+ZsFe<;Gs`hc7HF-N5FYg?D6Lfvh?=9zQcNqjSd~vj zb`KC&nZpG~ck~8w^7CX$=}VYPgsqfR9LC-VTAFyoy?;D6hy@>_Xng>3vs9lQ6h@FL zAu>~WKUpULFCK~X4kwIM+?&k1T0WrKI7XX(CZWP|UoJ$cB@xa$ukJf&H?g*jpP`#tXNit+qbVzv zs}e+LyoU+IappXfR8_j?)~~Isy0x;FU&m(!8N&4$W*vdGN4`geN{QETu$^ozwV4l> zmL(e6Gf5xL)8F#ua1C6ewx6HHOE;$r;>lK`{iA+qJ->u*()rVu#h&N~2uPh_nElgk0TL@B`({y!94c9V9 z(RrvU#3xP9x_;Yqj4$L7Ocznmu9=!JmEqWDU_V8io3IAY1lmRy3k?|wd#`=8&qz69LgXpGU%Oi@G(tmuabUhog^P zxSfaXWB9f-$OC+fHppuJ>9l4On-cf>0`5 zI^^w59Boq-y8?c1>o(g3oUX%rF00zUa@9O5j zK#fZ6nM!6=ooh$wcRjmsJ1?Ege0E?bW8cIuw7FZ;0eguirl#(thrSRtdPR7S(WDsp7YjZAQyDXwB_7?O!wq%5-I zO8vwR&VtT89j?!`wkrauy17rem&&dmD)P!~^UN|#oeK@EH>V1MhZW6EB?lzA7+TsD zwR}=nxM&g|B=@V8ULVh4>FXbC-W{qognVwps*^DLB+$5c@OcG`$L!77XFaS_mT#mK z>+RVT^ywc73(du_WVt^#QAyo!|t$r_&tvsk@KVs*j6EfXIR z@J>s^Ey$2n9^#Wl2pF`eL{T^d*Dd0lGV-z?Ains1OEpuFG-UYRA#6Z)@5`_ePW)Lxpetp@M!9PQ!YHjWS$6<-mdhK~>e84fV5%cpTPzP##6mT}3(wuZJ z*Q(wBv>rnO>4#3UrvZrWdz2IRr}@_(&IkaO$t7y?-Zb(SEPZV3)8vqo*?EeYlqCrm zOa$)84d{+;DV)*krn(eZw;##z3xi)#&JYij>+5-I`8#*V(*NEm|6fC#V^ha1!%^_Ei*VJ*Cn&CRtwbQ zJ4jVl<-fA49cOSJn)7+hBev3hj=11|#_{*wfsheODlf~hOe)&8;g7HE~hIO+%x#&iX-1MG1N5406@ z-52`lTdA4k6_4dZB_}zI>okdL1iStIY+bnSzFF|MvZ(DTeb8}p9yGIgc&m9hed7dZ z5te!+(%yIeNAGq0@g&UVdSHwSI+P*qk8l%CV!GkI-9hNA(%X3+vdz;gbkDN2%VIt~E`Y&w-Pv&? ze4f}QY38WC!h?V0WP8k8q;rMW(2t`l8aG7$k?7N*!yp15@o1r=NIZZB4-$0;F!CDHTwVt0LOX52k)qe)H7<{Cxe`SqAK@^YeEd+YEoVbY;dj#APglOq zi^9j&Dwg47LW8M-Bpr}2UJfx?Jzu@}okw;_uh$aI!0rGaAG=-?zI4Ck(YUzg2I1to zOo2l|@V=;%R;yl{bfmf*I5Q!iD0BLz5SgedYp~5I$qZ~Mvn&rq>nf@n%AK_q2&MpF%S8Vqz@>IQK+!!EpsIUpM_iAtb%jtsn2{seN;gN7 zfJy&DLV;s*!pve8gPQXw`qHynJ>%-zpWKa?bS;!A#13@`J+tx_)c=nDcCM5zRWU`zA6w=46S4(STcot>>M z)YTeoEG7q-l)&Nubqn4W1mTcXO5QxLv z%f-A~gv|46F`Xq<2Sq;>!o|@dt%`;Xk~&E_ZhPIbcc#N?o(f&!wx&4}R@896+fJ0v zI50}O6j~Cw8Fu^nK0OK^4Tcw|G;Z^P`!c=q@%T?{jR%gsNCLb6d-+pMD8>{?DMSSHyAqX+C&6$I><(P$0a6( zuSPDvY=8GuCJa>9xt{ROjg&~W%!y;RYo>wKPIxw|!FR@-R~lW~$9`0wSj7rgDHjU! zAjxK$3Jb5mj3Ql9GnSB#*kOq+7sP__xXdYDNLT<$LgZK`akZkg)h|*mzaqa);*)ld zQ}(z;Y8B(+j@Ki$K3VkhBJdtP*qf}tJcWtO>v|pZ>>Hvcu9I+Xh9ylF0Z#_e{XeKk zbvX@iq9{yTU2)*L)obe{gozJ@K!d|diX&&m$C6pQnI3_9YLBmG9l~FtL{ToNCM|=O z-7Fj=8c;!4f2rf!-in@zc9nSqGe_8vTJv31^w{GN$fHZSm_j2U0o3ZYtM?60N$V~4Jm%GW!S zuf^V7Pr4(*R>>Hw)K6@s?e1E@90s##fz{qwn}rV*P6+hDH|6O z8Y|_E{y|SE2CC`-&4Qp7y6=6Dh;R3M@)6Z}y`vO00bh7K~fZn+5qkQicjBF@Au1^RYWf`E+0d zgT)~ZrgtpT4l~R9IXSIav@6Z4^G(gxFnV?q#O+r4$9A;eXuQ!-v9=z#1Dn-T4t#R- zWSwF`?5%*xd-`JUTBd5uB&NhpTnKi!D)ZR}cB zd?HOCrXY~`wL-yDaOuNmgiNu*!GKd$E2bW1X`G|L66!u{hY?AXb_=vpXqWnmt>v^v zLBQ^9b?8yt{T5b1n7I-IBZ$!@dFpY2Myr8$t42kl$2<>A1U%H&V}HTz`L-c?U%jrQ z;c)h|N2F;GMftPJSe%u6Bcn=a|8F_hi(eCe$i7Lf88pSs@$kxT9Uob|7yWcFZHc^T zH*NLPY@_-1p&hcrz=G0J-@vw^`7yRRHR(`uqnM~v1Bfe|<370o8Gw!!R*c_l%tFQ~ zmD8uHhF^Z5wT6d1S0Z>7Rc3biW@X0dgYWw;+U{+3YlrQ0d@AFs;L94kt35A(X4&@1 z(2VcpdbW@A$O3EYiRhA7(fe1Fmp6E&waBO&s(rAF!p+Nt-PyY2Nq^wdqH_bNEq1AIC&CU=Ef+;X{J4sQVGzQ5kIsoM2gOV!@(S*v)dxGLguAnk!(Y#Fgm zw~sCXTfr9gHS19pkosWor7A2hZ*O8Sh2M62Fjm$)&F+tdGe0F8+w!n_Eme0BR>K1FAIZ*v0e@G;&wM%%Fq}}083Qc7;4e`*$7$vVsRElb2!G}gHo5!A8SAh1K-7Y#oEL#X2<4OC9wVA|Tv6RdctovZAhcA+k%uN z<;%#$IQLi$6|AOm^^9I9$^4OY&kXit?28@vcLz#0vz`7JlZe^74$YCtQ(g2_o!c96 z?Ildb$fdmfE>Y-)w<$Gdp*$+`<3`8%R%9eSc=sRrwiGV5M&Pt5s8JFg=P+!5_;oZ{z*3?n?KHmNKT@Ek8y4Y5aP$Iw552Rka#1p7mPQ zX}OYn{!u_yKc{UZy{g{=YO(iBv!P12#J}3J8v_8^@P%lzLW`-Q z&vv(?)mbl{P$(s_77c*~P4JQeYI-;O*-bZw-aZ)ayeybEclHi8WfkD3(q^ERRv|pr zdg#8Z+Ahjw7AmfYiOu;zxNO>tnS~*B{->rvvVDb3#{35rO+z`Cg0eI8P^7_4daphF zD8;Y5uBqPE{N1}tz^SO;aa23}Dq5jn634}ySpStjP*6*`K_o5aN!cF)Blx*g-#zhz zS61JCuN=T&JjcSJqEmo5=H4QqTTc|on&wYs=Q@#KkEURPGF?yb=SLK za;sPc&r)iyKmIx-sG{S3+vCsb4SpHl9|RAu{B`xumcy(c0d^N|AH~ScEr#TyoS5*gRdv1K7VXeVbntX@%7thDy6=nQi9mC7KQ>QY&B z{z^vVM@xx`n(hxJ1wk2+{~8#&6cX)D`u$`*#Ql#IC+t)vqpt10^+09R!|5Cl`f$$? z``>w^LVR|}oV7e*o8_NL-9FMK3`~=4m!INPGY!7#ogU=8DGj9;n$Or~6qBK}@Z@)k z2(vjaVWf{bCigxM4aVgidzpTqCVKL>^FoBEY47~%6^dK8|7t&C;U;SRGX8NG4#W-l zW)25h2H%nQAO59>_22#-{#y@Zf9gST{onPl7V#hTknvAF0RN?j<^SHj{DLs*U5<~N z?1D3QBItpAYM3^Vli$Hxcn;`i+3@L^W_oGcfw7O(zC|FQtD)d`eb zn+2h&K5?(Im*yupnJSlx3Nv11L#KZziMSTW62k(EwsJ83^4{x-Lk7%W9S)T8)o2F}(U%+m^fhYb3=KT{`RrP-WPyAqzoR#rdUF-^`sqz7t>c{!;$t7%J! zonkk!wC=cSyonHcO(1Kw6XB+D6{JaI9%o{k#P<&cj}0H#Z;=u~4^&kZ$A)comguR4 zCf{|!v=r-uav{|B(* ze+K6M2e9)$Jna1cgNKLQB!#gJFCme)F|D79OT9CM-(!_JhamHQ&hju0cT_BeJkP=0 zoKZ_)wRf??Tb5^S0!)HT{4bw*2k8>)y9<>)m!kTLS-|DqBUI-5uKY1~KPMlA%73zp zAk%&rNtper=^sI@X`T1#IxnhyNOm>jx}y%1sk$G36t-XA2H~vh-@M1tdryT% zWu7qYU309EHg!nc8yR`lAV=B~JoBpSXf!-8F7JrusM?~>Y{{&s_ObEAowN^3CKlzj zGyGkp9PyMUwbzFL1(DHBgs#$|Oq~C}qHvu5e-G^BW){y#iC@SlN?{t5h#yhp|F zzXx`!r~jSzxc$m|kiW;}$-gA*;r3_V0|4Otdmb_QpYtB%Kk}Xuv47<~C1U?|-UF(v z3@v9T{FTr|6UL(LLPa{6t~Jrdd{D+;U8X&x;`eD z?8@A?Q4m<~7tE)M6*0|MB@1=saKm1W#6k%XSoO3^yO7RGtfm>}tKx^c(w(QS^oUVG z06qTk>$)KRBq9m6+)&Fz5PSC#cKNI->d$)wat@}dUvH#c4es2m< zPl&VZ{a-Kszd4x#HzqO*cu8mm(T^<|R3m2QlT^=;jjYjDW>M;zB^>gs>SL8R>&b5R z8%I!lu43iK&<6}a!8UvgEa(U*=Kzz5l2ItPzJHDgfe&kf$lA@K&E)xp1BQW(lr|K@ zKqmrf*8$a_Rb|8kH;`2kuBog^nPt`}z;fqoul1^I0oMb(VM`Izm=eEmNaJCdKA%wyt^{V zSJ0cGZ^D8pp>J27YT?sKX96D7bPsSUZ=mq*_kfbQTo?euIrSXuVP<=x->T-U&*?|_ z^I(?Oc6=&F3|Nu7?xa=F^i9u%@W_#-;Sk#vvRQNPf%Jgt{*z=9E!+(BtLolHeaK2<*eh`)J}Q&xPwkiBD$z&q4i=}&N%h3gUDFY(XW6L zM0&i|aY58^vDN_uID+L__&^5a83x1|w}06=5zZ~ci?=oQ=14Nw9}g-~5r*G>7sQ^H z%tjpc0Fgz4u};--alPoHZ)m?$ZP@-}+9c;7jCiH1_{nYuP{&aWngS8k4mcLk7>iQMqoKo&_*QR~ANBB}U--oh6^wb7;|u z&J6n}rjn_llBTAy#ZdLWwA_)9kdBB*=x9!c8uVjHzM;39e%g+++I`5l zp80J(NZ4I?;`aC26teit6vW_r`RYb|W*vwQL|aZfTpLSUv;tTmSdm&`Rl!&hHPxu0 zQ#Msv=RV0!(#Du6yMA=hR??Ybz}XH0=N^AVXiez=Mqw0Cx5iuM<4s*%JzpZge4ypfNF2c_?-aMR!=MUTaC^3D|P)HGJUG)p;fM@ zQ+n`pRe^S67JfV+N=>W3yKRlcU|a|2mf zr`m7Kgh#B_v__nOz=Sf7$jH`Z3fMahTDF~1Af^fW>@w%Ck#8LOkj4*m=m9)%JH3B4 zBq*+|knt4Ky)KBtM9s=`*eL~$k)7%GeCZY_oa_J^)tRKqM)*gY-9~wmoRK5xmzkJ; z=Juqsx;$jn@`a%Y7n7@H&ZI=i+W>9UrR#!wr6J9g)c-{BCTh`QDC>Iz{Fn^V6k-aF z!l_FY8o$ha*+kRp5bo&zP3D^IFO#vmce zY|?c_xu+@*F3|;34}{c;+_g%OdPy9}H`Nq%sIcb!_r&x+hs?!Jk}`(vT&llkS^swX zK`)zz@|2YD!+$&bS7%YTi%HhL&g8HD|L0cTp*rlc3XPYcDW>w+%-+<+)!EF*?w93Y zZ2kB#H}`Xn=f5lwk;m*(R<^EY&d=GUY>iyaB+N`4OwAs%%bVF-xLQ8v72tR*CieKx zk9%h5CCrA+ay$vzM-hT;*^~O>+&BV1+RDX*Q(Mkp^vw)R{S@dq)L-2#yP&tt3A!&P zg{I`4aqGPiP||6-0>gt;X9gfV(KgKsaOjJ~s!hAJaM`349$TeOw4*3{H(R(;^i@)2 z?}an-=~c}fs&DG5L2N+DueGgkqPp(^kb^pVj$qlY#S}%GB z!RXzF-9BO?RvFRlG)l!a*=bf9u#tMV_~`4v=U20Y*{+}Z1IRH;AM`<=&j;k*aifc` zr1ai=S*-q5?BmN`thDzU2PF?&#{gd+=QEv8@T!h9%y5a?;l$swI#*Nv$TIoWCV0l} zotDjRO#SJBG3~atXLThl7e3Ja?qLMJe29gu0%5uF)*H6Zl%xNV>Nka#1b)LfL-F|BA z1?~!cfHYI3;6YF1oe|mRv-8lN>x45& z?^b-FA5W6FFQ(4SwB-Xnn!rpaN|l$8lzkLh@4ZLD`dpOo*{o=5m5sh_E8Vo^%$k+r zGrVDEo%fRM?Y1tItpA%DdH$is|0_Js=bRiIyuAEe|5=`#+?)dZ|E|!T7EB*P$(eJ5 z$$4&30AhI1)I2WL)Hycr)#}Snk658mAMe~X4x+()L798^<@38iAt9tsa-~dTzl1#M ztHHmE8G^yG-Mm%$jV*k`>l+;7dD+HGQ?DB(H-)?9i=|h4SF`B#3hafV%e1V$qAahd zt%pW|F;syc^KCGa(02u&lrQFdo8+)HRfNwKkz@uSA8S@oi!RQD=_s+JU~hXrRiVoE zJPu5yz}Tk@jA?wBGwnpMK75KdDeq14VxKJV+<|^1!`WpjO;qdAh0^nURi#wNZF$1z zyN}Gi`ktC9?-JCO}$$VT@W#X4+0H( zZLzWhXD95vRM?0lx3wdEMc8+f`44@_V(m9HP_4a7{I4ZNH-X zQ&_ALHE+xrYlH{xq~aW554>r5?xIZHN6jF9#5?fr!SiF~7kzit?$(YTeIENVS?V7Jdx>$>D8y5fXat3lGWt*Z&9!HBQFDXf**d~iGC=l zm~&@?5mXq^`gAD5C&XT5b!dY)W_*+-hWlqlEZ$Ff9*kAiu#7K=&#grB#K31mQpc}{ z-+%%#!ihh&;;b(G6miAqn^mUjyRdxP_n=tJnUYn)<8$l1`3E()tKR>IwYTi5tOvS9 z9~>HYcW>O?*|@uV$dEN-~q0 z(;8h5vcV|HtH@83Sqo%ntqU>)LT@619T)y{rPo6NlK>$>?C!=O;xC3wga(LO$TlJ_ zsVymnnRl`)3DlnkQCSp0fa)0uGQ!!@QT^k$hZhO$=sUB7WVlU#d2X>63HR4DPL@!8c6s~KT)}OJJ=sq zh?FlZPZQ*J{7Cj#j4Mha8uY6(A~41X(nlq!M}j5PpX8kl{QX797Y2lQ%#|3V0*X0S z0b$=^@FRhL+|ecmN!Ew@!w^Tkp?6h{F3+eYM$QnDp%$B?^P+SifIaSTMn#HyLIgv$ zqB_Gqibji%4HKOT_Q?{0{n5LkK48I2cfzARMW~|Pal)~05M80dUxKt-0MY@l-!W$5 z$ZYwa1E*t-#H(T!(ZGUH)Y+)ft6Aw|tkHzo3^Eb1aJJW;BwF+?ybO_ptozOP8yNhD?`%+} zlws^E`4i-v``Yk1NYtg+dQ1QniRyBA0&DW<)V@dPhHWMEothtx(Iz3>p%lD@7fR>` zGY^oy1Fn$3WfkaOCqE?U#My!J^x_ae20C#zAOpQP0uWUNnpb<36048}m`&HeIOA9d z4^^-!jXrusR0_W=_KFUG7xN3Dhz)HCRi;)~(E#5;ab zY#?7yVwvIt9k6zVtsm8)Tk}nWis79_21ZoEkm2Lt)xwBpjO5V^jHMKc;GOHxTU5iK zW0mv3AX^bFp?Yt@r8rt!8}b`f+E5)uCrpeP{r@ z$PUbaCjp=kegE=|u()b4ae6)6PM${M-&7Gf)ueXq}<1 zVN$%DUtEDgp`j|P+68^#8-1!7CJqVkfYwVYdO-xTVPS7rjf$yuA=G9U`68}yMxPQ} zUlmjoT#3ifSJk5t=!>a_8squl0+9Cu&c8(y3_qh+Xi`}SpLr;#Ag?D`PAH1#CiEf(Ah*|n=uZi(ok}ajj?&z|212D()1C5L zlR{^iw2`d+!{T~M9e2axBGL}0JC(BD6|NqAzKUFuR2_J%_ElZ@Hxpk{!6U9Op(=uM zv5CcXXTHcD{UU2kT2|pD{^}R)i<&BKgT+;&JzY>?9Qt4vP4H4Wte_h7tyWT1f^;#q zq+(j!PXG|crmn7xUYKCp`?=Wb5jDfYHLWIj{F)`AK1gLPQvB`9=_T1prbfe+-9lt&Oq%V-a@tS#|qj*ZC*Zm4;Cx-$E^UIryp$MtZWRIfwz+R)q zLihid>hWdIQ$3^M13kt~qrJbaCD2jC_Eieeo8hftMB|BB>rnupgs-J4sGY*L=R|`x zSEOcpdE0N`0Z=a2Wj!jKJ0p%pQnNo%oal?J$vh{&sd3KmG&&Yo7koN86k6}_TUFB& zv^K9=j+60P#wS2}P-UekK`a)w$&mRjo0q=g zc}aBS7g1l_VqG{D1|$_xucN2}Swvs0qSMcVQi|RwfmbTPg6Z~0Iz4cgGM(P>ReK5+ z)A66nuh>U=paSbYZ59HtS#d^P&fFrH*9smL;0*4)QZ!Dtu}EqW45_wAbWylp9jdy! z$+FiC7BNUe{;J@3m=b7D2Y?GTS*@pUUxnZFqXoc?Y`zKtq?-doXZ!H%MX`wQhQMQ3 z#P&KU?Zzk{YH)uYo@t^{!1)KPTj`@VT7Fp3&(pq3?Y0hjl4_Y?IZ+N!#Lg{i^@RTM_iT_fkjy~1!3YVrJ*SFp{O;|)bTKUc1XD@SyP z@9~zMHayb&4{Fog7_>FHH67~&wPEmO(kiR87e}kIsyeFEHH8fBUr&Lj_>0ENzwJu0 zlDJxy7nTK$Ztef&+X+|mv7sy1Wby{=?PInm2nycZuf5tC=caO0TC0tf?384tTxKq? zpH#|jD@|o~dV@3R(ZD!bN=rk3oy%!6~@=sA=0>c^&Rbw z@|z#+M`uPg0veA;?L22&m45Y?DeWm9Ryce(aXOq`TPjyIqNkd+wB%fwYu6) zFEn?h9Ev+!RL!40?5;is-dVOk$KNBfK#@v9?v_oqO->%Or(4yL^>v0_r>1|pBkh(p zx-G}DxOxnTXQhzPy{N=(*D3-A-B+dSKYs?)^b`g7Ka1FsqDozazGgi9J+WGiJcK(h zeh69>CV_eNzJ$BjU#aT(P5VSSxFev!1YvwHvRK?TEN)x71EB zys0H^>Yn#4x&H&^TX=b0+HMw}=Wp_0_pj3bSL=QBH#gEtxY6x>YTavUlh5u5n499I zb>2xLyy-a%%n1T#(w^n#e1iTdAHE$9ZErkf=Uha#^fbShUi7R7n)tmwtgc%*t~WcJ zGBc>yxa_wfPYVvtMtQry7cDJ9OQcQ5t`+Ksb$iWl0&1tXRqc~UgHX`hO{%<7D+y2blOQabz zni!YOjj~4PaNhXWr1)ZXwD{^v`n*`5H22e5>~`WGTz0#H>W8S*KqF_ne zAHG69%K=0}BOR6+fzHc34<3;Q*Nf*!LapttmxxGTo?P$uozM|d!G~T6RHUGSM<}7I z&%?mQs_`^UhSxgIO|Q%Do_cTB=eq;82~~;K!s1<0MP~xxd@lcmYomc%mn!?Y74;zm|>ap7QIu{TLyyZjEi#Py2WC`w1NC4=?LyM@pHEu2Wz> zk1x3pd_Jp{oIp3%qhl+l{D95#q!yG;&2}y)t)Rkaf3$$C{*RUIAD;_N@UFs55JMj0 zF`r?sAaVx~CLnO3jS(@41DAB9$+djO3>#$X8#gf9bz!%n+*maL0&phzR5Q+wo!v){LImmTjE$~K+U=PJ~;f^mU z`E>Y>qgTP^G5sCU@f%=fXvDd`yijDi5FY2xL(sY4=h5dv9C{Z&k85!|KjdN(r`h@M znF_F7BnrO2;x%sQ%VUS$>H1OC+*X%dv>y&O4(RB9^xxQJURvfXlMoXZHD6-t@gw!1 zpU@?5#yq-Ri!PI83fpkOvJF>}9`!YmlV+6I*I-H+MOV zu22+2jED&Bf{?F9%=bo^)d=89r1rU_no9*B_jx)pwdtDvupVP~V%hf%NP0c|%0!n=Sal6t@C#|*0zcRxhZ%JVgI|{6M}QE(qK7K4u92F|~$D*z%$q@9`ojF2S*q!Aa3#jsYO2g#&MTclEBlT+cc%XksPieO$ zK~on31OJ7{-@XmACvJ3KxEHwYN`JPh@wHPMP;$8Zh>^5d_6o{Cm!9 znv+%-^%cc^nn2Bn&H1Nv+bd38(2yprVP47~K@0C?%kvO(0#_y9iuj0FBqV&XS`*vy z3K9Su>+<5Qv-O?#K}~(TV0}Nhpts;OB0>z}vmoL$0>O{+o(rOfZ|2XuiS=*3KWp`| z{z&VOOpib$J#T#%+{o|G*A-8@UfUcnIYMgz3{4PEDtKz&#a!( z?^NK?J)n#KzkmY*cChiv-O$5^34+c$HDB}xwwM08s|nV|{^}l%q6@IY;hn)771wZ2 zP*8X7N671U2N%ol##HIjq%dg4&aK<mqr4IGwMm|DLoSZ;<7@w?5Jac>Opf64 zN4mhTWU3furL1uMG|gdrTS?MUVXl%Yt|Se~0O@EoYOG9ar2)0dok^+#i5J$-v%h6L z?Vq2^yHYKvP#GoC$m+*w8)`R=ls~<};_ZHwtlQAzv0V z^k#ksO!sCI7KVzhMo16ZJXhlUgmi!qZ|}<(NsLobxGcrv`GWsHw+A{O)fkz>Y9NO! zyRcquqTOa-_8Nlzdmh3@f3y0O60onpjd!&cZ!-i`ltv4*>4$9#b@$Tm{D+(9t-b`t_JbcRhpZ0&3 zz4~kb@4yPAUi2KMIa^iTNF71H`G~~b^50x03B7{XQPpssf=Cb_RdHN!TRHZ7Vur3h zIMXM~8HGH9e}o3|BR2;Ae*IRbVE$4n*m^TA2qY+s6hQN(dWP&_Cj*+U!DQinOgG%{ zif0?WKCX1WkK5OF3a%%2PuGidrqZ4T3NlFt{a$)xQ5Nu`_meWt43MsyY^>Bi{CW0O z)0h96zwZT;dbHic9yD6o3C-6}svVfWT=mHn1i9}0?hqC)+UYx>=)>_`ezTlFf0b&y z({)OE=!BLaLKGORd}x?AJsw1240^Xy3cSC4er+Y4UOxKZ+V=PT@iBWh&zIp#PwW>Y z2zG34}fwPI6RY#H5vfc=;5(K%zRdv-c>Jy~&BTKF@y=CFHgVDieJO zuTQ^ud#=%UoU;6pR`fX~I>>}${?qfz)fwjiMklb6^k5MJo-{A;$A|v|m?-xlV5{?_ z{B}udTtJ^?+AlGqr{|*_s&w_U{@ML9h&2D|)g|Zm+x#=Qx96~0H^cR??aHk=-E~SK zib#^klQMoinwR{2q)<45R}l{IxQ1%ZE5@eS{gZ1K@_|w$*6pxo_0H6Np7C-TE|0(?{ zAlE0y#@kw2W?|u^!Bc%^(>ZwZuW_DFsYw3w{Qo3^|0f^(-)){)eh~iu_iQj;l=lC2 zh951h>i_;viu=F&OaEVeK8Xy_?RbQti`yay&GWxrX_n17y^$bO1POH0Z;Gw;*fSrK zi(r08Wz^v#RqOGRFu*xm#qgufL_lVgBZoszYa zosvyWi82V_aPtG{V=&Q2r4Jg4KgR2~shd`x?z>%DnsW44<+(QEX%OycV^DKoc#Hke zs!Uv}S&T+?;iJ8Ei@rsuxVmi3Y|3r4BqEv_T0T`oy;8Xv@o~Og-H=d(r#%4lDYZ4TUuBvb5?9 z?g~)mJ9{C_Cz9|b88?u5$irvWMx-Y$4%;aTnC&+2$Q8Bs`NZpV@F%9~>8MzASZD5k zi$u9xb-SMF?=Sq;5A1`1k%+*;Lb}vpZT)kcWf%Re(9c_gpiS9d^*(-%)|XS0-Hl&p z`phGTtZI?1NU8@{{(?LX79r$`GhGE9AqmRC(@RBE@I0BQkZ1u{vk>1Jd+n!ZfrN}( zmOF17A834R5~!n!09;9f%C+@K2lW~|qUxL3Q=le#*82{5HR47yOic+_@q02G-cLQ; z_G<<1bMq>SLC4fru(21JCmT^l=Opb$+!){runDSb9Pm>M0 zYDVBk04(I=gU@pyI!=UZvw39jH$!1%olps&bLCoaAJc*4LzYNIPwpVjIWqJ|8$=s# zO7_d4fKtcti+`dqI}aLs%(S4G$N0 zp~foLHzw#9>pR;mhHaSkUduu%cDu-z1SR9rN+^!O| zDJu*YcM*<21A5a6v1N=o3v-e`dCXGDTH&6VcUtN!WkvFaESbVzu`~d7sM)C39UbiB z7G^{CeJ6hA<6d>iTOulY=}k%H7elF->XBdcSG{#O<2RY{DMSicr*9#892^~3c1+|| zP3dT%YN=Vu?ibPD+AFK%C!YD9(~|{+JIJaUa@a1LX zIlo}ieyN4*)%@vc_j&O2$bOxyXALp|D_Xy^-e z(>4#CaCmntJw0#(Y&>&yN(i?~36mwHXp`a-ffk_3_;}AEbt3IRxXYqsq6kS*d+Vn} zLs!2OkuMxWNgIbmH7abDZOsAI5bo-Y^8K)QmtA@iT9^o!CK9X_)uT^!Az$)gTPBIg z9WaVZrc0Vj$Xdb7L=E4hwoJHm&_{HC!ETac9_{mnX40uZE)pL?<4%j6V_*v*n%MYg z*hpHX?PLE4ZcbfPfLzo!G7?tR6Fx?DKL~5JfT&G;(ttN1gIL$J`}=G!(y5Q<7I+H- zJl(r8vbXJ@(ApWwQLUr=;NfZz_16x-J?@442n?uJy6V)6tWLzXab{8@hoF+85p+pF zude9?SizM7@y*Tm?;^Td<;GJPwaRC)>{{@0Xgc~#c=%ujD;K{C1ryC^2jw)JtKk=P z+8IhzFF6xXkYBRWuQ=qE}EGFO}zJuBSymAcg@%zA_;A#{@5a+M?Ul% zETi&yj%2-xH#CUcx(a@jgkegn$+Jm{!uKI)I*_LWjgel4M`~ zL8RST(}=8ktx)Yj6Kj^I$26j?DN^u$aG-Pnt@ClTIc-c`&iIW5XIwp`vN~jR|H5h_ zL>g)+LJmJ{iy3B;98>aLq&IG$y5H+Mg7<&4_ha9#(v33`!g;Lj_bm4eK1y%#_vX&8 zk4TqO_aWc@=Frw7#1EVE#;=TMUEeL98Z%H1Mm<~sEBidoF=|8NpIp0yan1lwgRA5Q zim7+WV-|D6zszEVB6I?5Myp!PyWYRBraTfi%@_O^z>9>hn6i6W3vV``ASMw4PiX8n zk&FpVH;z67J>FTF&FIKhY+Bd;u{CjVV}jLNW>@BxNl2KV--o9mYeDnG1q=XMpXlvi zE{<4&TUqKAdRVNVg^+)lx&Ip|CA5;=7Sd%_k(5!9c@C-jaeHoQtwI>COKq?eU#(Rlk)V8F*K5LpR6=eUxPjo z@yD88wV{DRzFQZ%XPTO(w6u&5eA|0Q>pB?X5Y<{fKwqZD7xT&<*pb1)(|QhW@Q~(; zw^~ys?993@fE(D4d3Bj5Me^ETFDKP$adwafD`qcGIbo1I!;VZi`QsQdDQ6J6|KMp; z-udC}G$PmLuY#Y~H!@*otJgAZj|;oVU6SQGl_NA-Pi0<3~p%8c8qb=K`BGtyk%tA_O2+x`{^qWv0Pgy=t#hd ziE0wWa#|u=fw)G?B>!u~fT+-iraqz@R`~Pt^fs!$mjfd%Btk4PSXs?QkP#{V+n5%H;svP|V22OsnF?(dbEpG+I#{l18civSO+?>2iC7|GY*R(pNI; z4(Rgcl7kAz#uC~U32bEQ%5;2B~Css>62Qf}leCJ;t{jj((;<72J_ab++H%1fk(vU*tEC04_a>q@dQ}Qp; zTJK@-GLP9d`b7Qpaq*}Isj^!zSd0d&i)&RY)lwF3;ktec@r&?H%2KC&@*mw7GiuZZ zqdaQ)X?kwS!*)((lic~DA4xfy{cfLO4eNk?e^Q!P2O9uP`Szpq+HH~eyNd}XX{BV< zS}RV;Ishw$7-|bZgzMR@?F=Hhz!*u z<#jk#! zUxki=S)JtWiSxSVZemw>m8(;U|0A=)A_+|{eawJ_X$db7#sbqM`mMH3QnAgLAY+VM z1>rah^o)}=PE(%PM_0kp9#>1ohPzk3UC!S&N_7k>yUx1|)RDx417Cx1l~4>IEv~UHZP-3}ldG*cDRQ*dgW= z-6~4$o=whZJwt@KGWEFk`lqXA0JsI1$f$SSXwR*~94%?0 zqItAoJEcp=Y45G4#&nNnc-WwYh^rP-v*m8DkXIjt-#(2I+ucSl$MaRYbsDqL^sTFo zZI2_IEk_D0MNVX-piQ=at81=OrrFt18O5&&H z(j||n9z@wM_kT-R4S#aZ0WBjAVL2&VLbR+UEhs3KSP;_LBj{~?I z^41C0QD3?fkxK7L%K56;bOoCbF)iP^IYwz6&dwF_a-?J#1zKu1sMRp?%QOC&!~S;s zlP^tMeC{O02gs`l>*l^yQ9)btJ!HiKy_H=od<@6h{6a}u_^;B6+_&Zbe%q19PqCLS zYY01!eZV^OC={+vAi8UH_xy88aTO=f@ZZa<&q+_l3sQ#n#8yoGqTcdAeM$ zK4fUxO(`C5C} zSzejl>g6MlxjGyV!Zp^of_6HVwxJ`ePuVbX@)VS`BduRF>l$;EW(y38WnrMC%pFW| zH~1?cuyq0*uH7<1EdiH_`MBreAiL^juD#ZO!^agAn9!9u5({p>u)v{wjlyk zCe;RNaUy0Z=&pdyhuo0t9&QZ3SC2mh){NPLPMm6@^B_6rVQ)b!bF5%n#nKhbQnLYR z_f(YVt;Y9a;X)!gl|n7IB!wejZgB@REbJeP!aX9WOtj;TaW=ChK*%r={Z30EzzVr8 zH&i8TN9v1g5lcF4vKl=R;?9z`|oxXKHmv{RJRt9Ns#$EEHYbEYYLdGZf{%TbJ`w|8V^H7jyrWOOifqoqUW@f zXwSD+g7xzsPQ0+JMn_O_P(QHN$zj_LScaDSs?JqbsrKoUjZzAtc(VQ>Ja}_e>N{I1VAN6+%q3w%O;veom8(=n|7#&2e>9gw@^!<1Bcncv6F+@W*HG++c8w0cuAHh_kw0J03*;vW^ zD;Ui+@?xGak{7Ru|E%+;aTCRhbxA>C?APQ@u6-f#@cXcY)E1rCg9VkRg+>laE|dmR z1xGi!S8*#IYjH((J%KWftBmU+*J9ysIhQ>4MOB4Q^d998`cm}!M-_tmuy{CuUtAJo z3e;n%;pIzWu@YmIN;kES8?Bye_Kr_p#@N{P40L(f*g@9(^ogZVN>m??e&Hs4QNHv9huYo@ptTb!%RU4swXGqb>al7CyJH+N} z0IH=&WR_yuipfBXkxWI4Tsqk19b=!bmP3dj8 zzffdb#j=*3wtr%=k$}}(IFixW`j}ubHqTAYO>*kX%4X5Voy(w5Q@`51 zH@D1{RWhk-AI z3=(tfyAFAQObcfDr6pUkxql6V_|1Fkf%6hoEF*!)8tOHyFg#Us`5sU7MkKS*ddpW{ zJD{?)e(D61-=V04AiaX}i&TR*sv%mSBYb!w#Uk$&i#}gwAor84vvX3E!0h=pEg#ArwD zmdBW~+iE;p*7>V8E~ZmNkm}R6H!lJmh)DvC`T_q4?JR3Eoy|jD#8%z21x@trZvHd1 z4p&lf+E`<2*f;9#tl3{#D!so5Ty~4u9u5@dE2f7NpPB_~O#;9f`8oQG3a^Ws z#bXM}wQrf;dhfgqWTbL^m9;xVSSd1cYU>vWAzIZ(c|(|{JomO~Y6{UX!X)s?2u1i9 zcjJb(9(s_OL=(3%JD!5F!9TgEhw5nN!^7XfD~u;>!NhgL*m;LcmJc%80$VH!%Ob`SS3-=jJ36} zE>gB!>PFPU%#d75whvvh`aCa21DQ)73ay%4FK4o_X`~`(ZsAmsVY++s`jjDmv~4xu zdX@GOVV9;!>0$apo4-1F{f>KyaTDlh*!9BgqxgjUd;-s}Pa8xf@*{YIL$}V8}?pe{vzhcZE9e67d?+L~4iZP{J*|J=xTs-XE7$arWY-JU1U&DbQPNnHmQ>gs(GB!W^8x?^&C)A;l>_wadgj5cT2F3uPox0oo$6QIGti8hr8FI~Zy~+k6xirn+GEyb{{1j|C z$=c#^y!9G-B3JlvUwgrE3+dL-bze_PW}W7`8rOh(cia}A`IokfzKFtQM^a81CTlrb z!q(0b+d^~0k;o@5|MqF=AbuXD)?J>naRKhCJb`6p#tL3FLk`qVAXMkwh)R;T3PH1s zUiG5sj>mU6@1ZQMTxmc90yYRmPc;L?x^B*z>2HS%<>ImlX_46U>|bf*gmJ=>53R2V zVf?f479#l>M&=MV5$Vu`Y&H8^8bg#?WhKd0M&i#{{@SHP`@s;GpDw8`DXOf5QC{Ko zNm>m)0b&+|QA8zs7R?jGgx=Iitb{ovAk|ZX*KldxXj*C^F%4xYET5ke5s9Vh?(G(* zDIJ#A%5z()--Oxkl*HJ5*iU1kM8eg6LkBUOBp-*Oh5tNA4&1YJy#O0hR{0?ZI!+D) zFTJff0=1R)-gfu@?e^{dTj}yc~`^*uZY^1$h7W zh=g-Z;3#@&RiE=3&bq&PAI-x#aV3V-MLHxVloWO4^KD2x@F058)}y@@+D@uW_5ieB zGlpN8N#g`bksIzDZV@f7sN_leT$uHXpe!CwgMnQ89O{pArW86Nq46L^i zVWdjUSZ*qa+EMu?Mrz9`6f$=zg$7Og2!PP~c$v7Iou!~<$|#ZNgq*2X=&76rS=pyC zc7RZJny1c=L41iQriw^>!m}2l=U`hlUW0+GRG%_&n0wM)QoylEMCd*|9BuJ?P2$j9 zy@mxRkVh+e8fo~2W1d6yKb{E7lKspRxVeP#d?nmDf$}lyJu4Yf$7qC1uV zb_LqOj`7&Klj8B4SvgU*R0X`EA;${-TkP%Xr68jDoS?!A*)i zTiF}YhW@iYP zwjxRKc-{*H)wvHJc3*bZiYvX5v<>vo0?UeJ@dCSH9#an6F`eWYW;h14Z~sEEa{~#tK0Z@XwTY+k|Oa0?Z9hu1pD> zLMPj`dtdVq+H}e!P1-DP;aQ7C>sYzEAM7K?wOYtyP3Pp*i?~)4#C8-(lNMl~0IJC4 z2ygU=(&aie*rIh=?%{9+M|)RPw|ZAnSLu!Kh)!PXnn;ES!%_-e(hJY3U0r)Gq?}I@pEcmJpqRcO(|L&5 zQ8<|;gjFlDopA*!ja*4D30wlYEV&>>U--HKHv6Z*Joqc z`JjEoQP+^jC~7mC+tBa5UABel8u9uI%yom&lWE;_nek@fY_rCP7e6OCD~x?L@-~jYD9>+aYECK z13T$pOB{P zw%$)n3^r3Q0T~PWiEzL`W^Aqij`fO?+(Z16l-Wc(X8B*o<_JZ&RFG zb%*UL{3oMnPAnp;)iBz|?sTaXN+Y}1p~|CXN^yz=AOP@mye;2b27NA@c=xw2>{6GF zZBZBR$AP7btUu0)slGp}yiY_)3v^?{omQ@qbhi_HCc!<^3)IWJuNY|)bXW3bdq7|J zi|Gr#uaPo%W%9$5Giu-x7S;K*<4jSgHpwEZZrv(&qA*< zQAMu&CliSJXO7^@?}Sb}$?b2W>LgNLQ^T3cQfIg_E-}Xg3sZ$8)veBI6LYfsT=e$7 zWk%<-V*9-MQZ7)q5bJzY;T~ghvJg`8cFy++4u^aG}*J#h! zWjLI0bKO2KHz!xxat)DTZUOuL4_CuRJ)>XR$VPq>3kj_Yxap?FZ;K7M{qj;1`I{rV z&0(_xem!@i7jp$;@>l&weV@1%W5z-Lmr|xLFQvsbD~1npi}THa{(z;M;9QIR< z@+5cl1ti&5tZHQRlaqNMGd(@Sq@_c4{32O!s};I&^~C)rtt%%#ia@*oG}P5Ey^y&O zWwHyBV(MdOJj`>d20IA^gtf0*4m^pyArEqfBMuafsh_}U-uY2tZZmUFt#n!@Axa)T zz-ZGE%@Me*P3`j9z)0qAIaT>j#nRvEZ}gpPLOj&eJh{tRf&oGUf*gV|f;*%_B(+NN z#?5!t%=zE}*R)vnSF?y%az7F4GyGSte% zkNu4TjjUkvC5|MEwxWfrXdmvo1`B9qPgpDSV(hDmvzXj*r=v)5s`N%A%*>}r zO>L$eV^kl`$c(=F4OsM>P})+x+VeU3Deu)8xdEWmvW9^;S|(mjn`uEv?=R=e>?3Z$ z419ia6!J~=jA6@cNKWqct$L8zWS?tLQ%jEG6FpW|da$IXhk)bPKMSv_(s2!wW5iLP z&I=d%=0~Qm)xYNhj^;d{3rFKNXO5VjqODGRvoePo=e8Q4$!B3(N70pavHL|uIW%{i zIF@IAgtPj%PU%Uq`p+}IQ><~ksjq3E)K!*S8m;XQiPgFxvmZB(WXkf<0g`3Cv5$rD ze6_gInEsW+9mzGxL)E{|7JVM|*r=(XESYAvn>VXUi*Efk1Fm61kUz>IfnZvb@8+k6Z{#DL|@r6bfw+e@Nu&ESbp{evH`c>V4tW|iiG*4;FN;7JQwoU!*2LH-G77q8vM1ntM z5W{lm;ck?ban2k(pg=OCC?10go@(LqqGe_t#(9CkIXQ{pVq+KB6sw-OA9X z-JyGFk~TIL9q#jPP0EnIyp}qjTsvEX)*|7YwJWa9^oh~rX@8eX&)xRObS<7S7NCfF zv%{re*h1n(AQMTXKiyAP6^QR*+J)6OxXHxqzQ^q=I_0xx9;G%5r$47)Ow5HLof1*4hezBZgwazuP} zF)q|8h)(&&2$lT#KE$0*|6_CB)y|RBpxNbh<7B=C`6g`IweH%kD)yRS%EObgxuu?1 zr0^ypyX!lt5%qLnVusbN{=up@KpMsf;-b!olqrbSX8Xy)ra0ACG41`w8~J1MaZmgyB16dEkeS*+0SoUFn%^~>H~5z9yH_Q4q06}pl&c8WXId?W_{-)wdILSzy(39C%C9%IQz zhe!f`*#o(vgzh{3+=`4P+(AI;xWd8lbxk)U>%O zz0tH0n0qJ>$fQ9+w1+>3zvh69guH_3MuMkfLX(l`9FTrv(7wnzvGu%(G+Y79iQ-BI zWsD8RIESwcYTqRKgFD9y)oA7;_^OCic-s&gLd(+uj_``&qV%i5{ z5W$_y#p4sjKBPW*K@F{g7`a4o!izly0ZMkab>;O+L%+>1+xGiwnuy_+Bm8z3$~=~p zZ3w<3S&dd)60h6>F};jW7Ue@j>yA8gtMi#_1dQc-gOF&avqyr$z1%EE=Y)BAbbsF- z&#AgrcN#W%jF*V<{F^ZP>$KYa1I-H=?6-F`zG3Axl!4r9MRm1U*P{^xI_-e=L z>6ag?k-^d}x`?}1us8o_;-Y)pz6s+Bcvc0H1V>2O`O`1pX?Aq%L#Ab=;Eq(kzP3r?JMTCkox?H6wZO(A9di_qNUao?WJmEQcDcV+ZF&GP$|hqoW5Qw3tF z-+aN;^>cs)7ftFp%l*symYUJXS;gzD*x+550&G6{$e(et!E0E0Y8LCny_67G594l@ zXCvDRX-BoWKL&z={|iw-uD`cBm&?uNFTAbR$YaEtd9DTO9Od=t+@R7XrqC9Qj;9a% z$%74&;(^HTDl)p}=dAQmE!|#B{8=V)yUeeWC;iI&9Cbd$(Z`edoi7){`ac<7v}}bC ztQcM%O$U`nCY^5sT<~KwH;lfiV zrE^MZ(Q31*_C1iCjo+H=eX{yRK25lfeDJiK z-WYx!3k#d1q07ch_VTCYy*SA2lh0~2u6c9SkGP)Oyf}PNUibEr!GqVl^7_7B170}_ zc~|A+F{K0WGC;wklGs3(q-4A!2xd3mBT!LPhTn_-TzKL=F@RGN@Z79lO3(58c() z$Ss*XK{uK3KWfCtC>e(vtBrz*HyY`*KAGn=e`&zTfM*&`8#qJsNr2LN!6fPPYFfeO zUwC0RCsUcfQ0j>9l@0WL$y3Go)Gkitl~|(BUx;ON76|#Buf1J%mS5fT!rMjU{UX6; zAtk92`HF0bL4KN?SaZwZ;^Pa~bng@)CyG#HJVq2qLJ`+(AQr{qr! z^6lmYP4dF@KDc)2bW8XUZ^7GMc%WAjPQp!DchAA2g0u}p zp2!3gN-0ASQZOcz5)i~C9D50T6BsvKNs}(gjHYO5wgikp@rZZxq;PVH7 zKadV|2KoYP16u-oAYkH!_%*qKpNRuQ9OzKIJwqYd?d?w5dvucCqv$UfoFIpsVpSsV z6rCabhslcnz*(Qu7&DNdc&4E1*8*Y}qTuxBwb}v0DZ`in%`*T4Lw!uLx8h_T9s`u| zLs>eTn<6e`sR@-4_a&5VJ#`PcGE+wQs5E&kA&5w)IZN6X_&?Ia$o+Gs&K@yi??Ajl zRYdkE3b}>B#fXcjhB!+i4}vIbB)GNd<9LEwOTey+(vt^gcR3b-6(Dn=W=xuBUtV&0=JZ1SgiW2j4t)p5wqvwDX4D08>e0$+2m*YJq120M>#n;3_~O z00!U((1HMvapXM3k!uQ*JV^6kEf08^J~;*KqG?4-{S?kwp2}ope@%1GW*cBQ1(~qO zZD9zzx7`FG1g-_)Vn@hCS{uepB!~OXnn3qd}#LSp>b3 ze5wMXLIE6t6FbtD(Sl#_`RN0hV1~<6ma%ALu%(@T(3?q6-CYPcLBN@D4m)o;S#0lu zFW?*W4f%$B9C?_*4{rK6gAdGO`WPrM*sg)!(rGztdBMUOEb}aVmbJL1zG`_7*VRgc z&?l@Fwg|5ZSB3Y4NkOR*L>zqk^dO)I2EAW@RsWv;V?Ad?deQF6JAJqi*Xsof<8$(1 z7!1<^A1VAh#6ZF0(e(v^A?OdLgIj`of*%Jbg9$+nP9yJ+W- zc>FBBdg)TbQm)VCN3su>iFu85!~;s*9?;AZs;!+C*;7otlkAG|gP(tg?<@dI!OFSP z*u=JeX;?bwOMwRPD91l|Ff{ZEdg+{W@tmYSH}T50RokE22twPAJUw&45;CWaOxhK@ z_$;;~()asJ)P#)4Xbe(F>ayrR zyQi=neNcaNKKI&#cKGEXIQY@N`#6{RM0y{pdzLzeFMw9`zO>{0_a_eRBh!HpuHbIs z4Bm^Yw`wL0zVb4Y!0sji7N1W0H9^uNRRJEcET|D`aQZ!x@(5%WrxI*7i`PrRMax88 zG=<-E7L%#UV9=4&D&qI5@HcA3csh}ADdSaDu4(izD?tXOYHAoZ z8V)N-i(jCmuC^BoK^?=GIFrn&HqmSLss+4&Z!k1i{Fb!kV++o{Ere2IQ7Zi`hkXss ztTbaB;D{j@-QoOu9O&mxaTho=4?j!7TyL_H3(2==eYs;$YM+)qsSLVhKRZRk$xSut z1$v{(*dl^|pqVy~Y&rZi;qj4o(xeYIkx5)rW7a~FBx}$_`T(d*7Q=~AFlw_yRAoXo z3Ptk3kO@j1;P26M_`5zT`p-aZPpcGs@ms~;#Jgd`9~J+bZI}KM8Njz5-0fa)Y~zvV z_)7% zx!579olb)hq>X!wSB>u(Cyks@G`aFdqgk-_Sm6aLc-0C>M=4_+w6a#Kz%d%2MH-C` z3TELP4TAQxxzD`EjQr-bxzmiygl!g3A`On8YMuHVH4~K9&C~Vi*6LW@O$K}T7fRHh zbnjGayquksa77eL)JwrENm5La(`%vCPD^RXLh}%ulhE!AW$T9Jip5xA@8Wm9zxWC4 zK7RZ`-~{X_&OHH@C!ziXe6f3C47N_(&cip0myiIj6fYCS4cIhsN5-H0Z^an@Q~ZkJ z`vvBYM1|-%u=H#!CItO{_GQq^=ol|9ime_UeoMODu6R5gc3EsTmr5lNRF_M1#jZsG zB=dqyRE+jVPepkRisG9>E=8OPLEvzxLk#2B_{on489#B1r?C0aoY3ygllavcTpPqc7_`av&W8UA{F4^oMivXN zP*L^{r%>=34KMR)CJBJg7^hgh^%b93K9Vw2J-M!Y&B|S3`Rje_>CNixoyuqMQjMzzAh^RHV3 zW${_ZHx5V#8#=(8y?-o7TTuJZ4H#b>FTV5Ob#Mqoc1zc!g$b0Eo|j&cc0#CKu+RqC zkKP6@Y2*#*-rm_WH{U%C?C5$&@s9NA(pJ!M0Yt$4xy8HE`3~$|9g|40g8xhGS(}(v zTxSf39-GnVF~C^N$JXn4y`{6GL*3rimQ(XgeKV;&a*PKo8}<3jgvQf*+F~KI*JYwU zr)p}Nsfsgf9x&T3U1omCBIlORP;G9g`3efdsOk1a*9lU_Oy(kJ)T-ixDRi zW=1v_2A`#`&?#v2`FLl%v$j2#^Z7iUkluo0n^wW=I9?u@8(2NZ>2-R!YS1;bQzU1I zae@{yV9(Sx)Dq~CzEEHPal>Q-Y!G$Ud;>$c2-B(od3s(Nqqmf?xn)->cSot#0yB-s zSVl>d>1s4=5`b9+vO-TkOCY=zIFkIHeyH7Qk2J>+R~3z+tjQj=b0&L}*$z1w*DG^g zNQ@=jvn=6jmH2MaurV8@s6hvS|Jvh`t~$UYI`uH8hR>LatL?2f{(Ad0X`=TpR{LC* z{*G86zI$NhuHK8kOzgl|$ae4*(JDHT+s(61U~n4j_r3P&rYYX>P^ z!@6jg^5}4>g7c_`7YoT`)XJMFpG;d|fdyOtKEP@KAvV|yraS{O0NM~R1G7GwN*PP@ z(nz5PdnV}hcIxNpA*0XeMg5?DNPj_pO|KZxpVE)%k)EN`Ou4m6;&d6=lw3O1m@l=l zrW*bgmvf0s*C}72)WMKvOF6lL(NZ#*(%4i6kC(>i*oB}HXol#W1g#`MN6gbKBwJ4{ z1U$Lyz*F0srH&u|XDR|}e=MzImlfYkx5DJnVpl^REWEOwJu-ZI&D(0*m1Ucyn+FfV zbpuaryaNo<0qN$7R`y=2C6TjVWZHg|eVt@z7U@6n znSUGCiUQ7-;=m^w+_A9I8ISADUccX=)DgF#XUyQMBbHc1?q5KXw}mZw;Y41I9e-Y}_8VzT@Zy+|J6q7}<2GlUOmSibr*n@N zkg-hKyT$vlmop=;n6A%zNoC^=hYbeo)@(0>4yM2`*!Os}REWmdX`E+7j8QZW8BxY~ z!3f8Uz(@;M(r73hU46O&sQCP0CbQ|vERp78#1WL*l(a{g{;(1osHdRA>hdX-?lHwe z8N;BA?QX)pfD8^V4Uet4thT+eXxk)n=+J}PXw$*sO9#>7OLw+Q#}chz_xuKU5avDt zTK?OgZM}z2rE9ebZo9%>Tk_yjcJuf)$@az->5X$8U9W>B$KhMW$Qv)+Be&Euslz9> zhsn_C-dE1F7>!n^5@*e)m8q5vazLFp`{^ICS_$m;Y=9+F3z>7^YiIBgGtMk=?wZa( z^^6&_s#CSKPJDc4#OlW8wq|m70)>{AHZfk4Zxi*#d|PK{D8vNBKu-W?N`Ziz@HW~+ zUBTe?yI~!2%N*j?vjw9$>%(B>YOCtgAC*{28caGC~F#P$q*AF#?uB zpjoUf9A;l--(wNO2G|TMviqq|m5+8Rh|4&)Y>78E4QX6S z0OSD@fE2PBAuu53x1E!BC^zRx)$MIzrR# zFjBgt57xZ($!ph8lUAvg9;`a36}E30QuBQAqm3Z{oW-G?+hg(7-;vgTDt5F7K>jYf zVfd2;x7D`m3%5%54<6+ABt971{Lvlh@-^v$0qHG%QJ&DC`v)i99az~v6mV@Dc^0e^|4y-)W{Azq3~)!xhZGb2>8iRU-r1gP?;)29jO^m4GuyoIduScEyAkVMJCn z``d+fGHGcGrOALrpQ-Y+CI zF_V?YzUi#++AlvOur5I+)Mx1w#`I8LLWQ)L-gWEbyfsuJE|_TEN(({!kfYcJE13&p z`=ussEHy^WvK9e~u#0?xQhI&G1-no7Ac`r6hgB9B?gW=cT_ZYT^F1Pi5*J zU$|}IpDur5#j`&=uwkn$00K9qcXoBp-`CB3HvWNhLE6dkOBb5>cR(xJC~Y1q?w2-n z%mgc-3#dTf#i4z#9_HA<1T9Q4^|VT5_YrRx!BOpT zQ5$iiCRR~j-yUtDV`5PeB917)gvh8r5U^P71hlIvn9WwJCFiuzPEIC4XT+Hd_LM0K zYiMe!^+lCYVw}!`Udd<#ji?#YusWo`1tfgUkg6onpr1f^%JOeI z!}@F`p2_rh`p!Je+%J;)k`aM`gDF(on$eje>QRDAx> z9PkAW9zs0S@Pb~twPUy1^4#WOrNBx%UDBGwY%m~5ukkC7J=pq^)^ugzPHFj(BhoQYGSz#;8A~H_l*eJkL5(`gmg$`=({1 zGyJT;{v6u`ew8T~qxZDK>k86Q8#JXU%PHZQfm&KRtKxC&`c|G1O@gU0OEcES#%6*r zXd#*p7L^j0shuMQ$dY8#gk2MZe>aYBEUQ%3>6`1Q-6VqXa1~B+M3V1D!%-?EG-F0M zkaALHq@%#N1MZA_&^_cHcJrdU$KCH9bF*&ZpKPu?`6z~TLf-9mc%5PVW-v7So72rm zkD6Os^#%vSnDhp{tSnH2zuAhds-~vXFwX!phC#yx0~(WOFYDx-h$g!-;Hj^qT||+4 zWPtZMKng9UDt1LYTDhrJ`UY%aC3;3n+AbGOGRW_vTno*DvlX0{+)qC2ocg>j_j!Ivap2|PD;7i@ociGLwv)_Lf zctO?7e6a_-H4H9GO?MwCi)7$+(7t`et5*LvzFy4VzrRl!_Jz6@b}cyW3W9HN!e`4L5EF#kxc%e2%;NZ+;z?X7 zX)7M-Nl{(vugy7et)y)xPAG>f+1`D6Lv{`qSmBG;T)&M zKB&;=uY$|UFspF^)#rV_;Yw4Wh_+Mt`-T`-7KaxZ@PVj-8yL}_oU1-mS}nXv*3 zqCtX?Pj5l>L?V|EItD9C{!>j37+V?nY`q6?>^~#J(y!?Nd5?z?s>btZS&q-_4}X!Pj@bwgb%B36|_n zE!PU&iLUD?zxURvqiW01#e>C7MIJr?Z|>TKz17Js=}Pfw>10s)zwM6c0_KO9LPKS+2E0g+6_K+-Y)`JGoFgk@UAf$mJTmQ=s|Cu_259MR{uq5ChA9JRT>FotX%(E0uN@IpBi?2CJLufym zw$BFP4j!Ild9>eQb4e$T-cj0kzz$u+DRI$d+V`B)loP?oj_(_+yMt<-^4kDulPIZGwFu(NxtXa{a=A!l6*ISU+dfaVJ67LnOdL}RfeF!6vfGV z;$_gsRAXE37gZ*g$HUt|fPEP($3GLoWl|WKs!>%94gsU#R4NlCMXgP&N-;G;O`ryu zQB938SQU+Wf*$gEyBH7YTe)1*UvHz4zTUxtvD%OT#zZ0*4uxz%1_kiTK7?O*&V*m| zAVb+fh5}y#>|9{Rw~fK)f62SGIxO5%{EP8Pi?73R+8&%>5& zGFOg+A;)1Sx{+0;Xfxp=?}d*k;Blmc|6$R)qzfaLm6o?oyr#9Ni!b}PKP@fFG=ZVj z-|!TFesp;7(9A_gxC?t%tUkJcYdrnp+0lvX(o50?R@pP)U~vrJ4~62NOGW7e>C^m7 zz<%;Cu=7;A^rrM?Bn|{AGbX*=3ba&t^1l=taF!Qj>Off38`9OmSg<;ce92gdr^5lC z!RPV>fCo8W28$UVJxjGOVlrhTb)irahw&FhQp?oTg=h=8u1=eXRmG_KP7RLk9is&s zef4LYCL$NaTZT!vWNH{=RfZ^L7^?hLomEIHR0XPfst{9!ONlC?dg1itt11WIQaSjU z(+*xFeQF~xl0LQZ_xsdSdKlzPdrN)E5`E(#clde!9ARXU7)$d0GU9=P^rnuKb|mB* z#+MR(0%vGyF6l+dx;!WVax6T8IQX>5W|JPAd{b|__WXXeODRQIK2|)Q%EL^EXQekL z9y~uRT|*)1)ZhM)RZGuF-Rx(lKm7Qo#o1Coy2L~El12Cqj)1qI@Z7?Q52QmK-5>`q z^?rBacr1$k?a-l#xyj_p+@ekRcB!RbDL&=r>jbqhrFM^ z^4UtiN>1L0R#TsxxP2a0RWTpR>!Y5bMGm9c^px;liQHHEyaKl4xrd~8DCUkqQze3I zaCVxz$!)J72-@rs*uTG~j%|HO`Z?$UzYsInK_8aBQT*pn2K*MRyY`$ExnKI;ch8^up_l@ZiPygR&2N5HIyfZVhEUzT!~)sl`%g&zf15e`C9nxy z`MamSLp6P+Un`#De~dj#E7JkKE81twNE))ij!f1U%EjZc)}XJUBa>_*7_FuRPy7e~ z#MgM7=kdAum>B*ug2Tkp)2)#PHR*_`e61#vm`EnmR1K{`Xdp^pEjXb!JpeHnw@M-n4W5KHkSm z+ps-IwK#z|VuDb5`;DhpE$Yzgr9YGYv1?J&vQ^SabV+LX$y2w1YF4)tK%t3uImQ3_ zmtXu-Q7hF;w^@F{5)(WI#-Olp!NgrDH+wdC65g7>pmq<-KZKziRk zY2jU?=fscE`}+vr*fQCyxXJ&7Ni$ghe#R)kk`X~mTI8cyGesyrJ_>|vb%1tZK`7K{ zB~93RCzaN&CfKD8(i_*}GU7ZX>DN+4uv+Sh)G2kU%1nB&GtL%5fq=W-L51S1b#lWY zVXen+$lwM!-x4L?eSWF#5N6!a*riI-OPrdZ+ghjfsY)x$wSOQNKUxzvVC#jXo zicQi-(kN8USuDWUB$ylAP&_B?cy800b0Npbz`Hnq*u8yYPdnHootLPtt7j4@Zt*{4 z{7jPh%~>3CVjR?v)X5416r6|9b2v`@GyKcdOqvdwa{pYKSku#zLD&!J6qU;MQvatC2Jp!kWdaEa z0w%iZ07QtyP{eF!06vdtLVcz4ct}BGF5quH59&YKEB#VhHze(_d6Wy52(H)z>7+FF z^3_D~09bPLWZ&B3Yo7{%Uu-&zzCUsIcVN~k=_%>m;y>-!x??2ZI=<^R(1Pn5m(K(u zxB`{+_y7IDAG51QpIeAcvsU^I)m{uSS4BOqRH>|5K4c1+1f7L8W~|l-E{VJ$dk`mE zkDnER-AwD387~$DEyH;EN+HxL`U+Mn8BwI&TikoxlWyLO?*p!1ai~_Yq;oUlOhKun z$ia48`s(%bcp&frKEq$&ukqXfe~O2E`9@6ZhLqX$pM&$1)G5mYWI9hM$s}gwGL?2$ zqjsJv%e9kAbsAK;7AoKTNNs}a!RxWNrTg&dqu_=VIa>TSw`{d^F)|0Fmdt01_tBq$ zn^tqz{Mxw(Lq185920jAP599JQs2+sc|Eh_rIEh?>qvhhE`5k!%QH-XbU(5C$bhej zDy`P1(_s*0_ziL#Wj&53~km&ouLx;Z8iuZhc?=VXnIvvG_AMJeofW+52$*UYQwt65v~ zLJdbAyikMu(R8#kifW=YQN}0;yy}`7;D44{ZPt;afCe69_#VEWAL3b__$`Col{fHy z9%>Np2`~ZT^E`z~A4vPw`rtfYAO5h%_p0xzZ_=mm`J7Z&e`*VeEaW5ujMrx?kgDF^ zb>()1EN@tjd{fZIvS_BPoGyzxkz~9?nHFUAX<6EWhA4ctC8CThQb${?Wmy{h4V(;u zB!sIt+F5+-065&gcKyDAZt$;b)(wBHA3S@YcpdGW*l=iK1B;W%;`L%HOcdW@KPg^^ zsc}7d48rd(MVALQEZx1aWAF0|pZb%Drls!>NsGZTAl3L_cm$Z zfV5LmgHOpjG)wQ^T)J}A&gHSpwvI*IrSbdq#j*LTRxD?`$GavOxNwoM3*G;0Bl-Zi zaN2xcx`X|N9{b)~d^N#+;9N6@v*e$Ms-Q}vF_`L-_D8hXG#pF|o#8EJIv6)D&7uqf zPmG!cv)M|x&R}wE6a?#qdP0}aW)g8?PSs2!{+ULwMAS7mSA%GWgEyGyoUnH^+twy> z=O}2?(A?P8-qG?xBWNf0+-9=o*%qM1f0+(7wzssjH=-()M&=T0NQhOb{NAuv#u#MT zdi<^R_*?7itHKUPHO1%ZT>0v1S5=~lV!Jc4tS*x#DSCUs%A^yWi5C)xNdQe>W^D$N z8Fgo7Pv&rDGQ%5CBEvA51PTkmU`Z)UYt4tvtiZ}pl(f((%o9*X00NUe0u<_iiL^;O-;w^J9egO`Rhe(O#=R8zqI>S*IA|M z(BkFNj{WPx`0=^{O4 z=xDi^H_5|as(P0ZFq>fPjs^ep&a9gYNnQH0N)lh2CG$Pch}S;oJo>Rc#|59*Q@g5tclH})2!KO#3!ta z_=CZS5)n`^%K|=3(rc9xpXd{3RE$p7R7Iw}@i^J8AXbSHe-@x@)}M)2RWS%rK`e3AT_$^2fDFGZeP=+-4Jn?)c_=uY9C}Dzh z=HVpmCB{jA#!k+jY-0%6afGtl{j?ioW{lWk+=V|egQMnA^J`{gHoxG1)qmBG;2!^B zKlEdp=p((IX`q#)Oq_VA!kSiX_sNSyDmcZmK3-q1j92|omO{(QN#+y_JX>GED3*Wt z;nfWlyVcn#Di^(EnQW+UV+&?0@{?ceeky zx^LU2ozl-fI`M_&vsbRX>${^~Dc|%g=R=DLcn}W{o40&ApwRtJmphXN8 zI=OiqWVj3`ay{H2H^g1wu5mXx)c|*j8{-g1>y#;aWu-M!hP+ln430_bD$4IAv3FAm zFPkmmDaL&7A@J2uA@~?zW;Ne%FTT1+GXj3mYV(2Ur49X8=D87(sYo-X>NA4|X8*Sh!+a7e%V`^U1I z!B1OqT*u7uJtp(~oY5$qKMMR{0RBVqMd=41D$N2B>Bnwx5!4TYdK?yRO+Kn{aQ{xZ zX5ad$k}xqx5z-ON&~i~FDijKYI1NXab!iyN6lg3EfxJoVXblVj3(b3I;Ud8ZX{Ud} zS61isuIrO`QIzyb%TvzME+(0Dk6)r&e8cnOk>|M`;}P!PKU;nAB3Q&88(&QKlNqsJ zMTBRH@5FCLluELA>a;}=An9AWh^C*%$Z&!(Mgoe+nofoYo` za1e7+E1L#>tRN%H(h$A9ILEkBS_aBY<)+hmc{KSnwp0YzOTmQTUu7FL0tQS;Y*GRQ z852;V_T{7Fqes~_IB9U~?wLRFv=m#jV&;-=un>6mOV_2B;1lr6&wTIG@lkdT{LaLa z+qR)y$R*v7u54KPm6%)Ucs|q)9AM27X;}Km?EL=sCeBJ8hUyppZ^do?yZEdej0c}q z{HGpb@~4qkg-z{GM4M7j`i;mKQ0O$8fKm{`7MsmYy7^*IRCrYu!4YtX4xE|<92v); zgJp=~q8=BHM!%69k-lK?r~OdF_(2HyE8LWh(SpUI)5yw38eDT!6%0C{3Ft%}WOO~c zLEW&9H6k7M6Jk|u9*K5O9(xS3Lx><{8JyTcLW$uxH+jZfSj%nU_F%s)RweTsF$#`c zk7-?sN;y$pefaQ3hH22kb?Zx-G38^+%IN^dJ5opXj<4B!EZz=Rfp)lf{0duNy!(c9maUbp!N(_dY~QIk+A7Vx zu_!-x+4|-EOJ>gpP2lW!msHEWD?PY#4WHJDNtI$gpCubnv7hoW_eHhW=hd5iHimG! z`bS(&>&v)AwBfY;t7ly{pw|b;MvXJTW)TVat_|C`oP8r5Hgf?v-9GA3+-_(zI!Xs- zOdIjFFlx1GrCR2B@w^g%w36JdSCvF%GYH@3_y1z%e+hSs!vVcIRX!#21g0Xeyl8Y3T7YVkAJZD zCAI0&)`17RfCY6IyZ6Df#dl$7;uyPceD&`XiO4$*4%$>Ok-2su)4 zDrE|sJSRm?|O z!aHvj?FAA!)7ryY_=5IT?Nu$(k}O(F9TdqWDr2XIpp8iqDTGTUZ&Xr{B^{I!QESSc z5w3Vqsp5@9?JQ>`GDgNAT*6)$o){cHm&={46?fOyqt)4SYsAJ~4;};kPC> z@7Td!D!y~!hV<#|{N*=Z1DoLy&yr&c9Mb*$Qc8-D=#ZOKDBi&}jDoO+f$NOR<@1s4 zrH`MrXmlo%j=Z>|D2yB)GS*R9RUzta)C#0hC{zeVb)?g(BU-Ws(eF3VOd`a|5}^j2 zsPW}>I*n54rxQPql1%*C#QK7gQ8NBeI@B3LA(PQ)3DB^B1pJ}L)^8iK4cl(o6b2h0 zVZyB;Ja$r~I0Q?^B3gPZ*DNk8%|zYK72fETQMi4TzG5`9BDCP-CCX?H(Q<8J6y$(c-N?=$kqJ#;RjAb>R9@ zI9i;8y6-RL9*mE$b7A$wyDL|+yFmBh|5=*>0nn4#h=YlAX`gg1z|o+Ve0rJ6rel_*ngY*sY)NF_lR_avu;%%%zOmE`wIh~v+*WoWo5 z)uVDXQCcnzrnja@pXzhIuq3RPwU#ucXzz1lDs!MU_jEkKAGyE#q|$M5}TpA!&3U0>`AqkR4x&mKWbf>m>I4owvH%FI+qhjv(b{uSpUM`Sums?cCmpL&aNz z=*5wqOPO?+5Pc&GN!(wqDq{xIKk!p(J^ooiAt{#VDU@Qi%#XvgN7lTX;=us?| zjK~zn2x&-!LOzc?HS~~al+TxB;*<-?FiNG3K2j#dWG!(C;ewC^0sL8i@@A4{l0C_R zpA&K1zS1k*M^;Zv6L%9R$3FQsdIGd-R>5SHVHAyw91rtsDMOWdf12{x) zIG@2E9eORv_bU!MNroiJ-f7Km!mY(_xjtP=;z`tdV+yu8r9M4fGGu+FqRdX?vlGfq zR(9yZhb7K!wlqAc_z}xAD=F{pjnLh_5kTrkQU`nhx9*jW>_yAr^_wfVDTVEG2BrD? z=EiXj6KanYZ%C)4E5!rx3|s>8x1}Rs=_q<-Vm9I?PHf$e28$ziadzIlMA#1YPApWM zOG%qgEbRISY>99*;v7;xre?0An7uB7*}z z?=T0oK@uU<1;L;NIB0S-v1u*zaQ)l>he!he8aO|f=H_v%hEpik66H8Q>O_0cVZ>?4 zD&{m<#q7@`y-H+Ma?ZmrB7;+g3q-NRk1JM0HowoqW$aaa4@k~aI@Bxjd9TkB{E;jV z(zkRP|GjV8h-4aXrCt^jo<@6@1%yjo>W9vjT>Grtq-Jp$5iKEzj`JsnAM73G^$+%P zYsS^!qXXc9#IPn@4a7IymhNqpo@{D>N|)r|llLzV4)Vhf)}sl~Bc0mS(|uE#c>068 z(rXvG+dlv!WU5ct(QosA!&sRpaQ+lnUIr@|6@$RzFS0DJQfYk@Pv){aopx;`q6`F- zO1Ir!rL$TE9NVK&Em08^bsD`&sA#>l;TKX6qE=i0%r% zUDdI0oPB0I_szqHR&Po)fq{Q1{uYeE^~L*8c@zr8F}U@?O75rsV@u+XpV%k;_U`yE z(cJHRtE(G44K9rHaN!WxE3FwSp4f%YMn5@2ai9MYj@`4sw?&KQkMLoltnH7$10iBtYuyeo<$ssy7(EP(Le^X=$24RHuMqZ1!f``JRk=W}*GLUS*bLZ_gh8jY^K zp|OFSVzQ7*F)fXqy2eIbCqhoqfs5*n!Z8&G*wTHXgvMl9pu5Cu zpRVvdZ4IBPvVS zKPTGF`|jM?@@-Zvos-V&C0cm!?42hjeu%P5Cq6s0Z}3FGbz$Qz z;DTed`x?Q&NK3vl{@dCN^6i4P#W!~qEvecC;)YG+=DQ}pp?IJFF=JrD%stU!Foe}X zzuThLyZu1~ycR)E;0vdLUa6%6NMPc)s3|N6PMeq7lgZ>2{9%Ele2zjmY_LFRgJnyksWqO!DNWsNQjqGFnxYlHxI1AGSh%O1)p(k1gtV34LNXZ#zJi)w`G0;|` zmZkWF%EnWAw<%F|DnXZT?9>r|{$M{WjQ~h!Eva`>SY5QDEK)r~&!(KD|fK+8HADCHf1EDhB6WTI5ONQ}CdO zL-fb;kGFzVf8Y>d%C57P1 z`8m=R@vLbnb*_RQng$;zr_)pc%{N_Qp`FqvI~BDPE3dOGJ7>Q7 zX|%NXE|~iXSXi7x^6kk!#cfbkn>bhxcEfCz%+tk%)oJj;QD>DNRk zX(GYGC^~{c#)~b$>vca8bGcnO=Nc`r`UX1lH8N%*3THIJ%8nI^;e~#fhVx(_z39%t%qADTX{o=za!nTr{i$P3my2A7doJ(!QR@@ z(Q0pCHDQ0J8yMU`NBDt|af@y!AU9btkrNFC1=(visX^B?H#LxKlUO%RFKk^lTM<;3 zrGlAqC1;#2=1;zxxFh*_M|yhO(I~HSD(mT#gvRVL?z6m<8M`BUw!Wo4OCbuf#($}6 zBU^20)LoJyi^{D?E7kpPlv|RK=8`HLvEC^Qwng#7SQVLEf{F%vV^DE>X5!pIDTMT& z%|&|2bNFv#GeN_zBmj0xr$Ensw0J*B4#AG%C%-D1_k+uOHWdHusqbKicLXh-I97gt zZ+^!g{f{-*wr;)l_5Zo7DZl^rR`}f3xAFhB7ME?kIehUOdv-qww(Z`$Yx6E@!Cz9` z;a^~?vHd>EJjToelVY@?!QbRESUNI;0OwYUs*n&0Y3Hc8Jo#Q=vdyG>h`@~G7uiQ=&H6G@ zbWxx9Xl26*LET0C6!_?;z(-@jAa^KQ^lH8O3(D3n5ED@qW?(~Vtf{S$_XN~uGPNOh zHJO(-<1gkN%wu-Cth@<-HpjxwGb@w|^0ofLqoUx>Kl-S07Wp_!E6hSlKLY|xhJgmw z&mLx9U|I5D4}QpMh-?G&D@pqm%~M`g!hYp|64o-TQpqy4Y(gX^4^2#~*b4FWNVJfD zk5FiuOn_GtR}(NHIzst`+##%VSj+a?TWU`98ttSZTc)#?t$4aM*O#e;(-NkZ^g~<6 zsMl?2Df`>{DP?uK=(=RXbQzMYb6K+GGMBYPXO$6ujg=0@R2PH1(FFo1NEa1HgXYim zIm+v5%Y~8rTNc4qX#sd%@_<`I;QSC6lLRm-&4FU^{rAC>ttqKrlIo;;(l=tQAP0bi zR>Dt7H)M#Y4#N*V8=8Zaj6Hx|w9 z{w}DKe)DpBe&9y&{KdhSUK+eO$RGT|Eb(h!m2Mn8T6`V<0Irz`Giw+BB4c4Z_}m+q z9Mg`|+%9Gg{N`vpo@g`^Q3y+IZDK~7`{&rYJq%0wPoN;GakA8;Pyo=Be?*U;%Y%jZ z)?~p_risyk<&2VuIt$C!o z`wC&UOfbW45yCQRK0x=Ef4V7Wa!8uQ%)u2L1koH^N)1R612wrW8{xK*`UYd z19`}F1-hVyoAp?}t1JK5EVeNxSOkm7+GwJ`CfjIj#Scabsal+Yj1<~La*h75U}#+1 z_;KT8BRkL9XFY6v!TPF|``8M4tN>?=nt5%nwn2Z}+O{o}!NDDF1EEH1s;w<$Z47Y$ zTR^10jA4dtF*)*^-37$5>PSSx;MXmnzNsElb3^J=>I-V5 zrdz=^`n+1LQ)C#>IencQw)Z4m?QLwCUS3YM0oT(8PH$Q7vr=`)-_W;ImYmO)-=<2G zO4>SY^$=k**3*%$ed_k)Xdk)M6UvqUBbeG8(O{c~s-@3Rfl)dYrVZ!c$Jd4{7l}d= zvJaIfIPa;3#)|SNpmR%kNi=)~{885*u3tH)7xXOa9s0xh;1709Ua@%QfXMyD*Z!nu zi(H?HgG9P1Q#ZbUyv@JNB2** zipzF&&wO%4epPwDdx_L10a`bUI;ic{~<1ODJ;* zQY)Wf7?YYP-#>mPVX3aJFYTvaGAde3!W4lOd;6+jFcgZ&oyjQaOycxK5Coe|>u}Vh z$rbaYd0t&p6HU6JuBbL?F_9*r$)v4Ti(0kJE-`3z_&rX+^ccf(~U5VsYE`mzR;ica5 zG<-^VNxhMbt|{;d**F%b9&9vHC1)HlSxBB}_cRkYWR!?o@CuXN1Vf1iXv=+a7O@S{MZAqKO6$2mR4PO_E8H=Ao#&RYWpYu;*byPXlL&_^I~ZKDNT4Nqa;uxLQwmjCE2el?|HNnr#{s&;ZD2z<_43 zv_FkYYk-D!#roE*E0JC*TfC{!Oy9rqP(zv+K{lC`ccPUTxzoHAD1*047Bi*XDNnjS zEU$hpBkRh_Zqp`T|7Y4HhqHhPb~@G2ItBjE$qRpgZ+|Mww*5@{NAMWyr9ZS1A{_@0EySnq=d*xp%i(Wt54I+w(Qr*T7}U1b)U>2qyk3Pui$n0JE?2LE#IHEW z&Rgiv=^PLlJFBXz(`lQ9tWs1r*9inCV-t-@f7B55N9RS?Mp+FTZEtU_swU=B#Z;35 ztg0$(qu|RlV*?FT=8b?a7#!hjh0ZiUhO{5Y38Z1umb4|TB+A&GBLy{1rknA1nwg;s-x-f|9!W+u361;27KTsNZQ3gQESQvIVJg5Bn!CA<%Hh@_Nh^83Px^)CPuu(98`36?CFJJ>zD7--1D^XndOov0lJrd-47zuht4zqot$ zpKX48X4m|l)!+Nc`c`;s7+9VwF5TO|nt_Z~`cUx+|5uEI34>ly<@fnQI+ICbAt*tG z0=Yv3C1?u^21D4c(rB1)7)Cilh+!B=<_iH4=|ZM@6SSDXKGSQa>n1ec1R|!{Cb-+$^pkj3S^7vUKkiDb8z?vA@(=tG$1a!B@_3`mfT>jzcM=_7+qGRMSDe_mIU>#6^=_Pf<#-S9-CTcNx_=!009=Bz zYme;TH{p{qGw0j}i#KfAw0S9jV6OC>^!$8wez9lqyXW@3_U?ES=^1xO|Do7U&$$j9 zJ);o>lS)sVn;t9{wK|TnBT*%`*2Ud-`klD(RJ>3ovsjg0jl0KIJ1Z=fF;6fai zO_dbM7m1dbSewbjtaf`K5DLYrBau+5qB};0e1o7{y=JuL8OBW5!>wlv1858p zs?@aI-s?!N)?0QPWqqjf=~JU29MwuNp03hd`XO2w$VGJvT~3-KpH$pT$)RAgk%x)p z?ZmkEBU&OB(BGU%j*E$wli|AG_Ze&|gU;NY8 z4;8cVuYGq>vSCDdd9!{|AMqCp?m$2ofgJFr*a*wEZrj8S8-)s zni%6+%1ow7L0M0dG;1v-l~jV-Kw+rBE*!1g@QpS5f0wBL=(~shJl}r(!+`flBmg$m z{N=U|7`t?I;v5@$`%N$*v68f4L@kUi+*Ew$!1$vLt5$vIYfrCw{68*q%>LWApV=sZ z`TH;3wA~opT6|BsxeCq$x#K(bK6h^9lfA{kd+eNr0^9&sfp?^>$Nyjfu*-! zKcT)=S2Jpl+6_!) zH)`u>0U?F*JPp@MkduiY1b(IE4G#8!9lbsVGhS@-(s0($ZAfHcBW>v#?b|1V>20^ihmri-8Nd`J6oj&@o5 zE?Kgy)waAJ8)Fnhj7waPMOYk~GL%p-lwl}CgG(u;u1j2oGA^OOP?|rJrh%}RW}%r( zCYPZJlgZ?l;WB~A%}q0DLui^|60i>U`@SQ|g0%PktJsokSv5ZI_pZJzbQP!_aA=mN8bV_5TCm6 zhV|mP-N*p`=N9HKZx6$dg?Bz4`6@8r2yVUuP(^bB`OXy943NwHepf7}_7W;Dl_im| zX>2aL9RoqWECNAz9YKP)Tp1DbkxKn>%m?m>m}sylHag5ZxqLXamYBS4zVJO!k) zR>E@{s+Ps7K_LxyANDFxb0eLu^&fWom|xwNd}VC!BVR{Xx&MM7r_J>7Hx5pZFxxJE zO!pU$zq{(Rk~_a>WwBrK>(LF-kwv?Ow{Gu;n|5vP?E_1}zZaQpJGSpSbm(x~E}`RH z>AWH1N^k^U-O)SkvOUsYp!_ThVkg{gj}B+xtjA_^;#|uKmK=BBPRN%|S{aFiKzkHc z2Mfb~e{G1!_k_{g1ZDIu39E_>MF@jT7BsI3Zwb@rJ@qKH3KC!l?CAH8Wz>{ zeteZEzsH~SPx=`v^b^Wpe>m^=GZK!$xVtk2!u_dY@VC6IKF=^pPof43&%&idg!Y9R zhN`(%gM2}a(k#;Ype#Vin(})r>BHyrJZCl+~3MYN>&-_b{EO&C80ri%)HUE4NwA+QA`*K6GPx-c8|6_`Rm((=bFaSRxzMGk<>4&-wjc9MV0M2`oEqr`0$mQrkU- z5EE4@ll6{Td_fI-)I)iJ5qiB&rBZ5w4$46=>=-54!q*n?TKAeLj7DRLP-kdO2xBgf z#$JfgRE&$^B@A>zq)sPcsc;qiuQ|aM=L^n{oOhgz6Q4-R>2W5VPz{}xR#)4pg2kef z>d5MWlxHJ%%K(>YB{J2OHA$`TN31fC(q+nAeIok`Ry-6{eao5wi7HB7e7G{1^vu=L z>B=-)hP!4)ScP?1HeB4a^^F}KX?}&)?08c+cT4z@q&OOBqX(45H#s;QZr?XQ1wDsv zSr5N28M`$`e{H8QyzT6h4$t8gPXP)%U%dEi_ku}q5x)F|ujZ##3zP4>6P+MP8sR@> z??{hQPO1)sc(cT2gAO$pP;hD^%B~$0RcF-d@u8Ci-EQA=7~Kj+C@)2m9lDqiuj`(X zdFvvPdPR(2xhtxfVJcX1y7w!HR-Wrspk@y#8)!`$|$(ZW=BrOF)PL z?p~l(wWd~yM~xh>igpYhbC<{4VycWTnqE?3-oqba!`TCAS;%nrsk4E3*(27}=N4FSoin!E%1x2-BbOG7Q*QMTMPF86>!l}+b<3Zr&Dlr z&mQ5~-NIs}u76mn2CIetKGQFKbZEhXg`-Jf+k5Y#94LV5+E=7ML$(~E>Zmk$?^LvQ zMm2dU&)JPEOD7X?+|x-*f^y7fCUc=1E=$fx^g3NgttLuc1|Myg)Y>IJpTu6vgtFnf zIu{Kfr@43*C* z3`4nJvjRNf>$J|duCZ>h9<|CkOAoGEB_8}upoUhR2rbg#L$24O;tW4W{}hxyI16{o zpw;|6^W$ciFaz3c24<{wX~yNU8G8WSgmKDutl#?80`9TINK)}efjrCc~dAlp2`tIW`Bsdc+u={hCe)=*)ok&`k`CX=5- z;en8hSadogwq7Gxdcu&3VL|WXEF|H>M+L#i$&k+}t-%vuRfshJmBeMUWu0Uq%)7#Y zTAz#8)#P0+w}Z%$)M7aj-dL!u)i^>S70a?JfEO(_F%4PmNY#tnA<2?_q|b|oVk(sM zdA$xsEV{86vyIm|^EMl^G_@u5Sn5EEVNaMDihD0%=n9G(Wa5sv0cYdoa8f^+^7Jv^!D zOO2TsfN-YFK~nApmm0zqJ)6@0V6`|i;ciQp(}*(XNG4O-z#{p-NZDOU9`3d(Sj8Jw zf_r=E55R%C;vbmji@(o;-%b_PQ^iAYWy7q=p6*R>c@n}41$?6OS>Kq|QTF4uDiG}c4ptn|2YK_KM7x59o_ecaeDdd>CQDqpf zPp0b8E#$7V)``B#VGW_1L0SQywW4xShbd-scpRqVIa6MTYFD{LDiN2uO7-5DbW(a= z3P+`YP+=)*TzR~GO-RbfI$b4*5ny2@RO4X4pb@ACGt{)Alrc{jWNToX1 z7-P&CWrW3O>8aLmxSQ)f3m!btMdJwUThS)?bVBpKKwO3bKB;KjDWO=;uSxydOIezrD4s zO=Zb7H%r(NZj>A2Aj<)c;W)}v89Oxa>cScefJCwjQ{9pvt>{#sB)T+HXy${3v3l@P zJs7A5_4Qc#5+ZNyq0iHo=xa1HKxAhjmPA*TqZHW z`LH|Hzm()QO)afJ;nl&?9^n9YA zRLw`0#u)*iWby$yP*HL@rGlD-@qm#wVva2%r2zw)W11TpsKJKg4d%(c!=2ZNBJ+vZ z+LD}3dHZ4U47pM!U13DW*SopQVo+kt%9UpJBGWl&qJWGdVkQ=HMQP>X%R$YlK#<)?DgENTwbPYqHF>4m&WE?>~?PtJN^!2;#L{P_l^+YdrYj0Ux#WfqqJ5@0)8N?0vbm>=(npCc9s!Ta=tN7hkHmU=b?A?x%*hAzCF_fG^Mk z)B<$mxdQuu`vLT|2OgMTH=i4re->nTPoa%#2UNSKJ=xB;GphFXf#Jdzhwx8(hM*Y^ zk@Z5iFJBl6hldK#)94Ym8a?P8RRz|C!S^n!nk?-53I?4{eV-=p%+ts6=ku5Hkjh=k zp@cr4%jeRyjlGQ|*$T`)i>bUF3P0s1je057JPW&=Sb=Yz9{}p!04mO?K(AVo9>Dba zSlfV6K}Zeo17ib|0}KZT2$h^YoFBMS zBu}cSHYE~kXL@R7qV{r~PuMl?DlN-|Zm}|t6Mn0;nJVvw9-_}BlJ2s?1+h{hIG3(w zcoRR1)0h&Ue_2{Ek(nV;&NLb_w5;4Us5E)}z6PCNWOnjnnYsr5U9uQ>@3xe-i5uDy z3+eJ#dn+jXGh}u#68b)2UtjkSXO!-g>p9np+n*|EgnYIG>{tBL^l@mNICpX3klea( z$?&;}jo^B=Z+l;EjFwMRkP#@FD!#IH*`w+Ht&+MW`**KcH0@irZrGy?5t__@}U)o-LB3V3kk?EhOT}Y>saQDh}{OZw;9l{0S z?OWODmjb?*B+QD@P3woJhx5BP5AHx7jU&qObC5q1_j#X0X}QzN#On<~ora=mre5VI z3B2E8v05FBCtgby4CIuSOnZlUwZ`G)ymAfWLB0$f!Bbw2OGZ?L_>!?$MVVX5g6!I2 zG5gJU(Ii%g1VK7STRw|^}Aw`NX+GDXo&>xyDcAs|4XmcXBZf)fLI986`7xX3|xQp<=taOk#+IF@G)Ea&tukh!954p#5;) z3#+(@oR}sq*hE=o7-p&^f<$IallReU0Ljy^|h^zSxl;-VGiC_ zinZ`CM+_{5X~#N{f$7XTK=19Z0ls)cJAX}Q#b zoG965bZhAQF>?*xWxPg7)X-ySp?IEZF?b}2bh;D2VQqm;yVJCqOMBAE^gwzfJ(`wM zX&yZsOHZcHr!S?irR5wwaBhP>Q`V;d}Ly#G_>6I-{)2#)x+DXS z3ul>kZ(Wikr#}Vzg=O%-)98QOu58==$lM*fhWT%W2l6{;PEg7>%p1(|`s60hN^n6~ zE?nyA16q0nE-HT9Biwv);tKubi^aAp7_HzE{#$lQ`V58sG`vFTa@oU5I;O*;bv@R~ zIpOyNksDinD&mir!Xnj}-mKNeqvjey8olf^Z?8o7l zx(`*aCiEv%@hT~lDh<%gDp?cG^Gv8H<>Ww(>ESds&V~}hGc}yXtkiRQVy-dDQ36T1QId46f)$}Zd4(6XiWyhTq%xvF zZ!S|6SHuJf-z8=!mki#j<~yd`#;V*h(1f{{8{vlOcct%7UxAyaw;h=tXU<(Yw&$If zZjV2D?a^dqom@80QW_ZB_$HL&b`U>y-IyiUu9gz}e-8XPrMYwCltyDUhirH_VziLqR5_+JV6A*Bp1lLnmM+s!IxZ)BkQn{HKcl$Yt z`_j%|My#d8y+53wlE)eGGL(9Rcs&(eg}e4NW-dvIa1^DbUM@oGfY3wdwmh=&@RBXy zlSjX~{~OC`jW7%Zfj(S3P$Q)KLf{Ei@iY1qT__%*&v?K~`;M$%czDzB|M$nO_d;oZfnE z*sqmY!Vv~SZ(V&dnU1m+e9gR(Y&M7oT0vBx1<+wyenO{H>4~(h(WvqUWa+3(rE2om zVE`!0rvvDfY8VV=>^1J1vt%UYbh?dteZ5&HmNC4pKuLjyk*d`!!%`}_LXN-Mj65U= zF@Rx=OqPKv4+93!`MAcwrHVBQ8VkQ&RX`n7@D^L%O<}rY%FQIvbrGFqvc0NFSXB&-iH@?2DbQ8qhAOknGNoYI zWk;x@y)_H>X)B;kFKtd*X7j0UpQqgfhjG-ZL zk$&Oa-;M0q0ai|@nH$C1HP#0D2T!*R?-V@mZ8|RJ_HS5M>;u;)`@5II2R?gQxSs63 z0{hzOzxeJ~mOof{b8?q(Nv8|#7WR4~z#{}cW_nhb*MS$AiT;OI=5`gY6?4K<-MxUK zSJ9UrM%JVhej~dm{T1b-vS145fiUjmYCHQwMU|~Vs!*s(@}hNxq_bxZ~RbR|n`=3NDk=T00X;(&I? zA43TmtR!fva)P!LH}|U2vUR1kO;l9GW+WCwH=j<=5L=Y3sA^DF9!NAdi(+=9+7(r0 za$@o&vSOFFF*3LoE~jJIh(w%9RS2HR&PY5co01-z62zwT6n(R}f5n5szk{!&8be?|i&v3_0E_{S+=ogfZvQu7^^#0We zyItwQVl!?k1is8`f^Kw^o262l&1}U`B?ILL51sKr$S@oSx)d17hv+QqEB4u zVtszU%#2qQX_5mNpozzn6($)g!`W98c2z(H0P`9P=CfPa$JnFn3+!vG6qP%j=sA9N zmHmjl!^%7?AS~Q!$f|!y1Z>nOh#3kAKyj6q4vr)q*q7Q-rV7ZK`I z_93ywcOflGEfx`1AqFO0Nvwlx5Q=#^ekitoOO&#t(~I2B=Us|dk5UDUaWypQ4Kf;# z&+zoFq5g+p?6VJqE6JW4u)nML82s_Rqfh_x2jKc=udJHdy#C2WU}W!#fnzPwNBUQf z<)#F4u}wJCod;@q2fcmuXVc&@`c$&GN*J4BR%eCXLR%J0(DFKAO6aZ!6L?mkMzQJ* z6sz>87-~Z0A`kw+`z4*7vUX0XlXM9 z;v8EhO2f)9DUMtoPd1R*M5Yk-M3NCc0wa+I38$Q^d{Fs4vMeKktP=0ZK$WtS>f}0U zjifW#4zc7Ek*E!L0v;d8`AB20)fF;?@Yj9Y4KF}9~?kRxSSJHgkHaea9^23FG{lo&s-=~gV)fGii1S`yWs;0E*FsgHpd zZ0i@gg_nin!hk0YCP3`X@&5qPDY|hAtP*xl6)#K)Z_>tHJ+tZm`0OR&W}3gkz>fOu zbR#NCCX0ui?QL8CesaBkU&sER%;yI>Hh=FQ==YBtdGg6^!dPz}Y^8VhKJuN3 z;uFO|;TQ^&T6&beGF()jEAHF3YLuvSqYC9c=})LyY92K}4bok_IS}ZuT01&ywYA}v zmY$wmZ(m(qz8+^)H946qoP#izOQjlEHr$|6H8ey$9fJ_2%>Q8WRZ=F&FWwd3-uOucxoCYhE53OD~lt92sn{yEoAbwXnChtG$af zm4k!;q49LVM|n%^2ik&*nHQ~VX=#r}6OBYJL|I5S+U<;!1l7hfh5O|LH7d0Vzj}4y z0kirl0hVu}KoT>n0g3@fnb(-B3`{bBWx!JT7Wq**q~u9Cty-#Hqu!#1Thx!K52!y< zGbj_Km_|7|ZjB5jY0umUgEe8$76ytiP=~{8JIKLyULVP~H>5LZ0zgKn0qI1hGqW@UGh|;91N|%87*$+i1a30Z=w2*leYneq zaV#_4l5*%SgQLn}_g;3YdzU+~ltra+A_^UpHIvffawVBCmqNErEIz~;^GtXzqf$%2 z`z_Y>#IEcy2@cnLZ z>Gjtqh4bK3K~4`ApV}=@LZofgBX(gFj0!900bvK&5S+XW{t0XbH+>$VQ5Y1uudn@E zPkPVt?ZeCsz@r}~A7Iwg8_{j^(;HuUNw~aOINXSzzxpb;@X3#_0QWBN@{S!sa)a=F z;l^{cT)$u*OPgTB>YfJCrz>@*iEt_Z>KRO2^(CIuNTo`pL!OL^7E@Dd(#n_Nf|^&Wba{z{ z((8>>%7`PSyTGR0sTWd^O)X8WNo`5JmXc^-gi58T2n?_lCeUWyR&cpkALjer;(N?@ z$0s#FAI^(>7lL2;&on+6mm)L8pVw63`-e4gs_E4z1wCQFvA4-9W z?AFily;oQDMD3yZdZsjlD$SY*{ghao-7O3##vr34Q%W$gQ1n6SAD*8wz07}M-b&arkJX4_BNvca;gvudu?`6R@G)R7z2S? zLbj?>Y4gTfV{MIBU4y@CDR6i!?h(i09_^!< zS(yQfyYb4B(4D)014@z^U`7~J3CNC;uyc$$PhBGN;W)(!g!AOy;VaK`$kM>tyL^5% zHmIZ^UX|@&(?};uIgn@|cz38|6{7Y`d7{%?F7b1vRiaFJv{ND~EA!)2ri^5ML!MMm zb|5w!v#gTgRItuG{F}Dc9sT`t;J0tT@wdMQ*T9b-T(bJpcgE)Ai@Sx+w$Z+Yef!3W zj~cU`)j4PSn>kb+MR^ ziQ4T>w@q$~_!QC_z=(PwPC0G>p492mwg48e=AHGwB>U|3gjRt~bSCB}4kQ@2B*CFn zG{LD1dGrU5#JIZHS&%+i@Vh;3kxfI#vL*#_-fg_EAf-Az^F1^&1C;+`g=wIq>PCok z-uXI-mQavkoCKjFQ##!FI%mKhirRk(c&b1}(Kl_8d=$Ga&YVZ}K`26qX-sNyL7p`o zFwrLLZ$?ePWD0R1EHsKW@ya0g%F=jD#2A*#sKqmhL1`halmo}AXzg$=e4W@1spOk0 zR#G*^7EL50wUE_9bH&;Cu;jF%O2b@gVkF{R+QkgZnJ0maK34p*Fo>?Ib6J=4gzAzz z#&-zs)ZRWIf9JZe2|gt}`k(*B6rT{Xl97?g-Rs6A;a|M=@{4<>xwnRQthngYe=s>d z0g~|A?L&4Co!Yaf_?|b|KRA?^KD~U!whdcxRhAciBl|?!MER)>svBjKec&RmQZ$97 zK88}TDR34nK0#64R?<;-^y=~+j7L><8SyyJWSXPJXKy#9DMR5NHb5V@16VOmEad0YWGMa4zZQ-7Kq7%+Zicuy;;<2YE2N zkLx>2sJ}j zb3>E(4v^u^_B_L6GR@-4Ga0tQ-9T$$gGZ&1`aH-d`8c1MKTFy|tl4d*)gD4i4=FQm z9y3pxFPSAqXvQk5=$Bg~N3J@tc!rM-Kgz`j_FnWyrI=Jb#uIe_$_=AZ0Bf$&<}7_J zZR1|WFHHlic99W1)Q35prCA);kTzsmgjQrSBF7g&QHU0dyG3PZgeol^sjS5MN=zqp zM4YiihKs%evG#enCyA34{4G>{>AaZuescTzm3ursnM=xC6tD7oW7-YxG*&>1HK>H9kiG)e9*TrN%j= z0(l^XiG@}RXTcV(*Sl+Qu&e>Ye5;k0$#f8fGOOL;Fd3~idJAXt7-`lB)W#Z%rN#*5 zqgcyzM0t=PT6v%z%Z0rj;pB_3^|fxx;PXWZYZ^erWn zK0)7j;yZ-5XOq-JG68jG6^flw&IAs1XY?Tf|Z2@chmg%h=ME8aZh z6&ek2y4_yRi@wUMe6@CaN@p;zCM+P%ck#f^Ba`zwH5#X{CjzKQGD52&kw78T z5(&m8)&Z@&@$+?nWTpzxm6#za^fc8x$e-ktc7xoHgfN&_;f*ii^2XF-B zg|kwr@RC6L`oZr&UyJarup!z3)`QTX@Uie{fJYD2a6X-zoGiXFIo$)FEv^(U^mYhz z-z1%zjtbj^^NsyL3Z_s_`>ZhC((xYX2bYAmu4m`H4x)r(=l8NJ(w`&uA3&LB6V(o$ z<2kL;h4O!`(j3Ue%yJ24AU+9PZCu-PU=h_?5?L*r%&}oEOhl$4Fx!|)Ww;D}rp#s| ztuSUbVg($mAfK!A`8w+o!C;Iq7uUt3kwhXWCZ&nSM56T+bwQVraoNcD5X0Dl5!M5hMW|t+v1@Q6I7mOT{RxB~=n8|`WuVD3gy`JUp zG`NM26x7sG4iGU^j$-D!fGeAkO7S!*nc*{x3TE&pa`<^&LEeeXhn}oVfJyoi$&-7V zThypnd>3(qXf9&Tv3Lf;USihGR72dCicP$7qe54qp|d9LqEMb;#>Rx$mgcgp5tUT} z6>Tn4n2OT{kth2eR&>iBgZ%~rGs_PUJw~}~3HiH?9ujCE9Hi-@Krgs;mVuiOf}HTm zt@SUfjZcqnp59j61(1{ByK-hk>wZ+zKaWQiVvN&P8N zxKB`xR14V2>(w%ugwtxxRx53EIGyg0%~ry8ZH{_~=z3JiDU>Ml zJXKIg3{7HY(nN-p4JgrWJzi+Q`?aS~I_hun;SFe92-nx6g0T5SA>KrGaW*Ek;%>H< z%v3qfQQxF6GgR2fM;qb}RQa88;M&QNN#nE^JxZr3iuAA90%k#^lelssbiY;b1LVMR z$RcdNZbk;7BReuB^21E51URZ%`y}-?Wi1nQ&xj{h+m={2HCOyu3EruzWWZ^0v%b7h zUj-eaph#Ulu1V*xIrB#UsnkJ%1XQ+xX%uPo1B9ORL{`vn{u( zXZmB%cV&F}=-!Q6UDAPKJ^lJ;yFlAZip1 z|0R2u=p}iu);KC|Td6L3F3)OhDvwrAt2}LCJ*U8?b<$55I$>C!t;ZyHyrxa&f)NO3MPgoWm^i*jZ3u-r@ACu- zgjJ_os0MVwt%X=iti_z}Wce3(TE+0ZClaxm9cEE|q0QY6Ak!Xb?`a=wf1_QZqS}wO z(^{q-voa}k#(aCb!6Wxzv>P%sd4Tc*74-YlYL>KsbG)ViF$oI?(OHU1&{vKZGD-Z6 zbp=Y!$!ShLDj$=>7t~kPG^>71O{;mAH_xfZ)O2TjetcJG*Hkk0rY4F? z<6j{t8asuq1Wyf6W7H&dkn{_#QA$iPaGo>{?l}Unj7V8t;`zkA;I)g%)TDZitg>K6 z@Kc$pULfuUmY((#dJR+St{ccZ>u<`J=ZHKoBZ(paoN3@SlzkeMZ%1>>({XASh zv96!a9S6~4hp&MJ3xr9bcY4pzrp*gCN)Trx_b3wcWwAYTtchxnxmcaAXlsO+T;2#6GW*VQJG14qtUF3!cdbD-ogiy zsgx!jjfEpIbgQWk`u$WrC1Ud_tWf20)o3&|_#8ABjC#EWLQgzi@AY`-`g(b%?11d3 z3{tYBY(O?9yCl0NlMcwvqX#!+j7;XBIhvM8l)oT@-9!%8^tnu$u;OPDRalQqqIy!M zFYTO_S61;0@v_ED4oEDa4CzAuT^AoDQ%wOZJwcQvP4`e4=rDJR$~&CW)@|qT_X#S$GK_P1eO?{$zb9q*5vB(T#}& zxuBodYBYY2UXLt*?YcK2=EuX6+~i7#%m_z7KJdGl9Vd6Kc*!|Bn>h;v2NG-p@nDw((CCR#c7%mp6y#Ulze4izpox}`)O_Q zWAL6}qvze)DZH|GXhq-V-rl|Ewgvdc!L}4_odEAX|7@=rtOT2)@q9QkF_(q||Qif{o`-_=nWs+sBpzxgGJISrt2 zDjV|EK{-CA3d(|IE;_i5E(I#B+o@Lcl2$N`LK6fJ9cLIRZb<_|O~rwcQ=Xs~m2CJY zH8=wB>Uxa_v?#LDbdJlROMj-my#_WlbtUlu&!pR#4$#q|Z(&7auPPUI(d!Et&ElkEWns^ebTtOAd!Z2Gfx{DDa*13fs zkCJ>U2Sd04Kl0LE@>MTT&5tdO(QM2eOT@OsuEsu!-HFN2uOIUUp&nH_ z=oh99Fqd;h^)764CQ-Q~OtX5BgL+;Q%Im49Ncqa(^&NTyjzStjX@UY+m}(6L$0(em zK~V^))W|0>9)=vv^VLHc*-kzNKxV3-R@CZM+O!D#iox8_&OpmPEv}@CD$^Uxf zOVKaRzx`}S$2{Tk=GFOKF30%b^Pj?XM}*`Ny8nsk`-DLm6&qqNsxmIKvq=O8YMf13Zt5gDyvgn!`wD6At$! zr|Y`<`UX|A&JoJ@rM!cm-8Xk`N;-Si95xSBRG!Ow@=y!&`2pzw4pd*D2FMaw7w`4* ze9-NdVj()L)}fwtG$q#WDqZr;-T zSTm!8&Ah{%$Hj3jo0XF0D!Ob=lgUYF-wma7u&%(Vss3a?-#^gL%+CTU3sfeKQUeX_ z&zjU~Q?{Q0L7cAzLGCOW{_)xY?T8j?wVhx-pecZN3&9NlK}BO`X2~C$b51OAD_u}s z)%b?wU$N?=Q6i!tWHcgFC3E-TC@q2~bk#d*f9Id^YxCY@ArPOg&^VwqWv&^ON% zHzZ*zwNit47+><@rn2wWp^z=P_YC>S%wA^_XZL`F^}Egx+zpTIE^fSi>&lq$A{dwi zHsL*f*Xota)=zFd;s95swu12qtKQhN&|%A7MzNZvQEb>){+ND#&yp3{Me8LmZCrAE z;?e09BjYe0k_S;n3!FeLEeV zokOQ@(WB4P8=rkvkUu;9L00(qtfTJivB7mWmb`TB;Z|o(4c1Ny>&!1YZE&F*Aw4`3 zi{-60o0-V^@{S&SJZ4ippz(M?ry|N_IvuOguxCLh3h=Wzy(v%4=4R6zGn-Rs^RqRx zHC>%uTzA)5kU3ru_1rCm29%{s+T-!gSS%W$X(}2GNt}duAXxA_&pR(UX{l4{q`EyG zu6wlmSoitvOWilRrEE7c=zyMN5m)Zmd_Ba>?$e-(u3UBV?{t1vD6PTsf3cgntqKb@8sfKJ%M9cB$nH7ysn+c$@US6(cJ)u0uZ1NO%#x zMCnik5(9Ie2_w(CbnFE2kplbcPgA7uT??4n^pg3R6>{?1a~$ z{1uaIs$wcK>an}6ZUTvr){<1hXcBiNStELx5tSGgkw+kAmFo3UYm5m{0YdtXaS)gV zku4Do;Yq9{5d^hTVne9{O(bT(OtHJLO(IQvI$ee|l|_*WmoX7D#Vp1pC2H*T z@U~Z@4wSX2NyFNN5qp#lJ?CT>!91`sE4(GVN~3PMR^iQIqKC)I-j)7<@}gQ(!<*`KY+7YwRB2XMCrKJ@3`HO?5A*6|GVAi9JV7I+ zjfDP$cexD)uTFz}1M8)bb2(G+ddQT1UqTx1kWs#*kN1uG#(d{}QWNxv9hr7sTbSu-*z*ob+{i9p zfVE<&QIba_*XG_`)KW++W6*43y&)cbvWigQdk_cDpA*KD%Bs7$QW+o}hAJ^y+b@m^ zXF>iThzf5$v0tiu>d2*q6H4vF>xK_J4sFa<;mED6mzCysMmHB9r4y~K;EgFTCX7u9 zUutey-qO}yJaL&G9Mq10k6T)pbyK%a3pC9vTF6aE%oJg-fwK1r4|NMQ4?MwJ+wW@) zL^IB=?r5MJ_QW&Jn%4W;A*MQf=(u&xT#RYzAtU4mk4q#vA{b@uX=2&_8ehn5k7Mpq zzA2SxNQmHqOamq!BqW5#3$5*Ev3NrcUA>k_lz_!Tc6&`^PG3paqru&fXn+m4aHz97 z@|XfYp@gM76JAcf6M<$J;Tn{!kvVfBt;z<8Yi@Tp_V!&=H_ohDYKV1V7qWmS* za;$~6K^YP7X_2+aoL#&olJA;5+e1+vPmpX$W3~X_e39-g>Eel;$fWDM>xN4)fSw#f z4;h!3BUPwxbVNQAyYgIx1Ye93neyQ#-@)N#ZFTmf%apoXrNVZ`bi`Kfb+JE%k-Qdh z(Zy2Qz%L7EqPl>ReQy8$UZqSNC917SDwCKkOldo`WQ3B)zW;e*v+%o{%QtM)TeW@t zdTZdt7q8#?_&Yzuf|>g+UtYdSNjt{mZEEzb_OY*tmMrn;zS<<8OXK_XQK+^+_-;Y?u_5`hr7!fnf2+uge*FU{JY$ zc17#nTG+ooAB}Ep8I_I{_wAnE+E02K{|m*6zop#hiuQt^@d4fJ*@jt8i^b%om{_VM zU@{n3hEByO=+3qTJSvYus=<{ljk5fQDEFNkr`)u=L)A?<9a%PCW4C*1;~`%bw>z|a zM`tF}m5Td(oH=oi)n#I4JDv7fl{L{8UR|)DJg26{lxu8jB%Y?FEs-LV zg;^}Ynzx)TXh2;c7!apTwZR0}mH@#ZNVG8qi9saSHXv7%D|DLhrUNwb_DG%}VC1HV zi8h79oXjH|!ObsD#>)m|lcfD6!#!TnuVF@5#bc6>uqY&^$)7Pnk;N^sI2NlWgTPWp zGfk5Uh(T9MYO2VZt7Vn%@nNO;l!(3hu#C7OmMCJ%E1G20Sn|6DR&4`!U$DI~D~;$FYXlxbV$jV5AKh=U=^n0{Y;PdLf;RCqRqv(&cN|M>>Sx z%Qj1YPU*373CQyrSHKbvxY)2IZeVl-Ov6ENjx5S7I!-AXpF?)YVpecU1s0vuz;Kh4 z*q(-^U`i%yF*rOmrm$#^sdOlm4R}l@gD-2qqf%8Nn~gPSRI1uUEy=WzkBP@)$Wl)g zWHLpg;w+w9`2xfo-4?4wYnZoz@phi*$a2Vv zO0?hQ=6Z#~jcjL=>NhK2p3PJelo4`N|@C^|z+K7pw!n9tRtR z9pl2%K=|R7K)CqBw~!SK4Jen;_El>9FnS-NNcq<&gUwU-gI7*^=go89N6ILJ z$!<3|Yb+K6-jW+RpUJcRzb|@ay}E@{$L;e*Nofnf04q9N0iS*tfqYJy?9N z=U4wIZN0eSQ)b?vaT7mOd}&RM`8?bg-3U@_o!87AvyRd0o zcr+9mX$wY*-+7B6UThidkJSUMaOKs1rYI@O^i;A@>5nKC6{k|79xe(?ti{QNoC*&Y zQqwtATN^$qCy}7Si?gGGc}esn!&EkZZ+~N9bEkEy@;AX@pji6=Aj&XrY~}Z?!9x z_SSkv7mDzKa6W?LWW->gC@ZJq&JsQu(|jGktY4G5^EzfgH=;YHgSvY%Gn~km5^pgz zyUVyLMrKV^X$SsMCq_mH2_n}eHli|_ndx8&&P5ia?hyf$nm%tIA~PlVz+UXiB+X1t z??9h#cYJrt#~)9<|Ni=w%-XNKlwYaj1_uYWd=2KndSQZQ@MrO3dIwl9{gJTgvrm^T zlgf)L!y)jiaa4CbIxc)Q;Lj}!_>14imw!oKJxoVqwSt2V6))2vdcB|pAL9??$$WQY zvZtj#q>Kca@qM0yAx}*r#2KKcwkBc1!fp?rLdl4tnZ-+e9NzgvIn3fyl&n_Tq9R0J z9F?x#u&OnIm%#Ahd7LtKhG=t zk-Sbka0e2B z`2j`+16;ErV6z1j%?y)B;c_m8%_dc%hB#Tc;Q)>j4FSIAZ5XZL_>-$9ME;_TMy@ua ziXBx%(_^JsREZ4YPi9lq0HAVABujcYrK${^u}u*+50e+Sgep2#pVw2LF|MXYY+M+S zMr*+fSA;)fo-Y3M;h(_3RB>eL>pw^rpMUIe;X2SC1ajfiZ+u(MeCIna4o#@_XHq$%z?Gs)Qet-MzLx*7S@f}Ivt4o8I$H9cKeq2}`t$(gW-=O9qEbPP#iG%$ z&CP666B}m3HKrg%wavx-d;?i4wge49Ltk$nbh#7?nGE`T5Dqk?+VERhd-?9}NF8SO zj`q%JZN0C#AsUS|-4`LkY`78GcCw(+C}g54l?-(7`U0guPUSwueF}>22nIWPI>@WC zb@4jljZ*QZX0b6z**F`mg*Ka2qEo5vzn`*-iB;=qlvnw~m{+_NW$+&3m=)Zxf~8hK zS(8?pG6Ge+$!auOo8k=UzS;xW9$<$(c z5}XH@z%?K*b>T@<9*7~cEI3@zU#Lj1iQvYnxhOU^!i8WhgIDjCWoS-RixK}{qi1>f zO@vK~u``Etk+7*YlM%c4olGV7Pm}^`I$hc)E#>`XsSbFL4zaG}FaKYi5HqR;-e)#^ zQ@H)_AeHtBhdwC^Keg6@*p=U`xJ<7W)Zi1mN=MO4iif6(yNY{v?ZBHldjNHZ`s$Y% zI6?-eR%LY7f@>TuHGGXlYF( z+T*n@mm}8h5Je-}Q7PNro|Wg)xL2hvh(%?wcR4osOW)uSxWQG*GcYU)=6I~U6 zttE|#KN*PABC@_*iDEVF=F;frF2p1;yr4xYc0vDyOz$7*jbL<}61-JBOXoijKCm+M z2AX$V75)Jm7Q^0tv5{DpMS^t;eOF9m~> zV2)a~RnN8TF&TtolfqNeQ={wPL`?+z+jg*7*tT8hx4R#1bJ~lCUsW>n;DCG?&4s;k z!6W)o1@Wa`l%w@h^T5ZvqF2YVx?X6^pCi-I;Zt+!>XK2sQqOb#pemJ81)(wQ=Xo;r zT+A!_`i!|;GTGQdEUPEeGsoZ4ys3v3>loishK6b8qF0Eqb&TZ?x zyZOrF=4-H{t-Fns5T%~!$%4%>Cy%43PGip-^8o!yDwxkV_ojQv>l)LzDT{lnR5qEV z)i9eyhc`tmvffwjXml485=`NCEDha+0Yr_r4QbYQ$46@%Y1Su^_}H{V(jDUYtKER@ zMt-%Mcl+|)*spfSgQ1|Uq`rs#i#%O zn#6YlgAEm6a8=`2q`!7djS07abRYJK-&jhkzwyvGt?5BHg0-TahXJGF6S`uL-xyH{*qMt|Ms2LC#V^UO(Mf!CQI^ty^ay~ZpU z)GndTQ6H@bRx%fz6p$Caaq;4$&~k;QneIj0DsW`uf_>vlrpUI!hq8C2&xoBpYA*E! zaOoF>EW)98S*>PwEaeV(6!**Kn~g@D8)O5X7F~C&n-;QN1q!ODmS2*Gm6^cj3C4bxSbpk*2WR zNDoBy?b0)>0;r*4wi*}W8jblrLPwzmZUyYH+vj@zFQ$ANner@&a+X+W6B9=DJu+dt zopmGk>2^EwA{{I>hrGs0Y#DiU3*;avw2Yjl#9g8xih>$r9%bwtrT6HQdSuUfJ=?>Q zpA`+hm9Ikv@1_zIy@q>%dyRuh4!C;~J#^cRJjhcCt|!TVb=Z}$ebn`{$_xzsU?fd=mToI+F zJrCzAMZBLMe|(U;8uB+1Y)}E=6G}{WSOyEPNaOq>Te{dN-peJm2=oYp)%E zg_Ya3F`MeW;D3#S-Ei+Xe8_5Bo^{v@-+xa)3kH`d*3oRp&%6g`cfvPt%?Mlc8=_Mr z%I%?+pqO-+j&Pa&{*Hlaqfu?5@4N4Qie0>}OJ=RwD^@dY zODaQZvOro}m*{g#&Xe-#qCS_auP+ym^5L~ApGeW@kGk(Z(-6;ShOAsE!7+8~b9sea z-Xm%2A^o1NHa@Iw;esfv9&UTQ?Nl3+k_6fuj<$d#CDaYra^c)SZaB9YnQeK>jN5{4@4l+A??? zBPbbraUwB>N3M$8$tfb+NoW@<+&%%Apzkr)_bEOY4VV7Se=5=_#5v%n7}Cgil|bnE ze_0fzcU1uUG22SgA!2x-69@MH{-#9 zCTr${5BN3nV((T7yCXXEwLhbmF!DWXj;#Lz_}-n<{d7|}zMo6S=-5mMcz!VT-7H+( z`t-KdL!*6PZ2t1nm76#3-?*`Duy_C4-`eo-#Gn1e^s+3&@ylsDJUF+UzV#*wewHj% zY@ih(Kdn4{bjg<<-A`{^k#F0$$+&;!MmD?Wxm8TQf78xoyO7T_-<6Bs6g`V#{veg1 zvM8YbfU9%IgKD|TXA-!%jwWQs(cl8Ls@oTkXYd4tm+IiScv}bVF|~pF(em_w2dDrQ zMfam%<#gkM?rvmxKLvTJlWGAEoXvDMhM(Jb+e?wY9A?m&&x| za&4KEz?rVh1Ujk+w4WnAb`B)baW@$U>jnufnpbt$I>H?T9m5@aIz$~}!t++md=;ZIngoaUQ9|5YjFi-|n5Mj9%Il;u(yz4s%1FPi7~$j2 zDl=d8NXUzn6DYBH;sCDk9eefF^&{ zt#|q8mi`Cnj$^ZXkJ0Bh0NMF1)3EKs*EW6p68-0H7q~Kxd!plTx!Jsuvsnw@dc7Ft z`|1vjLFL2*xXnEI#V;;7xFriG-+05c{>2l!&t87*N;V3_X+P&Nd-Nuru>d=NS%0pG&2kei%avy(=7EI- zf~As(Why}z!z}iMV-4Oko*L^?RheWsrU=TFIhnJnO6FEGMS*cn;&!(!Xm0LF#=Krn z6BT5G_8?Qm1obrp+ov|^F*TevVm4V#Ja4r1?xl0Jj-0i}a~^bH&ix*g*!Jku8Z|DV zX!BV3hSdN{Gpe~pf+0*|fN`%>6MA7&{~|J#)_+f~AOD1CBqzl0v*ZVI0B;44<*wx3 z#T&w{92TI6`jLtH&l6GhfVHRX9xj`0!-lNR2Xajs0hPsJPc}$V_uy}1`#f-!cn(&D z!?rpv0a481tB`RP%Y((9ZHa9Ekw6JgI46no$m$A0eTob=8rjQ%;s< z?F!cP0^#{F6N-+CC2k@)SsENDzCSj%0!jcYKxEYQ2A+F^1WkHm+M+r)Q>=gUyToVf z-=$rGpMhr*%m?Fz^f-JOn4Cvswmq*FjtIL7&x1ce*#Ypnz<={D1vg$?I+ZEBKDzhz z?Ma*$|LLEKWRE^Nv3@T~8v46-Y-c9v%Y`(55#2NUVLCmlzX8sV?R>F|UcPVNwNdy1 ztC1ZPDTKiA58sS3Bgt0qR54MQYHsge(%M$&d6AXjN_j6m+}2LpPlE=`s%1tQFvi6O zsR1y<| z26>wB#ihB%d@?4+af~Ve9+ST-r^NwRt2`Eyx4Hsiky@3*p%Ge!ISv_XPDB{kao)=e z*dDXdDx1yLZbM7Urmxbfs z=RQ+`tYjjZ%N0IVi>w&Gq<9&X&#O%SUpj-mTll{RNrK}~Jc&nLz`?@vbk_}dOTp56Y0mt6__y@7!WcLRUj%LN zdGPx9?9icire|LKpO4eUb za%v%X;od9v(yA5p3-7g9?p;{FLM4hevo^aeVnd01d-Fi^W6cc4i=ZsJnQI`rtCp7dZ%WOd zaFLQ5UsC96KIuVmnapJ|pRF+AO@ipYlU$nLJyOLxv0^us*MTqX6r`hsfwm>~H$J=8 z|9>rxQn8eem&)RirCXd*=o~o265mew;g^54?+zSyromVKQ21wh%RYLnaPHkdUfgux z{r4x{c_;rMO)uX3eBV|XyJh@O{+zzUoEfz{C+Ca^|jyZ+PQPrb$Y3@5&XQkV{CDH*JNyg!upp*0>R** z0xchJBMRE|iNq49ZA*dopf!%r~s4TC@ODHpnZp>ySRc1lx;LLe;6ghAeYh!5_!;V^Rsw1N-#))_Tp^(Dm)usf_w6Kia9(`vAjNqzbKngiWiheW??FFESKha z%0oR^TAmQMl*bSO=6);j+qxO7g@S?wjnExu#!fJ6W{=bHvv3;p&>-h8{2lxy{OiIi z-U#gg5%|vIm+6;hw+Ww^{l;OS1qtETG0)Lq_~t>l75@Gwy=!|P`QgyVoo0l=}j`0m1y*lNKmW9l*d9NO_0=#iJ~-G zZG#mDwKm2tmJpd^TYWGXL%(sIpDArmo)W$wWbh#Byqa_%FvrM)5iX>iho4E6SXE1>SY4Kc zt=LaXwP!w^B5cJ(UcR|R=s&Nh0E$Is7Y!<#%`^@di%N*4DQC2SV)P9COF(UXg6n41 z|JDkB|M%dFZE<+)^}m5X@@K$(7yhj)mGRt}oZPuP9^KkD`Db4iI0`o`h4-0z!SmpF z=&ye`QTQ30IQy0UC6hnD_-wZ8N6!HV`0@XED9wz2vYLLl>t0WMe|7_NZI){9p?5gWD41ob{;fC=I_tsaWIK_O5%FGHp$9l8i^z+O!Cs!?cT?{wAU;Yn!Sv|&d{{Y z9<~qLH`^b#pR$Ya;p29OvI8Y!pR>NR*!arUg^7UfDuEIY4JuJ?vh`D?ExZwx0k!2( z27dbp%-1+ zsS|a21J4}U1TX^2!MHCTIi6}^d>W1$vg;_gIl5R{pCbq2YmU;qp7tgUcUN#cka{` z0Kn;oM{>)+$78bxHWoH)8z0H;JsS5Pok^_U*)(F2p#uceu&R;g6z1Nukxv?Lyn%8YKG&lw2YY>r^6Ib}2{WHM187;G0Z zdJ4190;9>)#iCqc`E)0%(GWJMRcAdO2kXEoxs&R^^&c?wZ1*B|(a*qYs<(*FUG;2F znoaX;QWiX(3WhkD8FV^(TZFAb5piYRJ!Yo8v9Z6o^#UPXSLQKD6({XF`g2LG_gsFGH>0KAWA$AWe%B( zzmb|i&>tyc9Umb&8tO{tN+7&Ekhe&y(aaNM@yOhA#jC`iQu&{!vnpSgJa^Hv&#w!k zYrdus9$rPQdIYPa{&&j}OQ)8Yib|r-?rNf)pdoxKMIA}m~@v+TwLdxyHlmp(lHwf(!dy$;{=WI^4l-xBu1owk!d z_~QxY)+`Im`%avWc1_TIqbIlTn!0viN%vSz^dr-yrw$aJgU`J`In@2bfBoQWy6flv z4np8-_x5FwkrlSD{-1ll@l@Z>zIXWW*2hNSjpq{mPXhJ#=@(%R{vAlrUpmmg@5Qx8FVI}~-o3eTw5~PqpTwVtzK7Ozf*PQfQLCu6)CT%rxqBq{-6y-3tY=Rk z;0`wC^DDylwhkojUEGhH!CxgN@faxMGA?8BH8 zW<7O3c$kXay~W95>+SAgAY8{UZE39MLFS>s!Hw(i%3cTZoQ8WS@9}u=zdsRZZ1k;k zC(Kx6mGkAD=5|v~l^ek2FI5ic1-S*>gAY8g{^5t#J&eAnWSgGV4Fw`*R%WAR20O9IHwK4`b$%NzTkL_n}p}SVO>_cx@$#JX>*LoyiA_#QLfr zsAYmdpO?JQM|nXrdSM?r?xp%b0<+Whw)fI{rnk4#ZtJo2WIMCurJYn3#L-JlW%uCB zD}0?sW2a9cU>75IAbOX@3@5b=i_4F!Xfd-G|4d_kc=c+gxp|Pn>QK}z2G|)ezyJn! z^szWK&qqI3rFf)NY$m|aB2JX-fp{J9;nkd!T%i04HSXLLG4`oIpv;?+Di;63Mb=7m z#q(JdT}82TR9VW?}`;|GW&cpRph8>R+nc4VU@`1pzQ5P1dTGf%|*A#djTOgD%$_{Z&b@L}K4Ou3W>!!6nG;+u3zs{g(B6-v`Ev<7w`|OMNCI9D=U_Hyq-+w@>v76-&l^P>Mdny?N$^@YEXoVGRBIOuqH1jOTbIBoS`12gGybF zwa98IEd9fI@{C&m)?(E$F*R!O=2|FVqkx`^`v?|OqA9Gb422wM(kID zLHLXiy_U}gQ`lg6aN4Jn!r#p!2A`i2QjCw*0IH3-^icEB)RuAPY53R|;Nw6>cdm>S zUWNY&Zx>F*yXXvXz`uMDepR@3_S|x?6f6+lb7?5I?8V#!${PRb#iQ%H|Mpj}z0tkw z>3;kMyxU5q6*{($f=Z8W1d$NMtx8l*w6~AuxqV;XT1q*_0_0c6- zxn$`gmun$*VKDx5zD6gl5>=5ygCVW+V@5@e%_kfEP4QqTj=mQ7Td?dlGL39YSl6zj z!=iT4fQV7~2mHf+M$XjfME;f*zeran)KKNPDTVS?xg5D$7Rza~ZB)CxJ<`6VeY9OD zXWH9ony5i~@+!KW9-xQmJ@jMrb90v#Bj#rm$lqk1lSHtxwkiBow#_ak>faHIyJoLa22+zFF zfzyHHXj`Ha{BU;Y@PUmR(!Fcw(_5B~4y_U174#pCvoLgE=DNVRrf?KK)s_V&+RI(M zI9m9_>vVRRVjcJp{Nbw)^bHtv}5?wUw zQA!K%V*l2=?8V;6=~37ZFTo>h-$v(KH^ES0Bb?xJU?rV9j{YVgwdrn+_L#RX#c#8DCm^QcvU5gV&vIcABpl{ z*diL17bSn>kup=qTy$00D8jXKp1xz=>@Pw7lt zvxz=)93DJQe@tJV0%rLBU25Aknf|ryV}*3#DI(=eF5uGClK95{!@__6;}a(@3U`7F zuzOVj-I&8!!xcl`0#_xnAl}hJFcZw>;OxT zvg0gGd4PPl0jL@tYxt<)Zi7I>XjxA~gNM}$C{vY@t40|-MS!o>`2k#cW+{4p&)iYc zFtL?2Ovw3;l}1MR&N%*8QI9HtzbcxCa}kN@cNKsyLO0sXx505T9V1N&XJ(7+ZYza@lQY*Q*G}4flOQ;|MZ9nJY5L_t3XFm~b|Z=|UxNAPzxJ9p z4YDT$_L*z^MUaWL3v2!ujDiOb`$dvPn;=VKKHJZh~lTBSy% z2IXK%rX4Tyc9cnWL}Rhm1SZw(T(kg>a6HSTQfd5hR|_XLc62f=Elg*JQ7p3G<93_P z61!NeVt|5S7-1JW@5$%TYLtY?m}znvt@-BGL@VjUsR%da$RHQOY8bu4y{CGa_TI;P>AHl(O!f9sW=Wz>6j62IVOM0+*Sv zoVZ>uG66z69gRjJP55V8@_!%s=g4m(%nK1f?}?m>(BVjXWB?s}6cOV7+#_fMD1q!t z?6~v#){g{M1u6~B$i9wlo0~85n8RlEd`j{P1oa$Rp&Zr#UL9*L_`pa76h9PI(qbqy zDS9sQ0N!mXbG#zht3;0*D~`JIs2ZKCNhC&D8WBcyRgC@dkx5x~M@;C7O7^`}xNLmp zmGSf^W4M$3gKtU%-~7(lzyB8tB-i1(?ylE>DjYiK@zUnP$u@=thrw6~?uX~;_uzYD z@M7KL5$-TBa?J4QB!2K#qx z12RE&pPz+0;7V`;esnIBxB!;j`Q$Q4zl7p;C;YAWx@ZCAz^qlI)|v)?c2=o0nW_ny znzkvZr4tD%g$wd>qt$BHvwD449mha_7uA5LRQ-O5Oy<&}uZ*bq0?1>q!dZd9DfE#L zUc}i^h9H-VNZB48lVZHejzS5$-AdDD5zgA$&gP>Yv4=#{YH`@>^zzYk+?g;MP0h`E zkyb16VVXcLh`i+%@u+xQ%-F=B-3e6AkDRnh?DYAZVn(4dffQrn*!rA_r<6`}?))tU zpcD}Wrx;X>D#jI;6jv436w=d*TMD{eF`#%%!6)PULY2vq6S=OHzKoJMMZG!E#hxzkhbLr zRAAM!>SSXrk!&!V)e)nB7B?fCnzq~f1f4w{=mlpux&fP&ADLp3ljZ$>k4jUel~kM}ecW&<7 z)A@MksZL3_v%PZw-8t1Mq&mTXb&r*{TO(GQvfi@NVPU&)K*%(nFCu5#lLN^sN#=zl zpptA7MRM|w-gP3a_Cbfl@d zs?=w~g-^A#i=44V&pj{FFY@jfik!s;!a7hCbPdnJ&5HuV^SYu2G7M2vuQCu%ED)9h z%qG5yR>5phkG*dlN&NJNgb=+TQDT%$tXcE6_~Oiskr7(3dhG%DB;0yixPENr^ca1O zF|9lKqe9#R;ZL6a-_G=JPW+&!aKB)1<}`oV50|%(eSP*ln0@a(a1mzlMJkiif84R7 z@Q_mFURkBQ``gAg(e=XaPzc7iZTtPXFLm^B_kH8&noRcouRc3NZyLQZI(zc(#tz^7 z>fhATp()rmMS7|KDmsf+lAfxiY}Ehaq-r%fgC+}Oz}Q-e)reKk&q)M2orA_<2#tad zPGF$;%)rF6;ixPFmd7ktEGSkqSPT}mR6x^J)m0?PsIFG2@vIs5Y+fxTSspSI>421` zq^vX|<)nksQR%pJN-EhRJuST?y(JY$i)JF7Gn3D7Q;MY_?hp0JWA{k`TLH7YV{$gyjt> z5gytT2nYOPD;DiQrRmBd?@9RJ2Ce**0Nb>Uy=P0hZO-iTnsOn+OiAa{Gio9N7J zIf&0n=>lg2@*f`S?gO3RYZG7kvS;%bCbn;xdHoZ*YeaeA(1BZE`%TP~Y=rNMcZ&W3 zS+*bRht4r2gI`bQdU~3OcE$2%J38Vx<$6vLYfyv&$|y;{^ox3ZzTRGqM517^)w5vv zIZa)i-i3uKI8#$=v%N{7*EBV0^a?@0(eLlN;3Ft8` zbao0fEGrVo2m+uwFOj?}11cE`iey+cN=7x}U%`;KSR9U9pO@B6qjYY7pEL>(@}VN7 z6_5HYQNNTrlNA*>QvAbV4L=N5;^!+7evqqT5JN(kC_kg7F5?S$x>wBgn&K1uSTXsJ zmXdzbVByoh%32&D?@Xe2IEKgBiVEC#qzxV63V?<$1y)r&31trD(W3v}i2q3zR$CXsb08HJHM& zicwt(l!~cM*coHhuQL3a62BE+3eE5ucm*boK@WKAZs9-r6Ld2$&HkEMcZ^v#`;VXv zfcOyjB1%cFkHK}|=on*!0_g1xfq$f>6JR}@oG3hn`!)*nsofI&5G&_VFLOF2`ZIOr z+FD(W(Wq0(bvmhBuE!mj@@(uHu9_2xY*w?GuBjYY&2Z{`HHAJs+-p@)HEMNDc@{P^ ze-;)qobM30l}{ePs01SA@CJ?(FAxOnkNd|1lzZ4AKx{Bd1v9jiSLNMkD`M(&~XYJ@ihbj z;;_vu!&OKVBNPH$!V*)}n8L^;j;Pg%NX%?@dmYv=5&GdGjUlhs=L^&mc~ndv?56BM zj7@=WqP!^znk!x$Ate)zsx ztyW<60)>S7DafGj;Y2ZQ6=oH7h9&Ki0SO}^Bf2~;BUWw+S4_-RXxdZ`NgBf#UIacv zG<1`U(uRLG*OMjm=xmW{?=#e)YM_~;OfSn_V9Ins3LZ_hfed}UJH%_?c69+g-N!7sV_&=F=ozQ= z^6uB)7p|R6fPS#|044=J0M8DN4Q)EGeCC=U0)PAu%PGSC`JX7~#(tv?eZnD5uhDqq zHOd-`3%d_%Rh7u6lv|3$zU0zP<`O69O*v?xp=hq!Pa(w2sZ4>+UtqU&gx&by97)Ao0f^TN97UA+SS~-SCV#f-%$KYXl*GuCY z&Kv_vRv$jOX^ij-!{3XKqBUuzny5wKpExDUa`pC1Z#p5YVQO<2*{jHLTt`PDVz-bv zvei^Gl|&zA5-dNHNG!m!DBUQOe_)!ar-BU)wfJP#f)&#g)7{KOB!uIHYSioRX^dMe zbv~ypf{TtEx`$z0wfSyBOut}(JwYW0ljF&$q(IIjlMOW_Hx8oQIF3$PJQxouYPgQ` zMB|O)+M3g8R+RxRCexN{!;k9ndwM}{F6^Uxs#>66YHOo@f0R(tmuPlO`8vm!bHLB4 z95x3AdHEdv7>J zAw5W#URUvAguD<*8J03nQ6crnyqSGm5hMmgYKb^ZZssGMdBc?DsW4)QpQS1L9nLkxc3)3BA2L z>7k##w*P24!K^kbWXqPkar|k8{_@npNK~ZM&cY3AqXqZXW$-#M9Rvb6n>uiK!>)}7 z*X%b5p4@r(*de0{&d#=N?cy3vOdZ*N8`v)lGXDrNU?O^O$1HvOwf=tD;D}y8NBv_! z$)v6x@<1i%0(>HiY)aG1F0X1 zv_@m2vcXHLi5gC8L|-b6$SM{v%32lnJuPVep;T!5QMm%122A1E{A@n#ZNP#c(TGW7 z_j)x%97N>>D#kkpcfpLoQd;GubfQYvB+v7XsV=Mw^J+N7D#%<7mavu zjIL6yjd(JCc5lv~6^nfp=t6R6h?O=iz7G~FcSHCvE0rn_5Ea24#BmW3)uPy1iADiA zu5yvM82gHE^hKcwzBCE{t?>Iu4!jBK3qfW};pU|9#$@3pv#p>3Zn%ur6mIgDnXb~Y zdP&z&@YTYf(_e!>{Up}Mut*Z03U4*#C1dmF5N8$R*&-nVg2%tRP#PN8_r zhVrpa@F=HhY{zHVgwC)iqsv;cd$M65MJXn`h#nA8K6KqgdC{v@6rtm!;9hB;_&!v7RaJH?lmgL&U{Qtk1RcId-^(mY49fqV?{G({*7!2*>A$6{pw(0m(- z6>X!`KTR~nwDX)0Pw0vxc6T+=>=nP?8-+^v#w0uq8$#XS=U{jiGTSDZ-Lt;~op3Mx z<^&v^n0W_9!xKXAH!_7H9iPaID7D+UZ8BB_f1!p)(c2PMctf-f4uaE`CEZVfhYOF< z+u-3#nZECU;MlcmWANv~bF(+rZKU5{zxzuM!y8Xcx3$rO-HP3pC*ex?Rw8vBY)im3 zcz<-me<#{}SSJ;2`kd0I)cf#kibJWFJN$gG@2@Ap{>XD8hb`D>W{BjTN~CqWo3zLf z8zQxgkvI`Gr?pt98h}$LL(EC?CgdFiVn1(NI5e%-y0vbVN7JAod3}U90()MCY^c2f z3`BscArfg&F_f)VWdK!_0kDjrY#=T34Fu!vMWW3#plOb+CPp%UT)D*7Qf#NLT2)qB z$955&BPmkPb*9i}WT@DS3`HgNDDO04Wn9>Q>o<7YC=R?-`Vitf-fRm&Cp*4m6N zbb6n4>8)ZiWrspeV8R;AXYJOoPf47Gy;`MetkxTiA?)b!39eREqX*4u6cVWzI>c`Y zL2ro1oO{(gYU4Pc~vC-b1esx~imdDSk{&Ny%e!dC;y!(K7FE zRIYXx3SV62B9_Y)@-mdl3{s4lGk9}mni4xaOs#;z!+khM8lWDdFv{x+`pb)hRB8i1 z>BLv+N>Fot;M6#W{+Tn9t$_-xIX=DMvz_z`Ge{LJ0UZ^Mp~QlQNBeMyQDRT6ch@-> zym_caLWjG)+;LpPEIY)kDb%9y;5Tva#=jsBp$Cj^TR)zy@+3)}M&i--1VQ~LDKl<)<_~Sx9t|;@o z;dq7r0A=(EDuYg8HLGRBUWTo#*^>!P;chC}#;1Z&f;|KzoYS>hZhmjW~(5anW>3i^T0t^1^tj zlte+;y_JkyE@`roP_(JZQe?S7+f6VOq9Qt8y764zuMq@d=RxFb-sf;Suy-)$J(6{j?E{JFW1gACDNMt?P#LU&SS*prLw#Z zSV_}3Rze!!r<-~9++rYFVxK8fKvtA;%Sw(eJV#SKN4W8+SQJyqoThtWA22{NPwIzPy|pJ+S_CZss*XFMR&JWr7<+XGT^(MR*_KZ^a*o zzKOg=ipo$NSj!oVMy*0DRto(tR;i@T7K`5&bJ>L#z%VbG-NNyr*%20HJVTrmed39oI6&i54UHH6)^ImsTFw&xGv9*L-7XMi%BDcqWV z`oQb7?BWx-hK*gb7cOjsH-P;xu90MR9oo2S_2EtX%%Tm2KKg8-Pqc7W*>HAz$KKsL zH@vcy>jNRWyRa#>VWe&8NXUCIy%UUs2spAIjKeMaA&l=jzV_(4nM;B!Jo(x(!3g{i zt_6DdA@aIf_#eoAzE4@HBxYTq?xp3N*H))@d4IC*Azd$MG5r+*M@Z#^ptvnWa!nhu4cnSsSpY+pK2C(|y7 z$z=D%YHDi}Hd}qb?I4QnQZCln-Y#B{u;Kh$nolHj9jyzx7ht_YWj>dyOQq`Sx(#Y8 zW#x6Ql~gDk77U7HA{nI+3<}VrD51F*D1`m@qT}g&L&H4*@jd5BRugY*MB9YliJ2%; z&*tl0gXiy#a-5vLM>V)-kUl*K%>7`X|MC92{mf(ir|=Ec59GsQKn?bbT`qC|ASJBs zO;g=$H`mRuOm{3+TQev5ayDO6qbtj{WTx{(sYO?z9#>4CiQk$d=332nf9J*mD@OvU z;?`Fj7UaX)a@12s)6X%A8t1veO3*yt!76gAkPQ(_hhm=?RTpvd^MLaukpmP5moh5i z6!mkgj7bNwbJyqFIX~7zw$c)Zb9FHfqsQsaDgk_TTo4+Er$q{STj9-LgNIUn_@y@= zD?n!h_@^%yZWQ+Yc-;)pkKts!f9sk}D~HCuu*WQXatsW?C&%EiG58Y5jDfXp&E95| z`~|cu{6dO;z0i=_)IIv2O}%}OfO`0^U+M08@LzxgIKl3H;Ca}!4}QY!+_my6>t_B= z&;bws^)g}V(&!WD-{^}k!q5?T`v~$j_PdM4@1VU`O9iP9ecE*kV8i9AOtbBJBbIw=T&|k zPPILM|FQkMr*IqMC*KoE3fBryuwe>NH@3rD@R^+#w`z=v!DSkw^L;pbTc~CQcV}$1 zH6lad%#qofZuh#(#%jbR=R!^g__o#;Mkc%$2rc~lmT36j1zf*Rvv zWo#RBrD3%j7*G<0t_YMergmk((kbxt6n&=9&-8t=O|X^L>@HlM*`^0?kHSxGhuZ!? z@1B}sUZCTJSLqMo+vD(+iP_vidik!x#2CknZGtynPPJVED+{Oj_~s+=4bekXH5H*2 zP`z|L=MXMjDDF|CT&Oxm`E0Hj$~aqH?NYJWS5>7_F%4a~T9#^UZ*RdW6dhC#779Q? za&>h_iV1e}$atm?E$4_Kt*r@+%}4LE*vSo9zGyqD;m~(Q zxwgT~-;dO9slQZzwO&BDPO~O^uAaT(07T5Xz41!pyN%3%1%xe|Ef}AC*CHIZ01Ev# zL=2pPku&uU(1>{OPfvRrmFJ5EGVMJ$uWgiQ`lF01-!QO6Rq zS_XqvoYkAFR6Hcy~j04%9MQK>o1 zF@G~$%EGbRv4E#fI;oU7D>@>0 zAFSR8$DYb?+d$$rw6BEQZ+!n5-2L5j*C)P4v>5%=)oHWSX*FZr#Rs1?62ZmQyx`(m zPHyz6R1H2)eZ2{VP!B%G`AQm#$TICHFv=pwC9})yCTo2?KM_}tw6k{tt4bh<<`SnztcWfr9fjgUprnFJ z;_#A&VXQc06H`;w1`2#uewp8+>a=BHLV@HY_{z*7_&iK(1IzYljf$m18ms>r%zc2u zX5??Kf(!y&ot)^eX3u~c5ZeI111}bSwr~67wB2-J;+JHSY-Nia?bJ$Qhd`ETZM;4kZG5fe4Sm7@Rqg#4f?G z8AU$qYFo{k^Y#Yc84(ap_G0##@rv^n&6NT6yOZra@Rc$1(i)D&t`G`3{wJy?aFR(XIXkvN&uXU zK+veulEKMZBe|hXIJjAn7t@puT&cZVOJAu4R4rFKQp;SS0Y$SkM~|SS;53SURQ^4F zTBWO{{eHSuCs2kP0o6F#NVAP@l@GN027H@+FZk~Igeu=Kx?!prA1lLcQ5h!1P@*(c ziABYx^GdFYCB!imLw!ZM%B|QsA1T)acvYN7)UgVT1ToFkJRCw@zC$VuvC`l<-)gT= zoWEI4uS#h5*qqVMSukHfaPdJ@#U$6>)3%0F%qAlRa>b^L2e>h<`!>#aO9IO@WJ$hl&#Dz%7Sa&?#op^0TvU2I|^?x8dGBe`a zWY!`khd{C;(P8DrPKFwxc*?`vQ*$& z;8uV!Fo9q&)<{{GE?sQ*CF}|8K<~?Y>=A3D)o!;oGOh&+7A;Dps8+6(mbY>o`rA~j zwnlHDSeCW3OqEo_q7bfz)kuY$u)m+n<+zp>4k!NH;>ALh3#b^EODHrGFHO@Ud~d!& zDVhiYm$~ugL`6!|9G6Y(FIJ;{6o2v0mgpDw>7E#SITpUmYkuFXXkWrtTfD6X*j&d%s?Wk>LOznX@?~VSTs?(!PAGpkwCu(t_>6w8wh69!52p7ktp!j z{1YjA zLUge2a6tk`<6Va@tzEW$*_!^`>LnZdmL55dBDFun!RX6C0B>I$hoM(7T<9d+4L{E0 zfD$}CyT9+fvrEqdN&LdB-TKMu%+oJ(XI@XAzS#D%$iIBo#`Rl?%IklLuZzA(IWa;5 zoZu|7Oh%E`v#iqCL^BK?+|X(zO-`5B?{7$7z`%^Vx6T>OR;$SLQ*_Ts#ZZVAiMWut zPP^SsBh!HK80RFC_OK^OaB^IO-|IDJP-2pcLXJz1Cq>jf#8jGlN#B$o9~a3VOp1KQy`-`=w%d;Hjse$bse z{8zvL-hsa?ybhn}PQUW}G)T>Q=|4aR{6#8r2S5fE-l3Njp4tUp1R=O%<|dB)1@QOc zN#u(|)Bt##(GV1k)gx~ZnNR!6u2-5!r03xn8MyPd~W=CVONL=Xfk&rw`g zYa@}<>!Z@>xn`zGN)qDcKFTIYs@02=1L1HJet8pE$w|57J-xlTf$kiCw!0b|!`;oz z85%{tu`m@3c6Y`yF}^{>WxCN9%BQf^x+xD9S|11#0eAO+dq5T_7f@526(z;U#%gM0 zsy^g6`|zDU&S=T?^(ka{m&Zc|N+oO81%w2eYs$B^F?JL^&=GVsPT!&hThJByhrDcz z5arCxY?raOJXLRLLXuBI%7^nA7)n##C2}lvY5ZWWuF8)&6-jQIn~P;tUIM4oV=9l? zm8P94F!q{iWM#a^#D`*nZA>PrT_yHvLS}>C_9>=PoU+nST|RNRxtUq(HR<6STP9_i zXVyKzy3OB?e{l+qHl)G!@okPXi7)K?Aewl8(-&Oh>()gJp7WQ_d7HWH7VEfDd+f;N z%WKxj6c0XnWa<+0O%MUs8y^4K>|1atJR|BIL4n*!dJ@v`Ew~TfYRdo#Sca0O7vSFO z@Xl2(arv!xK<+n>JK=ci0`TU=;~_uLfKlU@{uI0j+xEj%?z$n)9h!Zg{!M04ai;Hm z(IT{=`=}1Efvak7ZE6lhn|&>zsNapjk9Bxp?^%aKfC1s>^i8epj2A!dqf{t<)%f&v zOhZ*wXG5*U(&6_fi3sv@Tth>PzqP~9kKm~~Hh0i0)6r3{rKoymJqbcF@iZ0>@cCK| zf^;YxB0F+2oFMemEnHjvR4a&atS#3nzyMc4t3YxEV<2r#TERN)&WLl+IpW;n6j4qN z9gaH3otK)o&&v*9T3wu?UywNi#TqzlTzZ5k%%syCSJ z8oeTD0Iqte&ulm9*+`lZHnlRi(|Hy!nYaWWNcAm^3ex-rQd3n`hbe3{)>(aoe86P# z83SRQvpkm%qd=-%)=oAxEacKs5=X=*n5~jlNd+o#Tukcsk+_#P|mDy!9RaQ~FCKG8H8D${KVp@vR^6dT5IXeC_EQLS|AE`8`%0#?0ND~Xp zHP+`FS7l?Amony&4)a75%N=xKv4dXf7nRcQ64NqoQzaiJ5LO5q`)IX;K1gqcG=T8Z zgdj5kFQFrvUUuh1Vc*g5J9pr1`ZT-^;l5om1$+vg7xn=TUV;tyn$egtwfSFU5$;|3_ugGqP;XfXqf>F#Fn z+c>KMfHSaSrBrWXY?cIjs69(3o5^j)b$ z&Pb&;gP0W)L6cfujhJKeMuC9RQYiDF6%32{k~3%WW->rg1et1@=ahYlqq-&bt3c5- znu}o*-{{60S5cL}SztPGqKN~4 z^E5qM5TFM$%=%CIga94|zr6Kgwijf;%MFM3gD2t8Q5Zc6=_7c~DFojYuNQ?W6J_gMQjwAcS8dLrk5;8q z5#a#b@>cVc+o!4lt*W+FhpXSM7ATo&yI1bT&uH`LBu3<;@=J2&mK?Op2jsN866=n6 zc}lQ%iol2FIF5@=;LpnO5`b6{A6C?!j}@`(Q8F$qoP&F*=cB;z{W9r`p1~sqZx=2& zug0@`Lk*(U?;U(vrhR7PuEJTmuXMTdYr3WIOOc3<{+8YaN8rtD?)Cv?V&k}GfkSZe% zM?@(F!m4DPjpN8PMzLTmCnbhz2zeFQ6l%DtSUl25HFAx#iitPI8{JBe#~d`7`F5Jg zRAZA$tEy@U`t(em3KGsA5rv1}(0woNrlEx>4*^A&cd2)+m!U#lZ-`>5AGZM_Dsjce zs2E$doBxJtmKA)=05^mF%Db0175jhadKdVnt~*_Huf4Y()^qD&NtUdqWm%SFOO|9= zl5KhWEkCf0alkSd192%Olvf$b5C(jx%ea(+%Xk<{C}A==IW*-EYK-xa6quBo;ihR| za`WTI%ac5@Be-INs4*|mxu<!t(+aP>Hm%S}(hrsmM$$eM)$s?|xbx%DiGzaW(?dsdq+0hRd@w>DAzyzjcaZOJSMku#(@Fu@s)KCP|ec=efdYib7-OpTDK{Kgf9bi ztVF34${DE|CQ0>b_=lGgMqC0?qqG++hwrt)`(`2^Uh9ZL#DxK*E@7$L?e)>TM6%8- zwhKy3CO=}nSjGC-5~c5DA1Uwg0m8@lY(Ca^*Z0UL)KEU3NUYYOKCe!#Q!}KT;oD|T zr$n!p5|V&~lu{Cjyr{rRVo0MRRZ=oSo+L?Bwj`1C2@8MGNurb~g|8$_$x>(%BAx)B zHWu1wg3agMvmS5KxtZ?VIB6EXngMgn*64%LU?#R zZqDZ0vnPRjl8bS; zrNUF0o|IA!lya-QTYgs#`UrI;6U;5~?Y=O0LQyL?Vh3;-8XxhKZMO+Up;b!e3jb=c9J9_+2XH}4|F|g6n!lG*}M&a zr99T;0wtnkGPRn)Xp(%p*_2PgOR=rch;`TU04oq^G@ww=W3cZO0*paWV#x*89!wUp z`388U)Fcay7_wKKx?=?0M(~F5vhj1{6C-V8UBTpLBd{8~jU+TODP<%J@Tj(eL?etb zHkwk}5OaICZIeylx7FE5B|N`uyKej3_QWQX+E{yOlC+UFp+?IPXqehYP(_r6;H7zn zG=Se1h#(P)#dSg;%*l&n;0Z{m6Q5@3XAv*~`_asHI*8}8GpGk# z&G+(N)4#xNW~QmLBh=6=c)gr?VNERG@$_hj3ozvRxieJnNovR37&!tgUnjxq^wQZs zIV$LnXAaE3?^(xz12fbs)9H!nk!cuH7`Q)*-V&b2-0HPNJ^5``S7@~w?FANw&Z{ga zQc0y^MUj?4Ny%h>z8+~1!+mX1jR+K0pEoi_U=RNiIzlH*b{-K5FmORGk0febGzKV0 z%Z$!Ik)^7xmU83!>at*IX=7y`O$AVKCIALlBa4WmN-N9Cu9pI3slT+ll#)`VrQV1a zn^z)+Z))n%-$9#-l>@q5TTaS|a-bl~t7}}<80hJ&Br0(pV<)Vb!X?hWkSY}T6F{0U zC0&FMswWBb7=chOi0*g~h6=xN+oKm0=M9tSnnX^9-E4t|pq# zhifxeu-~!;E?qC;_Zu9-ITzYb;PEGS`gtU1QIJ+6C~oiPX7lTqpS7dTn|K8Avqk zSlYE5+#K#W+SEk`XTR3ys2|T&TZ`z+kJBYy`uh`evWY{#h_WDfjSG@C>dQIVQ^#+b zlDpzHyZX912L|FVZs|+*?5c_HYHi-tSU(q7w}BE&z8nqCg1Wi!QSiIHU+qPxci|Jg z=&11Tutq@`hI|r-)xi{5eR?g0;y?u&!JcFoIWi$hxCE&@xeZ9|>>NSRBFv5DmMAEn zSR6sRD1)rDh$$*6_W277L(l|PoM(Myg+UC}^26{U%$i`fZuRl0UKjOsuNb9&uT5g{3aAj)zlPK#!z-3^^|+G`Nn)>QJoOSg(Au$ z5_u@9q0mr-I)N%D%c#}P5;5GB#c~NeL2;WBMtC&|C;GEEoi(L3co)PD?yzXJ z*e#>^If_z>tRhlQi9~`r0p2%F8E!OF${@4aY-PocLgr4XPG(^&H!=t#f?+D>m{3S;NJ_ zJDh|*2xH!NxHwt!_yP4G-9w%gwxxS}d(-=X9sF<<#MH{BmcpI`g$8bNl>54=cWTYV z^10`!OWdjZOYZ^qKEUkT$35D|-P$Ky!%e}pZsgK1H$tr6Ho`|li3HI^w3FXu8J9y5 z)Rw!1*8Kb`Aq`MwJ*jpiFJm>8exj9df+d9g$)hQ|qL!&exUZUE>17NNSq`)GIG!0@ zaV}QJ)FBzXrt$_9H8g?vdFfmGe zNKnJ@=2hYU(Xlm!ZW1-vN64N*Q>rH2fiK|Uw>fuhUdW6b^YYmz3VoNCaL02KOIjG zKcYJa)EmgL`*UEb>)`I$uPN6{FZKxfzV-b68#93f2!opSYxaM5s=Vp(-08lV)2mLC z4-#j3H*W3QxUF|rKhi}qJduiS3*UhGsT1yrSV^1cBHLI)L?;P)EH28aglCE_s?4eM zE3_&DjMgU|!OnU)w17^qjOc)&N-tm1%0R9Lr>Z?-feaz~fCVehr_QmBOe1tylSx+# zvdR|t#%3bH3vsiG+S+DNUD4qX6)W19HuyR=k4<)U^_2Pj?l(aX+^UP8JYvt+TDOiVj!t#ug5{lZ`@Qb#<({r4c>d7;9;XHBz+K&(l@-L3lbHoeyV9OmAX9Hv_~f$ty8DS+D0Qz&qka3fdGUhn;b9Rw2B0fyw;l>L??aaJ*maU5)CC(A- z%_9x4@nE0wZ1n|NPc(;z&lyk@W8$--MF>>$F#5FZ@QAVCysAAvV7egr%(v@vHf5hj ze?4V8e_}_P1$N}7cBL8e(Q%5Idqf@oy0eMCcO0DN`nb8H$0XX5`wq_*g5c@$DA|-= zyZyMk<}r2ebQvn#gqk|~f@jj5>&Fgm+aT;5ShuQ={KB&SBubL47b#l?9D`>!Unh#eQ&O@36{BJkKMShbq1uz3V6+Gt)!Ic^2|*+PrO zPq=`ADsmy}&x%x0k-jnEfvZvq(_D9by*ojPj6Pp=bxloSOKYpe*w)lkSRDgO7;IB9 zi{;G>h9=C)Q&G5nQPI*s>5b^q3Q{(kR;x!TEGZWVC_h0l6ltIW6rvNAq%i-2fr^AO zcPp7nco(JLkqaq82tP+8M4z)P#RO~tl7Lr%0A+>g?@;7UgszLc9C-ttd>#>8j{qWK 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 diff --git a/uno-plugins/doc/images/image-20211210175645297.png b/uno-plugins/doc/images/image-20211210175645297.png deleted file mode 100644 index 9b660f217f5e06570b0d199c398ef725f420c2f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64323 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 z zZHrAzY&$=%PMeQucriWYpNCA#yHk)iZ=vaOmqgU;sFlU+G#=Hv&WJwuq6gjV>x=g% zdz}ySw1GPEN#t+r{~8sCvx!c!9(j>(Vj>*tp6 zT(9`pbf%eL9Fdlcbw6k9OEKX^v?nLSjV~ZDDEUHiqZa< zmeub2tP3gYn)6+l%T-ld!-G*7&lh~>yty04beS+SX{gJ5=T2rCREN~j$rl9$M~6rmxC``W!a2I^hwJ4~6g@+MP>9iR;i{;^E^n zN$ODl2jRr<#8AMHE6%jDIa>n!_HbG6{MhyLjfcG8n+R%XPP=-zUy`0k*wo6#I?ICe zwFkJYf5-~#ISMMWFteQSwB$0R&&T_9r6~}P_|QPDb?p)4p78L*?{{c3+`hl>Ic^I{ zF}{EQ9&C=|tjX-MHcqhf;n_^l^u*m6ocGKH;+f0^w`Q0VPmsTzrpecyP6HEWN8%Uc zuTXz{K1*_`vwxL5?IAQlLdfm-wktD0l%{MvgvaGD)%+&|D^^I?6#xT9C%?4uDoExao>-yOQ55PQ>^cn4i>ibB&*@Rz~>`yL>9B?b9kR#4M5 z|IFFrM!`yTNV4zBK-^~YZ=SL=DT%b7RB)#?;95HY4D_Ajf2Y2GC3wJ>4?BaarT@;^ zsmPLVU(@Rc2M0iVHpj$Eh7scR@(;QBGGcTnOC<>9wYBlzG6VFV1?^9M@I8IC6UA@- zESYAPj+nBfH=}3|MGKq0H5m%hhv2ZVpiRzOL6`)sa*B$I z?>B>a~vi8|FimRZ z$B#zPonX1#Lo~W!KT&QaU~7EKXD9%qi((L#Mvw)F$rg}b?$24W=i99*gT#-~iX|gF z90Po%vo@S#$xfKu^nm7{v>H%MmFJMV06hgnWC!W1d5>?j0)o4LV1SGhE4iBaKWLn+ zvdlul!seR;Fxjma{8wZ}MMOdg8v-z?Ro5TLILa79atSDXx|R(>yD}4kX|M)52Y{+# z2}3vN!Gj0Sz^X|na6jOD|EB&YoeWe^k2r7AqD@>qy>_bl%YelnEj5pYh-E-Z``Rq` z1fY1)k+0$~M6z89Z@z?-XHLB<(;ebu*1OG^vQGVnKGVPX<{ zA*5lV+6l8O^3mY6+Kz{Z=eP7pEZlo;ZtnW%1qKC?c8Og}pUA~9z!iRlXP|#7bKKF@ z3@QQvRf`X4ev6IomkbLiW&p-oh(WN3bd(GofEr_vcgVee+%*)QWNL0y^xc+c>inF0 zX?dB2D6D(=gNkMYP++i>e6_opx7H=YfGYIN5e9TX?w1YXlOSLL<=f$*y}+`Fa~ZSs zFEScJ{edEf$`VS|g#3RMaGm#XFd>TimeOzK)E`6muLZ53pl?IN6R`8Yq%A<(el2Zb z3xh7L#qhhTCcwwXAmYaYaxI8gzUKbhT=;);|35`le=87g-wfx?IOJe?J`Veo0k?b9 zopc$fyMUlEY-umzWMxRpbNw{2ZGM*SHu@cGWO#IB_>|w7kBcjP%|6Ca3i>8F-P&2aRYO!jR z07y+R$v^k-@#Ccub|hE&qJNcC09fRK7AOP(j#u-ypk#;tB437UD_FADI2Rk3`{^pO1C6W=o^b#5=iTx?`z4}oHK;cPu72<;qH(8Y>Dy`w;SI&SuyHfbg<{o684|! zPTR%5oa8FQKb_>CTA-Xdvip<0Hj|$GJt_RAqSSYStc?9qaSieKwx7B=kjrYo<4zb` zqUepP`Svi9gmU@KmbUe}C;Ypjf%)^$oh*U*(1?AxyAJM};!HGutC2enmkK~E0juLP z{=!*H$0_53u4|FP@pMv*JgTr?+~_csKxfw2!qT!`P3u&1WRSQDK|gE_`68jg!9gH?g!h7hiGAc2n)Nqq zSo*ghQ!ktY)Qzx-r{BI@3sqkf>fa%DSuY5l&RhBwVs>Tz7GeTILqp>dAlVZrBx?^# z@}8ZzKl-Jc-U8amrui_wgn~x_vukf5@wl9tZ}zU8ODuB5BlY!{XB5@F%^s8HQFD<$ zhEdkV*)Lyxdf{u@f&~xr$>biPk%;Wz(hYbnMkd%%>hto)aJ38L@QlF#GveD1Fyx>(3Qj*%Ztj+^Me4h#B z(ATHn^c^);+(?QURi07hFI;tT!5y9RnOH(>%YRrc$SGxwKl0d+R^5?yXHWl?L?m4Y zd$jVkUd@W*rx;7?r$CZZSU^}#O)UUwK|JSP7Z@%9Vme(i*SnHBfNyQl9PD^K=510p zOR)>&gY{Yo63sHxxQRunsT-PG7jCeCR7kp1Vrf0`M7}^T_P1ZkiPy7a*)97 zzX;OikSWwO)RnYdtkJn#6!=WgHFN1?lIu{mi-iq^FSZlKZ7f?fzc-7lG!qxhH??0{ z?tBrI`?A();~T_Dgnzd;S6b)O5R!<)kIzkj)O+vHM%|(R>fe$xRoRv?jEJsLrith8 z^PW0JmI2<`sIRj3w6XU~4!kQ9Rhf%in!I3#Lo)2Brk6DZA3yb}e|!OY`5IxmTn|=T zyvta@b=!PO{HOF`yQp1?_9yY*ZOjS4T7QP*uql;SQay^2D=pv>2a)f>>F z;2x~L8TR-@iUo5G@XS5y(kJw-kr)mzkJWq$r3@)WiE7J5Zu#gUC0e*hop-MzQdiUM z>*GPyiCE-fDw%b~C@wb-PtIEFOyb455s0P+za`kmJr1=Ir6K8;WoS@8giJ6U8A+WM z5M8?TP3Qem!t%y`P0RR5l`;QQ%NGU|_B))4Kh=?klb?Qt((;LTL}4nF7GJtkiZz0t-oN_I7U9rqcGvmP zZ9msFKfhQKnJZD1x~7aEpc#Z}Ks3Cbp>hZ5nCd8KjwcHoFsOKrG-3Sm|3}{Vj}D&e z0_iV66?jCQkYwIK1`d|^1cTj8n|_&C3l1{5d@;% zsvA#9=Yd+Y-*u(-!tTl;XKEmGoBD&Q*klBECBo>P(q4^km zZbY_;bm@qhV@`XxNhWorJ9oA&f5?tQs;(xblKPP;+U_Yo7;RlZ9J93BQhdVdA;sGT zQUzjsAG$6}b6B*?qlKrBxOwpkxdYr=C|iQv{IMBN@WK88_zkqQpC7bu0vgq)F*dmM zmdETc48c9Sa`ha@Y^kFaKTdZXObNCvIyBhYsiY;IVWkA)9nxQx>X|3F|Ey1VW^^jhqDko<@8F!J|iN?Qo|TId2IcNeI< zF{0XcK*qx^hhouq0u-sR>z(KPF>x7ZXfTq;jMa6p1DB&#fU)=tSkeJwG4jT!x&DCp%M;I5D}9$9uR``xzUuOY1tr!o;d1k^~4%xVHX z<@)rKOkdjv`UZ%m`m#qn5fV7P!{O9gA79CpH(f<8{*ipXFH(Q}Ej3yw0@E;utRUEI zr%{dglA|;@H5#wDi3R9z9$q-|&KijW#URH~B)V;F0*Icd+)4>g9;z)7D#v3>SJ)0? zbdUJC8qv3osc(sFjO|*+H5seM7_K@CevDB)B;A{$w8;lC3n^bV9G(A(PZ26U`->ff4G%N8xf7(-&0uSHq}O39(HNiW{u>KYW{ z<5>hCLwr2^A%%PJ4p>#ua;q?kXG61U3}qSxaqPQ$f{|wSaiN<=w#bo9lvT34E3#6^ z=N71KJu%VTaXGI|ML33qLJ8bAhCf948u{vVh|^`rxgK*reIix}&wNBGi9C~D_)3@} z<|f+nK<u47Y!E zGM-MfE`3ybkKsHZQ^T@)LqsYTsj3w2GN6wUQeOJHdawWwa@@qM6OJWK`2LJ)4MBDa zC&4GEr=8MWGP$k?O8q8E@Af3g%74O=Kog#oJG1)G7FsQwPu+P-wc0;k?SWRXEc)Qog6EOoj~hIfn6r4@ABHSN4CCH+@H^t=)qDkNUEl?`;43xq zQ?PnUW#7m@M|l#r-Qd8=4Tqg^UI~=Ie!`@vLoiXM^HEN;5wME`iY3WUwBbpg)zKC>j_LCRq+;2eob()7Y2{Cbidu*@H(x;c+X6*lT+y{W zIR!{h?3G}xK4`)IC3{S!Qw?-nWmN-ZsoYJIXw z#g-;D1@N8885wu5v9Y1npg)P1nK=Qg85+?W2C*}|!QG}XWEWIwc*`eoilecoazWeH zQKU4AfLA)_c>BuKS|JX@+9BV|esTa6cv*ON|%lSpfgww^~Aj%S;Hnm zd588V-cN>!3?G1@6$EKlB_$<`TL^j9Es+eghleeZqLB|GnWc3WhU^?Q3l)SbjDij6p1s#d##Tk+{CQ(OKF%zQom}ssKUM2*1qUYh?Mwni0=8ANHK-Gw^7Bp z1>D7m-f}3f;b#Fxa+h=}(j8DkpV%l5)u+g-4UdpM`|-Ft>a%yD_PwmtM9cM+L z%8HKA!T9L{uKkx4fy+MY#dbPV{>9nm#pa!`21XSUprB#vKFdo#gDZQ{)p?_Hp@TZn zyLY)MC5$%^uz|Ba_cZIl_??(O{0Tq<_9XI!-P3f0%~H;31mA&}*y~4~=qe9TT!X92 z3*QPp7QpW|`+)_croMawdUQRzQDcV2P+(q7RRguDP9A5zVAQmXH7;u9LsXOdZF_n*0r=jpUGAlUzJ$d2E*+P@V8zoETacz{FyrB(d{tN!fm z66xRHw;iDNYPb)h?-~vCCs6-rY{6Ilo-;7UhH-wUy&5!#x&gsRDzraGb3ycm=bB{6 z>I$`5*DXu{bUbTit9@5Mgf5qxu_!J6vxmALP}mW?KncjNMMo=s_VxL=PZBYeZ|4lOB*6^E+|4TBE0~%sMKk5J@ zK2so2)Ijr?IQUS{-r7A%MYW=e1gQ4UPP*%+JK>+LOl z{qqwL<8}T0B616A+~OvQ3IOy+bG9^3J4E8JaByIQI%pFUyG8OYZ|IL)aTE8#^}cz+ z%Bp*DdSF?hPV?Y_(cQt4;oWeLhU57g1VK#PZ_6H;;!h{9+ ze?vCCdnV@B!i>_&N=^{}3~UA!|B5$l{-VWy#TyR3duMN19u=ehf9%vo(k&Y=0IW~> z5|G5Ek4c-}<%yk!HD!cc_OzjqG;Wu}@|P=J47(!X|cugJ-^tR2h&Q3T*> z3_q(ye2j^KxEi3FfXf?+J=!ZmjY(YL)wlm!vv;<9Jp0^#aecwK|K0U5Z58CB#zbhk z`40uCUCYuSL6belPOtkRbGCW~6Qp-daM|Q=UFMn=8y8l*>bh?4{fFDKm+looeYHC9 z83?HEvRX_9x3;!cufHC8-{NNN7g713cEK8KDa`nbn&H?bbEf>+(Blyy}1u zKs}vNfam+cx%Q{<6mOIf8|yP2ne8dISR3Gs6GFhM!yye2+Ha2WrvR~e={~m@Mh&VG68a@T{WxW z1JDo-K7kkMxZ8*~qErLOMnTiq(jFT6BEO4^%LI$~^(+Qpfjf8|f)rz5n3G*q!j0jI zKkbiP0K4tz5WAN7)Hr__QV#IPI(Ec^s_X(CLZQ{pd!}yR{3Czr<-lyMi+ez6Bde^O zwi>NZ3_51(p@C&h`+PMJpZG{Iv#rbj@3be{J6R;BZz`l3i3hxSk@lcZ5>SUNRa>a2+pD^8v<^;x|PJ#h}$|7JMGMJtJ6oZ3Y@nLg%Mp ze3$IJS0}v$);N)W+A{xwmY}Y05X15hI9elIkrB$UaSJlm=Z^CNM`EsWcr zf7>8*$SQ)!iI;N)$p0cO5MRS7bY8uBeCk17b7eRP#tuBvtOk=mz^I5F@Hsj^XEIz! znl*=0N+bvL0rk#`rKnd$1xFmG9U^aHuO)WChw^)1_!{>w$&amC?r>+_uaF*Ph< zErQqm_}E|`N4`D=5{wM@&P~rg#r=f^3Qea)Y-ALaIWQHgpLK#OmH-+x5+5IOd6jr| zl4$kg+XI+-`twG5T<5DSd@%EXte-u)73vm-W>bh3if7cRE0%psNN5Ey*^Xn%t2j0` zwh5Z;HwTU#V6i|y^6`m_XH{OGR zx!R?_dNbb^20rqw-~v#0FfiaflzF5x=Z(&sfFj^v`J(Y&EfAupov$15H33D#Ysd~3 z7Z;Deec=Up-S%eH)*KKt_*3PPWo8)+0+EQWkR-JAocd{?TXRnDvm+UXR2PrVPeD3^ zm>F#$oj^E6Q|rBk&56W*Ag>)hS;_gGk1AWZ~Y z-HDXz5_970)<|ld*1P3L`)hmc?V_zCr_jw@wraktI_!b$i+6ikG8Zhf1$a7~vR9Lx zXHNHa_cq7NWTN)m=Lx3kp>#UWZNv2VxQ&na;vC2^`iF;o0S)iE8~XnV4!+);stIyA+MJDdn0o!yun7cz z%cD(=>Z{AMei@0IZeLSHs}%(i@>CyS(YixyA9fC;QvB8kt-r(ct$oh zKcE{0+^Sz5bSIopdYgU0_cmMAd(y2zH}R$?s~igSJ22KKDwsF-0xWJ^T})qvgt;z| zpP+>Kw->)@xDON!1rA$N#cX9qo0Cn6m#c|Oj7(%0uU&KlkY~X2p%dL$o!OkMQmu9@ zc(nm!1QfW)jfP#W7t1pHxu$D$y7J;gA7G1V97R>?v^yJ*0ESQr8*$tW*BfW~=m;5YoO1x&4JyO=1% zIt9R791I}TgVWZbHr0kML{La)Llx$rX|(fjpl@F8F% zeEo=>Zwmc%jP8Cqm;;k={Hk$gmiexn_HDpYw?UIC4Y@TLaGSxS?TC2n zi-7COJ-MSjw zjTu{W(`=1O{JELeySBhvTX!*D=QH_A1mI96rl#{_89Z%tJGcQm5KoPON*qj82U#B& z(E}YqpcsP$6VRCia|d@W&$je>6L>1m2{W)xx7dD}$@P_^`D%e|{=9+Y99Cb=_p71A z327J8y1h%QP4CyQv)~$#M*oKug;?OFi>~es@F4?F4%VWA_LyqVi{Ws!SU1=)!9s1- zo;?O*wx~Ff#dSbXKRzt03jz4p`B>fsJ{Xf+#Hpz-Rw%D4e_mC0Rt18{HLW#N;qM=8 z28dfo*8xp=`ZhE~ii@0f4(4xlIaX_(e%5M)Ql*t(vpGh6HDR#2P^tyRA*bUz0W|jl zzZs%q{Y|_(SVc77l?(lv1i6{%%5m`J=^}Y8wEd%14)nF>i}drrr*MR9oh&D|0Waxy zdFlRj$6zqDZu+OOLk1tiQ>%5}qSXxjHdE%lR<^xAD3bz)(He}~KGc3sR&qzagv;&+ zmOD5Y&|`Nom=p|3-DRUo?_Wf+?U7mD{E^_V1%l{`TiHap^b9B)Bdn+A9`0< zaLwa(5#Ho+s{sG**{iAdEr>_Js-HBKaMd_W^X%k z9}h&;rgrU2Ij=o>^5n^zLCeFk>ka|h}HS= z4gzm0bhU58!#`NFBn0*Cd%5?JYY%cPX1^OHwydw4DYu;E=>idGY-)<7>C!!?ZeMVH) zXP+#km+UQ$SCWn_|h)b(9m!^eBY3s7H>C}NPoy6mu@tcWVJ+DWP zw)}PyIck$2i8S9fPX5=V(@5MiV+PFj1cFrB7=bq5Q$k#iU z`gR(D#MN`Q$#4GRXj;V3FzxI4aIQuW_Cw{Faf>=3AbsuKEfPWOP2}nBEn;6qiZ^@b%5h*fZaF`r5f+ROS zwfK0sbK`6&lsTuM!q6mnyiOQFBch&hAv9!m5f-;NxD++9?Qi!4O-t=Y0$|DJ>Xra4 zkVv94D#RyJj)N%Xu|?0@NSJ^hi&-gxG&wmrjd7|Hp&*%cMO<9J>2%e=PC0{uHoLvk zrEx5(CWE;;kdq3Wy+H9}>03x!t2R8~O;F-)Qh9P_3yH#q4E+TjL~nQU_0Wrp(}EB> zxd8qC9R@DfZQWd(G^BRVBNwSyc-y$y zBk3p%p2gz~4vtLPUC0)`I*BnbVBiKdI6cVLkj~c7r70t$yL8E^YcQ z`Z6SR*KkrL`Nk9=cN0ZDICqvuuuxW$wc_BH)*JA+es9O`EiFaY)u~GCF(IRdjYo!< zb$Vk~eyYfp!_?ygFPatHIXfDZhL+Y9W@h>4JBf6go0@($B~-@7#;C{O=&H8|^+G~J zKLd7*$8MPW+0jMHF-Z0V9lnQveOFr62njjt04~z+7HUT$ut9&o0ij{g(DxWWef;h z0x*3JR?0r)=aY%j>ZohnzpulAXoF#-9tG%mCq-fvEAm~ras}HudXGnvVbiuh6aQmQ zjx*@wi`YFwIv^-mfhq*Rr_Ws?CRUD8+&(HA-pkI-bKPlqZG(!{zt?q$$yW!SHX|bg zg&HljU(%qKMSi4#o60`ncVOR{$b$vB?$fFAZxfQ;8IjaN)8ihK&A={e zRsl>$NC@Tw0ACt9A>#KYS&UvBCTu^pmPd#oj7V{s^xX|jM)n#}%;ylID@`g=WT2{v zc?l09Y3OYMlgaM0JMLkU#h?S9GlGK+Qy>bMWJw{|iibB#)tRSw?Ku5S7zdsUZ4`EPa!3H$EzzqoT1cB;g8-`#P}YL^D&lmnow%r*qb6UcV| zf#@VUoSZ8xIhcv<_3PIhnO~~c#buDh^m|1S{fY>+mX_8t@R<*P_F{-X+PZ0C!YC~x zLpy(`p#q935W5nQkp)N5iejQ*2lizuQ!`z?s#6m!)G`S=^AXqeN`Jr+lG9b+(v zFo5aV*|%S;g_5TGxe9i#g#moM=bi7tPDn(AEaKCu+jfs3Dw+P4eeWDDE^^8Q&85!8 zjnxPo1HAovXZb*03tqX819koYjZ}Z6Vy~5O%VDH+nyiy2i|oT%9NNnFjQqS(FT{ig z4^uQ+sECMeC&;IN27yNHrq^m#xev;JMzW+;R#Nfs@B|cFUUPs*S{Mce1lfyz=x z$I?fhEpzzx?)WR)x3?!4`uj>Ut)eV{__3o(Pz+Dd(7@sA&Pv(jGyt3lw1_)O{9J{) z9rHuMrEtK|1*@gYGw|@JEkA5Kk9GC}LL>w=zTe>BrlLewf9o1T;+4p6ed*E8^5Wpp z65PVC0>iXhU+b>$SEtvH#AL9NoU`vgpIqf8t+C+uLF_&*O5z%)@E~SLn`zf@S5DoJ zmiT@v2b(RgNfOV1fGb235=6!;-w)n!kVJWJT=i)6b#mec{>SqB+}SUVVZ&f~k#N## ztTb;p`*}E=qOA{T8KxQ5`57DpEI=8+WWMv2!}zY|4ECYBjd*w%iiB!{Xx*3jN9R;D zQQzX_0gL`4+_VK7-CFX`pWQ4BJ{KcKpJOIjLpdS(XO z-Y~uIW}ap`l&T!YPc|y-LslQr!R?U3?eyudHO{$?T^#d|(mI&d#+obow*-T#&|>{?Lw1A_0Fm$u5RC3TUtyYHj`*mGB7(4 zN5gr8u-{?%u=Vq2VD9?r{QV&$J~vS+omOueEq?a>*P1E6y!mtQZfp|?UyF_VpyKP4 zHy<)|Fr|IPFtWsA8~?$fB}V0rFA44R>iQ#p*};b)RXF+w5@F#d95;*hgNF`g%30W) z+`cbOw#KsQkfSGkHt|97u&>I)5q*yVBZ7hl(_`E%L2J|x_?qLjjTPx(k=3L4-0)#Q zsCwr8WN?NJ+1L?0^6smZZaJS_>OEGU4N@T*+u0nnroS`YsN3SgwqHn6U%sN`H^cAn zJ6z+=1Ik^f{TOu1`P?7Xtkf8sK9LlQGct-)xvelZFfRMs zW5yIbm23JjSQ2iq_H5>DMpL}=2`nlv5$Zj)#k%m;#1hj%VQL%{RN@I{^jFH>Hy@;E z#;s**up@Qf@k+NM>V=L!dJxh8XL-)rMppJ%s{cX|ufj4%2rltXB zu7|X97aYGiN;kIy^#J&rLXHz8qWBvDKYv<*&;QpX{{&0R=#CqkuAXh@|0Sws>_Ox` z_V|F(GTR|e@L2SmoZZ=iw7-f}rKFx@StHgQ=z;+LPda{y&o<;J-O|3} zZSv;zYl!A?(EapW=kW36fE0hm-W6i7fYMv1c6R#toQp}MeBg%Q#GY|qJ|@OpmqEr|!qM1tgnu*39B94@=Yj1P>< zSST7f0}Zl4L#xP?V)S5M?MFciDI$T+-*H;2x97jkwr>(&>vxz2OLVL0VjMb0WFi#*}QD zci+VE2*c_Z;mv!7XCiibq+ik~C`vt=z=$&;ox^z^_cGvNy3E1GGo6T643smuB=wJO z#gNB8k&zp7TgP#7Hldt8{Pg@PJT97Tz(&Aly&ouDR^Gn*TSNyHSGX=csK((y)&wUu3@@&|;IMhPzLBGj2r0KE-QKzKoJw zfxOgM{Y8AMroox!WyV>`je(u}C4I|#4Akn}Y*iP{<>`!;uU(T}ZF(_?MP53!QcaR8 zYAk4>GRr9Lm^Yx)_A$~nChlc;Kzm=XDLRhagx2MEOuOf&?boj(&C|6Tm#jTH$LJcp z_B0*(%NDnW`Hzw>{2bAa8~S>rSVr*y?d*&$W`?zq z_tgZoI)&fSnntx`98HS!Z+=+WCEZ{ix~~U2RU&(+TEFi6-j%Ue!(N;7p~;wDeYOQP z%vRpeWb0zF_*!^N@qM{AIo!cy?XW#nuI33l`Wh?Iu3N`Vx|nNJEA@U*T1|S}QbHhuC}FXL z;Ea&()u4JzeQ#^?#M&KJ6Ba!$zqXH;Yt*0L%k;;OddJ}?p)OB>t)XdhPZwAHQs-*o z^N8El=ByKz$E|f_=5M|{m*Am9Gq;OVpe#KDSc8^`3Pfq zC1qwX_aGz)=lh8-DL3KTG&}YuPVufk4{}QiaxX4gvk9(FDVJzVdeda?a`8so>ryew zNFn=lx|`YVvy=L)r)#idJ4PRB$;bqz&d7bLB3>|0eBki`lr@!ACcPvK25T^Ac&-e& zy!v3EEB0s@nuJ-4#@XVgKc$ zCtL4Yi$$7S-*C8=O3WwIHC|DlFO%r@HJ5L$bg;Wzz)wP^*~)C~pVcKnQRFF}*X^`q zanr(*(qdTILN;P;rqk`<@~kn>jF})_L62HWql6yc9;v40g+ynY_<))P+Zn;Q0j~R+ zn$_Cjw&tes0g?BwbN?FKc;u;*PKsJJ1) zlgEq6c2U069d-3vv3tW+PEJec*$c~EoK0gE1$Eo#*+m;Ft=6QY)(S3v3g$WTlKgMI zTz9-k*a)6C!V(U^a$5@wukhnXLW(hfzsKX2hM0pC^K|=JYCM)8>w)?xc5YAG~sp zSMnut+2oDDbrQ`X$<4LFco@A`zAC}u@+88Uxw&eN9eaH4Y+`iHHYGD%Sd94k&lrn` zUe8u#8_wPOEK8vo&$-y6!G<*t}B-mP||?%2?^ zWW%4HQMN3CO}p=cBJWUpU~<(!=t`}%YlU1Nn#*w4x@IrpV;_Zc=m5{!X9~fSi=mG7 z$=nnp`(MuP>vT_xyq=Oj@hl1;$ZTd=_I=K%bomO|<;N}DGiDNgMq8hwO3!sEQ`)_- zT%vGxFP&J$VIUn`jcl~R6!U#Lb5j*9DmL$d_-ut&;K=W*Pu2mDOue+2k zKGS&cp8my|3?(~#_3DD$Lbu$-q`itI;zvODWSB9z~|RFUMv$y24<@*|#XX(q*+bm~>{ z&)S3U&T!W>6?YB3>-Tv%shQ-vqsb<$n`cs2=tQyrZY`PgBKU7ggXkEq`pgu)tXCCx zq=eB|)SvrRU%D?G_Nkg=D@3SvU<0dSkdSLRTG_iUu#}>%<>hxeMdsX=5$_~j!PX?| z1*#3YPuEQ+)uQVOA~uoQo~dq~TVHOf+{PUw?HZ~@msE1tbAQ@4Y$O)Q zb)%uM$SW>jdsr6T`DXHl`~zdt&MJXmVz_uwfiYQ6MUs*~3zphI3&)p9^sI54fI;Nc zuL~YtYD?zt_np`i7iu0YT?|fbvV7G|Cd(J1Buy{Oo%pUYT z8AmBa^x1;Fi=s3ybJ_)SYC`S3yL~Qnm}3Qbl;r+6w=xp*P`%bi;>1=1F9(nvnuUc? z{F+%n;Qrr85=yQ}Bx!DGi3gEnYxrWUAZ^^7&FE6*mZJ4GA3@%bbCYQ|`*`Ts=QoaV zBeiVqOYxu45JLVru`CC>OK4G&E=E4;Nq+t?Dr@diSinyXae`w7O6-0;KGvVr9m6kK>+)O%vB=_%(8mJM~)0q&(FiS<8Le;B?@# zoHyj>WaKJhx?!rFAV_c}9Tx*UdG~{i==`Qv_Y04vl5o6~^tkEzZ$$?(V%>Bn+OfcL z)cS@wZzy+moa1EK`L3+>NlMiwD)Z_$lN#3^vaKAFjdu@^Mmk)#xK~=lth;kH(J$WO zSJMhyc#}F-EMHeu#d%WxfhPSBLu1t88tl~NBd^3Mi8jsv3m1NrXpo(>STH@#mGt_q zxOAhcOG^=nk+@ND| z=aQ?tCFog37$tz&N>yQDc+6cru6XR&21)J%FCvm_)6RX#ink9Fi)Q>lNr*zoA!(dK z1Tw>xc6SjT50)Lr@1R?=d%$RUfVX?i1t*1^@2_ZsZR z_I6aR=7)$pSHP?s9Qt1cmv9q3eEXtEY!U{3!7rCFMBCzM->r(rC42H|*gc&$j5{q4 z`B73?=@p`A|L~BIn^smI#woN~Quykgp5}$>eAZu?pi5|@Lj=t)A%+<4?4cYckY+}tyl=K2BcbB@Ayf|s`M7~V};SLc{DkzUYhPGS5;Qtb`jh_ zE?m{MFT}Q@LNk%il5Z%^VkF2UG*s|b#AS1J_3W%SEijdUmvYaGjGJd8Tv>> zMf5*41aSDVcTV)hT5@TNT1JF#9yFIkP3tderS}Ps3$?4l7BZT_?p;->wu$$i{6tGC ziJQ>lA5_{G>M#yi7MB4YS-0)uZB{5&6rst4Ftz+epZqReH&_dAi^-`=zNzv39MnXd zRn@0|m6Lypa(UUi{pPvzr{vJN)u!2ND^(I_@B{98`_(~->zqx`+OxA#R+HNd1-s2? zvSA;Q!5iO2Fz`zx)6#ZMswc=}#PLf`o&}Gl^iFl3hp&JNM#F$}o%t6sE=wj!DJY;C zWWW+R#6sP9e~CRFcfPEGI7@@w8CHX=oZR`Zmr)#ma$9OV8vdY`evy)rZTQd9*Y|j_ zadG3_ER2sX`W-C#I~_ct9W4%j)<8bA`uu~guER_j-(>of3w9-e7p2r^d!Mgdt-3#m zOmo@dKc9>I6})*XJQdd=@OLTNU@flg`&{^~yL8Mj1A_$OtzL!+Iy8yt!wRb&;kMOjI3qeqz*`>goOeK*;u zY*f?r8?Ztach~No4cgCpk) zGtWGv5+wMD<^z}NBb~p;QHW9QLJ=q!v&Z6q_rv7Vh&X$q1H+ST!#~hr`$wUnb&ky9 zHO0rd?-P4R+N)@;-yGb_*1l1j-i}uDzTA}Wg;f*#o+3lL>6gHGb;MH1Nq8o;0Ls(8 z^hAwbxSDTNmQdPB8%K?AN_*4eE2S+`o}|`NNw3IO`zFT9eFpm$W3}(Qo^UN!n%!B& zw-ESBvNlhyKhCq~eEZ(Y$-R)9p(Y-)Z@5eebqBfT5TB}&x*g;k9#tBnd z7w<)^-Mtq!P$w2bl#KC%qL%M)>;$Puj!uAr2e$n`P34;y#uznss)*^X*L&<*n$Z8c zTX~i>X~8pmrE+7fu+GwBC3m@Rt#Im@kC=oFiTw3pln*amx_o2!?Rtm=mp;9t- zD#3eO_QFEXgdJU7$!canE-uyH9b8=8GymLR8~J6w;e$y!P9ccX<{W-h>kkX8QQRqO zGHozA>SJU59v?cWzD0p+kc~opv)73X%f81=gR~Fpu|>62AMw<7NBmsYg#QLE)>#gne zv5}}7s`X#JYCG=HNJo+1Jh)GGYMou;UcU~5BMi{Gl{sQIOR}>xS?GGhveq#Blcnv% zSeT4#sm>sa;Jy1xVnP~8j1O!B<7GF!X>&vIDYkDf`9^r~zf4CY$v`oHD7OYqBF~ln zW5Qz!kis9k_vGi9&RrZ4YA_Yp_5~FcIunLyK4Ic2cZ~gl!M#;O-1XGtxu%!9U3N!x zbOyxG<%a&Jrw$ZB!~Z#-y2>y~E=tYv5N?jfgN3XQ9iPr^^X(G7E&0o+XmU~7Qx6hL zak`YggwEB9I*-5P$Xz`aabNj$?%NASTMdaFtjBvUCMaryC(8*qRbf?txPl*N4-;Dw zs%zvge{p?qn_ zr}M!?03SIn{Obl|#7{kl|9UQuZELQxAVIIe^JUhFct3bfo{?QRn>{CJfHGmItmPD_UGcPYR6gOw3VbjK$@{HQ^v5k z&h!GKC`)K^6h=>+EEB1^xN7Xnj)|S-Zo8UgyCn5&D0r``EKfeY%mpXk{V&AS-IjeH z6o>~$otGgRJ2Lnn{l`rb*f`rO^85x8fs;|>X*`eUO>iWxxZe>|y%dw7uqYKbo$k&uI!gBG~gNj;3r9vXEuEabJOHwDp2?55q~+OTB>) zH+E`2?EMzIEvtUz{U+1D3F4c&WtH#Rt`tMI(F_vK0U*RdByuT57z6%JL(dno9&I9@ zVA=7C<;WKKwEbLlXW~2zhKAlea7o%OLrBP*9Lb)=dLw zR?A}Ljg5^RP`Z%2l%UG^Nrq5upPA7`)9l&hazC9U!e?G@nHWVbZi?;wZX^um&-P&gRZ3>jop78Vn1$?Z?$dHU)%+#7zMx8^G3njwYibX zruh+)r@KRB|8TPh+uM-C0@>m0%*-v*sk(WC6Ccz^YKn@S9}VuilugQolNm!(JC$w4 zjktt_XMjH#iF7tU3@!P)omrSwl71F`h(oLdO;({o?4kMJ@a@t|sEYrs=F1*O{j;>c zj9VN*;(q!V)2mH`@Mu?0TK;`tDi~ZA)wd*~*o+&ukc#s+Zq^HuI@R7A3&-Hd+r><;iHwX4P7=HTWAHY01$Mv79f+TgT)52^ zpnC5nDSBY?NRk?R1WLDNWOZf!1k-k;pXTK5Mo5IZv23l6@mOyP*Rp|*lo@%++clM0 zOv=4V!c`bSLpTaw$9?MA1H?&FFPop(Uf3H!1rJhlNRGx3brs zT$ENa#i){;lp3y!W^v1#?$3+mK z8~xW=12Rpnpl0WF>dJNP!kfK2ZHC)&gfi>akL(k+Rcmps=$!;-rlgNxZtmoL$Zg6j ze$aXQ>|-k=-)<8%`twx6*M!#ugI?nDVq$ax%Pp)B`RL=!t_*VV%TEE((;tV4yey54asqqA(YK1AWu2CuFq z?!lZDTKq6@T;|HNsa+C(Ybs8gg5dOL=469;)GplG}1&T!jLgt#Dwmq$tjC7B; zH+ism5&xg9p8X@7?!7vjr}u0f6&2MPS}sU_lUy%ZUXV*Jy*bdsI|`GN?K;%^y4W%M zV}o5|LU*Yj|BdQ00~rA^$*&1!bddE8iy)1pSJSWk~mh{0YKb7-J=7 zY)zKR(pz!A5Uy}^E9diyoFsCtM1El{a%QodK_!wrp6C3b6uN%WCHcp7N6bRJ`)Jdh zL7vLjv#|ZoTHyG*B+U2%8$riG$AEd}9lU8y#ApV5)yEs$U#vETEyiJK759u`NEdBW zbd=uKuTMxiR#UL3JRg)5ryH)ca^VarTu5{Dm5yZwg}vA7wq1?N{Xm7+$%sUt+>*xD%Vt1;!vaO#`PntoXr;J*=z_kXgexhv_Eu`Sc~ z(bqh0LDi#sjJYSv59^x4(_5ur>=oJ3#7=+`h4KU|V1O>t&~Uiln8k*tlZ{EjP(I>b zDJcvN9DSvblkyzw%%3yd*^}H#LNvuiX=*NK`9;H1xubfZcr^86aK~L!n&%OP3u=XB z8xIG|$)2U-`*D0oI92A+u8QyKD1HL-HZ_i1u!O3uBfD~>b~){m1(db!9QZe`cDcWl zv&EaIiHN`y@?eautiHe+A^G9UX;n(8M|5=DuVf*UB=_2DLc7v&v#4X5%($u|H`i+9 z!0S!Slk!*^)F#?v!N*AM>PK!0*eF&2B6BAh3+0n^Y*sM{3vc61+C}x_Ki^tFL-|Wa zqW_Z7iI|14MDSs*Bso>G_P?t2TNTTTFWMe*gIMskHdke2h$pWZs+9fvesrHv{NAHN*hlZSq zha%;^2D<3t>9JF@Nx0eu=RKUKFBcOgxPL*YTBsL3?Z3TQn_SRBVq>iXX zWRWupM8v1LAq1C^mPV99SmW#UX0G;>weD#|E+O=2%SvjA z)$%-?PeYdQN*jfMA^i^5ZvhqpgDw8f)2C0*O>q8=l{N_3y+tKOifrSHoB=r8yMr?N z^Lq+lVlM12GuHmB&xAxr-vTN&>YV7YC%yoZh_v?skZc{G;3A~gw)d4k2OG%hNx6sdzmDT%c=A#FO52|cOG&uahu zn#6_Mt4k*Bjus}{0QbauuO15bc?jGBE+{<)0%#FfhMLRYFuwvC?=HyX0h|T1ch$um zp-+6b+thX76Id@9QXyYuLxFOBvo;tAM|noDz~uzadpo@ z{EfQTp#r;*Sfm5c2SHSl;9^TlOQ-f({RXVG3BX2Cj{&7Q4H!tIW3|NIEb$=_clkvK zP;`EO(x(0Z#r*k;7iP}iHLGi80?%4Yx*Y=qnx>@(u&IsD2zR~e-il3t4k(BMoM&KQ zpb&9kf)=wEP@c=^)+FEa*dUlY&>Lx zvXiXY0+ZVQ0;D(@D!H4pNC#<bLo}#r37b;YuF&8(F`4$kR}~48T-X+ z!%uor(evE-hx-D4Ie#v9eQ$aiB1=MYDO8Yl|DEE=g+2?Tu5~1NWDMGzMYx{O6*>HC z*|+TF`xV_9Kf7CC`$~-w--z1tB4c@W*wEOBko*98+n?fp=<7en6G@Zypd}uyjSaL-C_V8ZI;==5?Bw7KbjbV18rs?+uzZl@6#4gO7)Z4H zif)!A2Nr3#Hm-tx<-^Yi7w8mxdy4EOf}VEkKuI?qEw-i*c1j&yRG?Dy!Bqh8R13gy zPr>~%&j{o^JGkvak+b3Wk-7ONeF+I8RYDA_2gK zq7FQZFAdy>5Xwu)$G;!KxBLMEgGf(iWH2cu-ylUjhq)de){ZHPV=;Gg6X^7}v9ST> zv#Im<@pABApcsKWczM&*Z=z!jo>W0eiJvA1sOm9SZr#0m_i@?8BfQASNGmI=dLV^h z2T5Z9B7fnnHv#gZogKf(@p4hmyR@{=)8%=dw_2Njl>t+vqM{(cGI(#r{a1#1D=cxP4;>gw{hm#oBufMf)a zc&N9^n3*v>+FiBxOz{FZXr1Q?hrHkE!BK%7;)sP0{TLyrO#K(e+j^LoQa85?@Mn|y z#~86)s=s>Z;MqD6CjV|Bj(J*U*B#olOXdGV)kSR_<=-w!+bqrfsS=Y zWN^e}Q!+Z6RZ%hWdkxVd0bsqypWDK)BItqkz=Q#=W%`ZAI~3T?09DB&5@%=UyV)AS zbSQ8^(%RY-8tkO|TZ^XJx`-Fi-=SLVRn+Esv!OF&>j zqzD-D;D2r+@y>gfkHT((QNUe&UKnyU7Ui%kOQH?54I-k7XgRoZcoCNat{D>YJ?qm> zYu|`uV*a7Ay|uM71=qv6&K@CW6fklKjQrj<{ST?9Ji+kp-HQnS80K9#ZFBQJP5q(R zU&he?dON~^xoK~oH_Uc129Yg+%8M`i5kZKc!^2XdXFR9w_G#3=#2mnVUrkQ=mLmBt z6#XLkn3g@6|{MaZ6vE_ARL&i`mpk$n;b6c?hH z1B9Z23fF#DKW*nsMMClvV83)`h&QG?eQKWwAREcbuA2UxiAzX*gn{gTUW0dG;++;o zcL9md$hg7t&p+?!9L)S&rc=^7E-WoB7LFjVG@M^}^AG6>)z{Y-+kLuRTqXY*yVW^z z_;Q#h9U2cIm7j+`q&VD?s?(_Xh1>so?EZ`VBs(kf&qJlaIE_^GjmXoqK6hPfJ~@SJ26^?r7)+25(zU+&&-nb;ga5xC@^n;^Z@8U~ zN?K|vJpg+}Bj8n7Vxj+8K7Vi0bxa1a8#2Im57x~SJcRekOsY3kWZe&DxZ`#{_bfBl9g zEc8rFO*ql9z%ub+xBc=WNxyQo;}XkJR*!UX>!D9S*XE`&P3m=%_euY(Lcf3JMt3tD zcm&Wa9_cYyz1~8tpsZYC)pO{*)_K5lQU_pdXai(Fp9S9meEN4l&S7O`Eqq<};H{+L z&X+?U;{P+(8Od}7$ZEaR2Id**KhybEoEk_W8S_(-)rc=8KyE81v&Dp;alGw9RMsF0a)F@x-LJTKvjI3 z1O!pI&Dt&&Yyne+>Hg^ks{R2KgkYEe|HD@Qa}zsI5aof>=K|7pQ^$k zNA2h9Or9xV!gk%ug7_|1zlyBxV0^7N zPfti}y@~j8Ng1>TL&$!>V8%38fbW<5=lfZCc!&TGA^qsl4WKfFrpY|39Owp;507Ox z&5QW>G)QqUEdf!?L9qa{Ng-~ER`dM)=kp%!v5g7{AxZGwH- z^9Kf(8S)K?iC}sR>-^*ZA+-1(l=-{b@?}OuToBvpmGRtP%&K`#2}`~jtSDH97=$_p z9IE#wThPTD%-;10-(7t!3m|GR(R~E>7#;{`kf>rqC);Qws~H~t$u0lW?-ku)WF9M}B*A3849V6(RD>)D1m3Jp9)OnfiT9Or!`8 zv? z99)7?qR!K25N@>({G%NFvCr$2f@yGXe|??DG{6?&F{9m9MhAWmh(Zw5y5_el8lDJU z9F3sq7lo*M?l~lCxJ?f0`X49bxmtJPhs+|MMQ1(4%1RDz_$&#|63|$oza!`fu-Z)L z5xdi0Y~6ns1feMTER0SAYoGznKzcP?<6YJ^0v6>q@u~SGssREibi}F$2__!%4ibb; zHw@j$h7t7qZ89MB->wIhHlQMg$ZjE8K_G6Dc*BhyG zr#+GWw|l0)HT}TefAaRN89%ij{|{IAc&~!W^0-#rX75#;i=Uq)u^v2hLESOc$)@B9 z(s~Q*t zL(omTlLJ5m$m&vdmzHN}`7AB~*ATw^T7jdFkC>rhZLN>*-u}jEtR_@%IC(pcd1`ye z5XwQ1!Cb;)hmDTvq9^w|Vx`mjtU3vQT{DXBIKEnh;A0@L1g7m7>z6Wy&hnms3-jnuCLY}I6x}Kz|T*Da)LlMJ9Q~*$J>tPuy2VjR8>xd{Pni_>P@06YsJLs?$?^LX^W~?TQ9XyCQ5qq*WgR zJ|JD|^aQppAuz{y+?Tag`>!BRun`LX`vKz;Fr;QOfbf-eUJs}E?VpDnR!Unt5s*ps zCZ?v?DbUn5PflGu7AkefXnXYo;Ni4LOBH(sPS&g3R~o<+H>(6zr~029d;b26gKf{p z#ulpBgB+nMXx?!9)l@)KB3;UdMmjkSqtlU69&7~$MnyJjN9 zIek{WwZ7g@gW(wXpDa3N2x@U5$U*F`Lnl&B4lSj|{&}h(u#l(6 z`yfYkGI+{cf__Dfz`DO;^=9=$^+WuHk03w3PNti5DDhz9`g`do?lEaU$@jK@yYwo%Mru70^>nTYpJ)+js3|S^17c&y(*StJ9=3 z5_{JeW$q{LDbUG2ZTAR2s5#LK#Wz2BHjCk5R~o7{MKwA=cHJgHn*f-lbbh)ugoFnuaWMiSbyS2*Vf4mebjn)lAKp8h>vY& zB>Mz1ugFI)uWlZ{#muOnEtC8v@573%0+kR25K|?6{rDw!71XGNnjX%61LSB z*jJn9^HL?|J$&+kkgnnGSbc&_) zl;q>Pw@lI&K3fZ_IdnO_o{CViiM~Mhoi?)U+wh5L{BU;p?B;mgkI!i}e}ccL7CTZ$ z;XK=ESg7(R5+#*#PTD7rx)+Nj5_#_wLL45t`-EOfUgw5^BbYl2Z*z*_EjET;)X8TVIUlsXX=1ipk=k0IBywsr% zk^2$0gOHQV?JdRi zN*kuUYvA-=Vzv7lL&D$-g+D|GX6A z@c|SFt`k5SkLvaNoG1Q27~Oqwk5!tp_*Aon%CTIwru~W6W=(ma0YBjcI4wbR-szfUo@Cdb;Jo>N1<_z$4A516xg2+p^#NI z4EW>PzffTXRy8#>g76!sFk)xiaHiYce{VQu7jPUfDW_gycJ04tEpWtk>ak!EMV^u* z|6VI37a$Mb&{qpI8BX7@@evep!v6ugT<72b2*}1exCyDTnSUfXlVl z{d?I@^6yVLFPjcV>CD*Cq#jM{-dfM!0{qO;o9A%c0uX|%)3PSf-U9`NbD(o)EhJCy z7Ymy#}^v}eF%t306Aww8E&2b`suBw z5O4URi=3rT8L`mw?B7ADgIhah-Lx&k@e9tC zzxb3QcGUcs2z9C=yKP5PNUhNgJ48aH*FGLUW%A}}nbApT4ff-6mXvg2U=)Spi@%^8 zkfsOZlO@Pi_1N~b=0;p4-Tp>ExumKT-6^wLLy;wLF-h2Dk=biT;ewX_Mf8;y>y z6gu1tF1?(`=G9O1&`pEOfA@V|}A%>O*x^``LTT|5nZ=gNgw&Fqxpzk;w` zBYSdM(3uOPo5AZnXgVvql!J(t-A}yzqOWpkxDTrA-Ex0v3cV8@=?7HNBaaE zN2l&|(P+MHU1S#so^i{u&r5O|=I*buoHO=mlC(4H_sfm&MM>t1IjYxB|9DgGZ*WQQ zrzQH+o!?(s4*En^_?C5EWhOiGy+Y?T%vb0;9}`x-dO*F)(g5qCewHRacy7&lGI8jI z*w~}hoY6>(%`hj5MxM3bR1wW4c7=&g#-rnJzu{hWTC!U*yz}vK8k;9ZfoYgC#_39t zXlxSRr0Jfa?QA;wvLhoJRZ>TomGe#5*Au^m)3^1*IkwM_B|pGgQ&srd{H}QWfoSvZ z&)rMIQ6~P@5A3tC^NDMi1NUhBFd+E&cTP7$N_zyeFqh(Y3{ z=X^cPl3&WsB(3uW?DX2kz!MP+EFO$1<^)DtQxA@0p^L4Wnm@Xy-zU}!yk`1vsrp4m zgQEPcmVB{jQW*?isRQZk{F@Z7pLj64H}Bm+2?x@lDO?|Z*^EUN(|gP1oo_I}xxX8( z(EHyFNQk|ILYa0sQth)O3GOea+eY)(ci$bW%e___Jrr#`w5IB3vWTVdz{ZCje~o64 zH0qJ_J@mVeZX)*<97>^&acedEf#R5R;e{_OnWoYCM;YV;m7Dq;^Y^oPDrV1rcN88f zomVgNCw5m-YE79bMiZYDQgGFHoE4ym3Z?tV)A!t#@B;TDH@^Oi+e!5w{8C4Q2obtp zmv4<)3ge^5dr%6Esi5Mt~Dqfj`&nn+FI@@1| zM(=1Dzw1@}gLMw@C>a_#1HYS9K{+LLrQP3S`o@b|UffBy6tcnVz%$F{i;qW?m>#AV9f#H7<%;Ftl{VD;jhh)`{=l8=7_hx zgjG(z@2Y&?5^q`9XgmgM)#*kl%bq76aqN5awVox3&ucdB%B72+x(^oOhaJo|m6F!b zXNNZ;`?OuBj%Ot~@n*H2Boh1w$F zx)J%ndDHfvjl|(RmnR!%Wo{kea$X9S299&h{0fA+bet???dW)53h1}d9G;9-9Snc? zs=(<=XO0wRMET9zw<(*-_@`2AfBRY z(W85>c(Z7wY$0iFahN;%=82Ae9yM;b2KT*>`Ed_twXEmysrrtB);I?vTFbI459XRY z3clqRXxbQ*eTi0fw0fnoj9HE+qJXZO$q|(A}VNgy&&FS)ksL zUxe$OwaEict-}y z0z_bt9R^4M3F|oOpaQ}`lqG;0QMM3~7 zgmb!2byfB4y4AO;>wfj!#^|J520JXB7h)goi3oV><+O9NnZNOnFoR=XcEsyIpN6C_ zu&irY=X^iQi?dDb)9lfu%p_{UgxdkN6ei#1psU;Zr(P{np|o~c2`h& zz00eel~dV)?;moW5;nH#uQ;bB(j`uege-5rz<3mQW)1h@{JtD?n|7~`Qk|05tveMx zLoRqb^}unIA{NG>-?C!cecVjuZn|43`5(P}=j13)DJ1R!?^;m>-81g~j1V>C)^i>C zmg>BwwqQ%9C-O*#kK-lAoLXu05d~iTyw`3Ky;NLpzeHNvWTwxhk=nofZ8pDu#H-LV z=~|rm*q3E5esMeTh535iim>6ZnCWvpUK59mVR=tAJ$7HeB)eq!kfb1|1jtJ7BMA0E z6NZ2Ag+DuMqdySc5lTLPf4t;e?8R~3joz8Qd^B@fK=mg@D!M1L z_>#WE9)pVBuS72(V=jg7y0>&m35IqQz!mhsxY1;jwt+}W!N{`xrBivf?P=ReVs$Nt zjANDCgxjnBx?9;1$VM1BZNu$u>t{GMn+6-a(doPn+I2q3d`7O!t{5W3KDrwxZU2xK zycO{*XKE2==W@uk>!7kllr@%aiXimq_ZEHPV9PDdb@-CcSL3+HaXW;G_ROEkg5pjK z7#+*~H@!7^kGr{s{^7A>w*5J~aDGQmj)}83R|V+f>jyAaokw}u{}uRnE4PCBMz*$Q za!ZoJz&t9VJiI0sp>1=(@pMX#9x!uaYe7O$WYe(HRU3EWr8YAy+!ZsinZq)F_we8iAwa zqk_+P#qIU4rgRx~9BfIduNyCGbg8^G&P`k&HCrEyN68Hi2aBTber{eK!QZ??vsP3Q z%(`?TH!j_LIlX^$j^H;kk5OFw#aM9DRMCGC4vY#J2^V+neLOA6c=x8H3iFUN-6|hwqKLr|N1;6Z|3?%lO2J(_jVmeXFav>a-#aQ3~^_p=PXR8O4H|?4ravG zow3=Rd~0bJ+|g+`6Z3eamf;*qrJ>ha)p%fyW9JLanQuw+z{`At&s?&-~KG%m0~$iaF1 zlKjsHo4(h8wPVd}*WC0Hpbmk&f$K_p19<9?1;WaxT~tBTeOmQMcrWlqiyv8YwQNGH z;D^w@hAe}1-hh(e(A_kBfwt1b;|C~k@=1BhlUKr}wsw?fN0WoSy^$)&EF&{G4t@~p zQ@^R=a2@Yy(_b};2yWCKwgi@cUykvc#;|B~Vu|3&Hz9S;g@!(TFN<+j`;e(d1%&lR=e3N3-Wnpg|qj>NYfd_RjjMY9{XeG)9{~KLn!y3U;H6udrxP& zCZu-rcavNqMs`auF>m-=|GcbTl)|std&=lv@}EH@{~Dn98b8={5yr?&Bd5YgD1%4L z<6rIVRNuYH(E*W2#BO!gJ5E8~hHhik)rO1wv$f97+;m9IN%mOB_Vw@}H?AruK3|}C z>Y!AG`Z1`G{y*d&KK%03U*WbA;<_ubFoQIB9?~fHeZ!QeGwskT;uE0Y3bdn+i;$cpvOkwupVB1(TY zKKkrTrQNa)m+HA*qTmxxRQ3NP$nz2tUZ-0U+IlxyGigc!gOD<7ciAqs_V<3PtfU0* zM#$6Xg;4DLGvJ+sxxtC?&Ri^)C8tJh93Tf} zCpp6@uEs8`;8(sVFSdv}=TNkOFX~Fwm1(13KX>>0NhDptNN)?$Mah&cWoPqh0V|;R z{GI14!Yf_w>D&vt(}|?1J3;nXEIby*!NsN65f@X@k(E$vp2EDp+cKtef)inv=g1mk z@x#4t)*bd8eb{>IR8nr(?+u-v_+&Pj1$u3J^YWl@(_lX<&xeh`slV$Hr;NRu{jg2X z#OhdDk_3CP(cgFdqYr=JuKC%FE&3lsjxJgv{UQf#PI{5Et`J_KkO_PN>y?P6H5(kx zhBsNt(+^NE!8}9v{5>Si{hA;fUq(NN_)1aw?TFfOcmcQNlJ4p8M^*H%MCOCy3HcxY zNM7oH(6#TYUT29d5Ht?mvvbWvx*SXEsJ*LJd|toI+KHm28$+hk>3fVSMMVu~#s(&e zXP(mO8!QyDj*b*?C2^nB!}w(i43n4V`fTLQ>IbMBcP`eQa@P=0A3SJEwY&}%EFSYm z+-QaE&_}6dD<#J7%{2RFa}Gy;SsV{7!H+ozYTT$&I}+kiPOOb&tWW}bB9~0o2x-30Y)xvJHIGq-@j_PewA$ z3buJY?%Md%Dewx?g`$ty!43dXC=suMoP*k1<*NquQiD7v+nu*qSX(>57t&Svp9k@q zn-X|ki4>c>eoL836fHLu}06(;M zb}qcKZVO7aIU^b@=SG$L-v*n_sFiG7j7jpkne8b2X<*SS53D_X_w#KMsQ|vV{Q-Ov z1tjAhNz#$GsTq=xfRu0zX;vb|j#{NJwfT{0-X0Lp!~Wd44|w^ehN&SYGN_Nim>>dc zy9FBUJ_!Y%R}@&23jy$8toouN+6*TuCoeAc9{#RRWAIHA-alV~wgoieLrJ4NFoKl|zLqkjW7?vvlhb1e1A+lEWrEAK9IdtYvwI=9uq$!0!kQUxRVNl2OXj%2m!sYQ z0E7?GK{_D_NePKWI$~-FE!lwReMP-X9!(S>W{o54`>u z6ZrJIk13cwIINKmgU;kYJx)3$TB%@?-`LpLUM1xThN&FasVF+C3Sr9-$$k4v0o2Bmeq!Gu7jYKMQ*N z0UET;FaR?ezO6T5YSrb23mr)x-nK}1Xa6-jz1JN$Q0Mx?hV7j&GeO3F{SrI#+!V+R z?Ql4%<^Ia!Y1M3;?$&hXkWtZ46@OV_I#n8QLwx~=;-^y&oSWX&l!-xC@e8sIg8B}{ z00}L;!@r?6=s@Hn_4J&aVwg&_%drEa49lP`WpaQRgT{j?i6yWXp94l(Pz}VJqTbkF z)yl_=xdRjkxO4$GnFh4B)Zt+;@|8xH>3}u z71@AZ&}cLV045vMOdbI=U>pFp4&mYSk(x3lVBuMvo%vvA+WjRd+l}r4b+%Qup_T2h z*mru-I2)zSYN|5I>9U)?O$1Mo-NR7Z%+JgYZHk$fV> zQk@G*tM_{l=NEtJk32>Mn$|FLC@>yv(h2+hd7_XlI+%ReU=Z7x;y*Go87KyjM?PS_ zTmb=51?w-y9oGSUFiGk+m$v1Yw!55hYDdgM)P@tG*t$sQ4+{XzqpVTXVinTn(qicfTEEw!U!0VpV8*KmB+*t){<@=u$*T8=e=7OK4)o z@XkE#1u19jcy!S6;{WYCqP~}-mNqsiy}fL<@?w5R&*+U3_LURH4kjsDBR?1GP=qEvJmv}8@I4!&S?I3eO z9{0t`H*S!=pBckjh+M4ft)P8 z*Vcy7nT5s0{BH6rcIb0dATN(c7`{=G98K#^JwQiIH#?lF>m6_1f>mAcDB6h&_}`17 z34yex|Ipgs9tx;{zkgEb%3A5Xm;I*7c;vD|JEPzCj(hrNsSM~7*2hbaUikgL0lMV) AJ^%m! diff --git a/uno-plugins/pom.xml b/uno-plugins/pom.xml deleted file mode 100644 index f7e3cb97..00000000 --- a/uno-plugins/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - uno - cc.allio - 1.1.9 - - 4.0.0 - - uno-plugins - pom - - - uno-plugins-manager - uno-plugins-platform - - \ No newline at end of file diff --git a/uno-plugins/uno-plugins-manager/pom.xml b/uno-plugins/uno-plugins-manager/pom.xml deleted file mode 100644 index 6353fc84..00000000 --- a/uno-plugins/uno-plugins-manager/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - uno-plugins - cc.allio - 1.1.9 - ../pom.xml - - 4.0.0 - - uno-plugins-manager - - \ No newline at end of file diff --git a/uno-plugins/uno-plugins-platform/pom.xml b/uno-plugins/uno-plugins-platform/pom.xml deleted file mode 100644 index d69f0b75..00000000 --- a/uno-plugins/uno-plugins-platform/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - uno-plugins - cc.allio - 1.1.9 - ../pom.xml - - 4.0.0 - - uno-plugins-platform - - \ No newline at end of file diff --git a/uno-rule/pom.xml b/uno-rule/pom.xml index 30512dc6..84641181 100644 --- a/uno-rule/pom.xml +++ b/uno-rule/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cc.allio - uno - 1.1.9 + cc.allio.uno + uno-parent + 1.2.0 uno-rule @@ -27,11 +27,11 @@ - cc.allio + cc.allio.uno uno-starter-core - cc.allio + cc.allio.uno uno-test test @@ -64,4 +64,4 @@ - \ No newline at end of file + diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/RuleEngineFactory.java b/uno-rule/src/main/java/cc/allio/uno/rule/RuleEngineFactory.java index 0c0591a4..1e60b2da 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/RuleEngineFactory.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/RuleEngineFactory.java @@ -14,7 +14,6 @@ * rule engine factory * * @author j.x - * @date 2023/4/25 15:42 * @since 1.1.4 */ public class RuleEngineFactory { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/Action.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/Action.java index 0d60baa6..73799e9b 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/Action.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/Action.java @@ -6,7 +6,6 @@ * 定义规则触发后执行的动作 * * @author j.x - * @date 2023/4/25 09:36 * @since 1.1.4 */ public interface Action { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/DefaultRuleResult.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/DefaultRuleResult.java index 953c7dd1..279c5288 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/DefaultRuleResult.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/DefaultRuleResult.java @@ -36,7 +36,6 @@ * 默认规则结果集，基于event-bus与定时器机制进行实现。 * * @author j.x - * @date 2023/4/25 14:48 * @since 1.1.4 */ @Slf4j diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/EventBusRuleEngine.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/EventBusRuleEngine.java index 6f6fb6f9..f111da28 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/EventBusRuleEngine.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/EventBusRuleEngine.java @@ -14,7 +14,6 @@ * 基于{@link EventBus}的规则引擎 * * @author j.x - * @date 2023/4/25 13:07 * @since 1.1.4 */ public abstract class EventBusRuleEngine implements RuleEngine { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/Fact.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/Fact.java index 6014cb56..00cb204a 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/Fact.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/Fact.java @@ -12,7 +12,6 @@ * rule 事实对象 * * @author j.x - * @date 2023/4/23 17:21 * @since 1.1.4 */ public interface Fact extends Map, Serializable { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/FactImpl.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/FactImpl.java index e1e63c57..923682d5 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/FactImpl.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/FactImpl.java @@ -16,7 +16,6 @@ * 事实对象默认实现 * * @author j.x - * @date 2023/4/23 17:22 * @since 1.1.4 */ @ToString(of = "variables") diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/LogicPredicate.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/LogicPredicate.java index c59156d9..b2cb9351 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/LogicPredicate.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/LogicPredicate.java @@ -9,7 +9,6 @@ * logic谓词 * * @author j.x - * @date 2023/4/22 11:47 * @since 1.1.4 */ @Getter diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/MatchIndex.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/MatchIndex.java index e6d27fc3..d082bede 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/MatchIndex.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/MatchIndex.java @@ -10,7 +10,6 @@ * 规则匹配的索引 * * @author j.x - * @date 2023/4/24 18:43 * @since 1.1.4 */ @Getter diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/OP.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/OP.java index 54369bd6..6c1971c9 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/OP.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/OP.java @@ -9,7 +9,6 @@ * 规则指标操作 * * @author j.x - * @date 2023/4/23 09:34 * @since 1.1.4 */ @Getter diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/Rule.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/Rule.java index ee760686..ae9a5ecf 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/Rule.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/Rule.java @@ -7,7 +7,6 @@ * uno rule api * * @author j.x - * @date 2023/4/22 11:48 * @since 1.1.4 */ public interface Rule extends Serializable { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttr.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttr.java index d12be630..1e1cb5c5 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttr.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttr.java @@ -9,7 +9,6 @@ * 规则属性，包含属性key，关系符号（>、<、==..），逻辑关系，以及生成的表达式 a > 5.. * * @author j.x - * @date 2023/4/23 09:31 * @see RuleAttrBuilder * @since 1.1.4 */ diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrBuilder.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrBuilder.java index 1ea554ee..8950c0f1 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrBuilder.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrBuilder.java @@ -6,7 +6,6 @@ * rule index builder * * @author j.x - * @date 2023/4/23 17:28 * @see RuleAttr * @since 1.1.4 */ diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrBuilderImpl.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrBuilderImpl.java index 08b0fb25..244fc397 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrBuilderImpl.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrBuilderImpl.java @@ -9,7 +9,6 @@ * 默认实现 * * @author j.x - * @date 2023/4/23 17:33 * @since 1.1.4 */ public class RuleAttrBuilderImpl implements RuleAttrBuilder { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrImpl.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrImpl.java index c69d9445..8c6634bf 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrImpl.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleAttrImpl.java @@ -15,7 +15,6 @@ * default rule index * * @author j.x - * @date 2023/4/23 19:42 * @see RuleAttrBuilder#get() * @since 1.1.4 */ diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleBuilder.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleBuilder.java index 7c13d4e7..ca977821 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleBuilder.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleBuilder.java @@ -8,7 +8,6 @@ * drools rule builder * * @author j.x - * @date 2023/4/23 17:02 * @since 1.1.4 */ public interface RuleBuilder { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleBuilderImpl.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleBuilderImpl.java index d465c002..29caffad 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleBuilderImpl.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleBuilderImpl.java @@ -12,7 +12,6 @@ * RuleBuilderImpl 默认实现 * * @author j.x - * @date 2023/4/23 17:05 * @since 1.1.4 */ public class RuleBuilderImpl implements RuleBuilder { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleEngine.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleEngine.java index fe3321d7..650bf433 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleEngine.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleEngine.java @@ -6,7 +6,6 @@ * rule engine 定义 * * @author j.x - * @date 2023/4/23 17:20 * @since 1.1.4 */ public interface RuleEngine { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleImpl.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleImpl.java index 67c3d906..4bad54e3 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleImpl.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleImpl.java @@ -12,7 +12,6 @@ * default * * @author j.x - * @date 2023/4/23 19:22 * @see RuleBuilder#get() * @since 1.1.4 */ diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleResult.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleResult.java index dc547b7d..67296ef3 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleResult.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/RuleResult.java @@ -14,7 +14,6 @@ * 定义Rule Result * * @author j.x - * @date 2023/4/23 13:40 * @since 1.1.4 */ public interface RuleResult { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/BaseEvent.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/BaseEvent.java index e73c23a7..2418ea37 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/BaseEvent.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/BaseEvent.java @@ -9,7 +9,6 @@ * rule event on base * * @author j.x - * @date 2023/4/28 14:11 * @since 1.1.4 */ public abstract class BaseEvent extends ContextTopicEvent { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/ErrorEvent.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/ErrorEvent.java index b78e9fbd..93c39af3 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/ErrorEvent.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/ErrorEvent.java @@ -8,7 +8,6 @@ * 当发生错误时抛出 * * @author j.x - * @date 2023/4/25 10:31 * @since 1.1.4 */ public class ErrorEvent extends BaseEvent { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/EventAction.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/EventAction.java index 032a1532..14a68ad4 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/EventAction.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/EventAction.java @@ -8,7 +8,6 @@ * 基于事件的action * * @author j.x - * @date 2023/4/25 14:03 * @since 1.1.4 */ public class EventAction implements Action { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/FireEvent.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/FireEvent.java index 85aa86fa..8b7ea8c3 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/FireEvent.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/FireEvent.java @@ -8,7 +8,6 @@ * 触发报警规则事件 * * @author j.x - * @date 2023/4/25 09:04 * @since 1.1.4 */ public class FireEvent extends BaseEvent { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/Listener.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/Listener.java index 5798d336..8e1bfa2e 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/Listener.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/Listener.java @@ -9,7 +9,6 @@ * 规则触发的监听器 * * @author j.x - * @date 2023/4/24 14:02 * @since 1.1.4 */ public interface Listener { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/MatchEvent.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/MatchEvent.java index f00783f8..00156b3c 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/MatchEvent.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/MatchEvent.java @@ -8,7 +8,6 @@ * 匹配事件 * * @author j.x - * @date 2023/4/24 20:04 * @since 1.1.4 */ public class MatchEvent extends BaseEvent { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/NoMatchEvent.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/NoMatchEvent.java index cc28c251..643932be 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/NoMatchEvent.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/NoMatchEvent.java @@ -8,7 +8,6 @@ * 没有匹配事件 * * @author j.x - * @date 2023/4/24 20:05 * @since 1.1.4 */ public class NoMatchEvent extends BaseEvent { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/RuleContext.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/RuleContext.java index dd2b5296..e3de1438 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/event/RuleContext.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/event/RuleContext.java @@ -14,7 +14,6 @@ * Rule运行时上下文对象 * * @author j.x - * @date 2023/4/23 16:38 * @since 1.1.4 */ public class RuleContext extends DefaultEventContext { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/AttrElement.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/AttrElement.java index 8f64ce94..7e0b3d87 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/AttrElement.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/AttrElement.java @@ -15,7 +15,6 @@ * rule expression。该节点一定是叶子节点 * * @author j.x - * @date 2023/4/26 11:53 * @since 1.1.4 */ public class AttrElement extends LogicGroup { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/CompilationRule.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/CompilationRule.java index b883c5e0..70484c7f 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/CompilationRule.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/CompilationRule.java @@ -8,7 +8,6 @@ * 根据跟定的对象把其汇编成规则树结果或者根据规则树反编译成规则项 * * @author j.x - * @date 2023/4/26 12:07 * @since 1.1.4 */ public interface CompilationRule { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/DefaultCompilationRule.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/DefaultCompilationRule.java index 1d885e2f..214080ac 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/DefaultCompilationRule.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/DefaultCompilationRule.java @@ -12,7 +12,6 @@ * 默认实现 * * @author j.x - * @date 2023/4/26 12:13 * @since 1.1.4 */ public class DefaultCompilationRule implements CompilationRule { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/GroupElement.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/GroupElement.java index f825ec9b..de565a92 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/GroupElement.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/GroupElement.java @@ -6,7 +6,6 @@ * group node. tag for element * * @author j.x - * @date 2023/4/26 12:04 * @since 1.1.4 */ public interface GroupElement> extends LiteralElement { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LiteralElement.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LiteralElement.java index f069055b..031e69b3 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LiteralElement.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LiteralElement.java @@ -6,7 +6,6 @@ * 包含规则表达式的结点 * * @author j.x - * @date 2023/11/9 11:07 * @since 1.1.5 */ public interface LiteralElement> extends Element { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LogicGroup.java b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LogicGroup.java index 27144cce..59a02783 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LogicGroup.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/api/vistor/LogicGroup.java @@ -17,7 +17,6 @@ * logic * * @author j.x - * @date 2023/4/26 11:53 * @since 1.1.4 */ public class LogicGroup extends TraversalElement implements GroupElement { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/config/RuleProperties.java b/uno-rule/src/main/java/cc/allio/uno/rule/config/RuleProperties.java index 38154b1a..a700d1b1 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/config/RuleProperties.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/config/RuleProperties.java @@ -7,7 +7,6 @@ * rule properties * * @author j.x - * @date 2023/4/25 15:54 * @since 1.1.4 */ @Data diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleDescr.java b/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleDescr.java index d8561af1..e35b305d 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleDescr.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleDescr.java @@ -8,7 +8,6 @@ * 添加{@link Rule}实例 * * @author j.x - * @date 2023/4/24 18:29 * @since 1.1.4 */ public class DroolsRuleDescr extends RuleDescr { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleEngine.java b/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleEngine.java index 1ae27562..03b45ca2 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleEngine.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleEngine.java @@ -15,7 +15,6 @@ * 基于drools的规则引擎 * * @author j.x - * @date 2023/4/23 17:43 * @since 1.1.4 */ @Slf4j @@ -77,4 +76,4 @@ protected void onFire(RuleContext context) { } } } -} \ No newline at end of file +} diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleManager.java b/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleManager.java index 04ab188e..2fa891e5 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleManager.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/drools/DroolsRuleManager.java @@ -23,7 +23,6 @@ * 用于管理drools的类 * * @author j.x - * @date 2023/4/23 19:49 * @see Fact#ruleValues() 构建运行时数据 * @see /src/test/resources/cc/allio/uno/rule/drools/ruleindex.drl 构建的drl数据 * @since 1.1.4 diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/easyrules/EasyRulesEngine.java b/uno-rule/src/main/java/cc/allio/uno/rule/easyrules/EasyRulesEngine.java index df69d25b..d07b8de3 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/easyrules/EasyRulesEngine.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/easyrules/EasyRulesEngine.java @@ -7,7 +7,6 @@ * 基于 easy rules engien * * @author j.x - * @date 2023/4/25 15:51 * @since 1.1.4 */ public class EasyRulesEngine extends EventBusRuleEngine { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleBuilderException.java b/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleBuilderException.java index 7f33effb..c709e23f 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleBuilderException.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleBuilderException.java @@ -4,7 +4,6 @@ * Rule builder 异常 * * @author j.x - * @date 2023/4/23 17:16 * @since 1.1.4 */ public class RuleBuilderException extends RuntimeException { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleResultRuntimeException.java b/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleResultRuntimeException.java index 12cafff8..9e9d4590 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleResultRuntimeException.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleResultRuntimeException.java @@ -4,7 +4,6 @@ * 结果集运行时异常 * * @author j.x - * @date 2023/4/25 10:30 * @since 1.1.4 */ public class RuleResultRuntimeException extends RuntimeException { diff --git a/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleResultTimeoutException.java b/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleResultTimeoutException.java index 8482bb07..57c6c3da 100644 --- a/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleResultTimeoutException.java +++ b/uno-rule/src/main/java/cc/allio/uno/rule/exception/RuleResultTimeoutException.java @@ -4,7 +4,6 @@ * 结果集超时异常 * * @author j.x - * @date 2023/4/25 10:46 * @since 1.1.4 */ public class RuleResultTimeoutException extends RuntimeException { diff --git a/uno-sequential/pom.xml b/uno-sequential/pom.xml index 15d97f1a..6d130dc9 100644 --- a/uno-sequential/pom.xml +++ b/uno-sequential/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cc.allio - uno - 1.1.9 + cc.allio.uno + uno-parent + 1.2.0 uno-sequential @@ -19,16 +19,16 @@ - cc.allio + cc.allio.uno uno-core - cc.allio + cc.allio.uno uno-kafka provided - cc.allio + cc.allio.uno uno-data-elasticsearch @@ -48,7 +48,7 @@ test - cc.allio + cc.allio.uno uno-test test diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/BaseCompositeSequential.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/BaseCompositeSequential.java index 0c7a3648..09a2a33e 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/BaseCompositeSequential.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/BaseCompositeSequential.java @@ -13,7 +13,6 @@ * 组合的时序数据，时序数据的类型为组合的时序数据类型 * * @author j.x - * @date 2021/12/20 14:04 * @since 1.0 */ @Slf4j diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/CompositeSequential.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/CompositeSequential.java index 6f05c1f3..a60ce493 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/CompositeSequential.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/CompositeSequential.java @@ -11,7 +11,6 @@ * 复合类型时序数据 * * @author j.x - * @date 2022/11/22 10:33 * @since 1.1.1 */ public interface CompositeSequential extends CompositeMetadata, Sequential { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/Sequential.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/Sequential.java index b8604737..d60b156f 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/Sequential.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/Sequential.java @@ -13,8 +13,7 @@ /** * 时序数据接口，模版方法（获取有关时序数据操作）。 * - * @author jw - * @date 2021/12/13 14:10 + * @author j.x */ public interface Sequential extends Metadata { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/SubscriptionProperties.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/SubscriptionProperties.java index 8cc83c6c..5b6f2a4e 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/SubscriptionProperties.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/SubscriptionProperties.java @@ -16,7 +16,6 @@ * * * @author j.x - * @date 2022/2/7 16:14 * @since 1.0 */ @Data diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/SubscriptionPropertiesTypeManager.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/SubscriptionPropertiesTypeManager.java index b055d0ad..05e009ec 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/SubscriptionPropertiesTypeManager.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/SubscriptionPropertiesTypeManager.java @@ -12,7 +12,6 @@ * 基于{@link SubscriptionProperties}内存主题 * * @author j.x - * @date 2023/4/12 11:45 * @since 1.1.4 */ public class SubscriptionPropertiesTypeManager extends MemoryTypeManager { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/bus/SequentialEventBus.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/bus/SequentialEventBus.java index 758b6eb2..873276f9 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/bus/SequentialEventBus.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/bus/SequentialEventBus.java @@ -17,8 +17,7 @@ /** * 基于Spring的事件总线 * - * @author jw - * @date 2021/12/16 11:22 + * @author j.x */ @Slf4j public class SequentialEventBus extends BaseEventBus implements InitializingBean, DisposableBean, ApplicationContextAware { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/compute/Compute.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/compute/Compute.java index f4ff7b99..eee4eef3 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/compute/Compute.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/compute/Compute.java @@ -6,7 +6,6 @@ * 计算属性 * * @author j.x - * @date 2023/5/26 16:43 * @since 1.1.4 */ @FunctionalInterface diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/compute/ComputedManager.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/compute/ComputedManager.java index 4fc4c3a4..4586a4c7 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/compute/ComputedManager.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/compute/ComputedManager.java @@ -11,7 +11,6 @@ * 计算实例管理器 * * @author j.x - * @date 2023/5/26 16:52 * @since 1.1.4 */ @Getter diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/context/DefaultSequentialContext.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/context/DefaultSequentialContext.java index 14be980f..88c6f8ad 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/context/DefaultSequentialContext.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/context/DefaultSequentialContext.java @@ -13,8 +13,7 @@ /** * 事件总线数据上下文 * - * @author jw - * @date 2021/12/17 15:47 + * @author j.x */ public class DefaultSequentialContext extends DefaultEventContext implements SequentialContext { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/context/SequentialContext.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/context/SequentialContext.java index 04344016..a6f997d1 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/context/SequentialContext.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/context/SequentialContext.java @@ -15,8 +15,6 @@ * 事件总线上下文对象 * * @author j.x - * @date 2021/12/29 14:41 - * @modify 1.0.6 * @since 1.0 */ public interface SequentialContext extends EventContext { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/DispatchDispatcher.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/DispatchDispatcher.java index f3690964..28b4081b 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/DispatchDispatcher.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/DispatchDispatcher.java @@ -14,7 +14,6 @@ * 对{@link Dispatcher}进行调度的调度器 * * @author j.x - * @date 2022/2/26 22:55 * @since 1.0 */ @Slf4j diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/DispatchSourceCollector.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/DispatchSourceCollector.java index f1e30060..c63be48c 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/DispatchSourceCollector.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/DispatchSourceCollector.java @@ -7,7 +7,6 @@ * 基于{@link Dispatcher}分派数据源 * * @author j.x - * @date 2022/11/22 11:26 * @since 1.1.2 */ public class DispatchSourceCollector implements SourceCollector { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/Dispatcher.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/Dispatcher.java index 936dc718..cac1d531 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/Dispatcher.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/dispatch/Dispatcher.java @@ -10,9 +10,8 @@ * 它将会构建一个责任链 * * @author j.x - * @date 2022/2/26 22:48 * @see org.springframework.core.Ordered - * @see javax.annotation.Priority + * @see jakarta.annotation.Priority * @since 1.0 */ public interface Dispatcher { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/exception/ProcessHandlerException.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/exception/ProcessHandlerException.java index 67a57580..5d946e45 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/exception/ProcessHandlerException.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/exception/ProcessHandlerException.java @@ -4,7 +4,6 @@ * 执行处理器异常 * * @author j.x - * @date 2021/12/31 11:00 * @since 1.0 */ public class ProcessHandlerException extends RuntimeException { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/DefaultProcessPipeline.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/DefaultProcessPipeline.java index f2bd5415..de41acd7 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/DefaultProcessPipeline.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/DefaultProcessPipeline.java @@ -16,8 +16,7 @@ /** * 默认流水实例对象，handler对象采取优先级队列存储， * - * @author jw - * @date 2021/12/13 14:46 + * @author j.x */ @Slf4j public class DefaultProcessPipeline implements ProcessPipeline { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/DefaultProcessor.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/DefaultProcessor.java index 82ef9ebf..970850f7 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/DefaultProcessor.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/DefaultProcessor.java @@ -33,8 +33,7 @@ *

外部调用{@link #process(SequentialContext)}把数据转发到主题{@link #DISPATCH_TOPIC}上，调用{@link #onDispatch(SequentialContext)}。

*

随后通过{@link TypeManager}判断时序数据是否存在于类型管理器中，如果存在则推送{@link #TOPIC_TEMPLATE}+时序数据类型的主题。在{@link #onProcess(SequentialContext)}在进行具体处理

* - * @author jw - * @date 2021/12/13 16:46 + * @author j.x */ @Slf4j public class DefaultProcessor implements Processor, InitializingBean, DisposableBean { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/ProcessPipeline.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/ProcessPipeline.java index 844b8ebb..641cecd4 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/ProcessPipeline.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/ProcessPipeline.java @@ -6,8 +6,7 @@ /** * 处理流水线，在时序数据处理中 * - * @author jw - * @date 2021/12/13 14:13 + * @author j.x */ public interface ProcessPipeline { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/Processor.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/Processor.java index 06d354f6..df537821 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/Processor.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/Processor.java @@ -9,8 +9,7 @@ /** * 时序数据处理器 * - * @author jw - * @date 2021/12/13 14:05 + * @author j.x */ public interface Processor { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/AbstractProcessHandler.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/AbstractProcessHandler.java index e1f31ab4..9e71ec3c 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/AbstractProcessHandler.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/AbstractProcessHandler.java @@ -10,8 +10,7 @@ /** * 抽象处理器 * - * @author jw - * @date 2021/12/13 16:38 + * @author j.x */ @Slf4j public abstract class AbstractProcessHandler implements ProcessHandler { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/AppendProcessHandler.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/AppendProcessHandler.java index 314d2d1c..f2f6f639 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/AppendProcessHandler.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/AppendProcessHandler.java @@ -12,7 +12,6 @@ * 在{@link ProcessPipeline#active}执行 * * @author j.x - * @date 2021/12/20 10:47 * @since 1.0 */ public interface AppendProcessHandler extends Comparable { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/ProcessHandler.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/ProcessHandler.java index 6591e632..616d07f1 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/ProcessHandler.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/ProcessHandler.java @@ -10,8 +10,7 @@ * 执行链的处理器
* 在具体实现类中加上{@link com.google.auto.service.AutoService}注解 * - * @author jw - * @date 2021/12/13 14:28 + * @author j.x * @see AbstractProcessHandler */ public interface ProcessHandler { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/ProcessHandlerChain.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/ProcessHandlerChain.java index 1fde00c9..ede17b28 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/ProcessHandlerChain.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/process/handle/ProcessHandlerChain.java @@ -5,8 +5,7 @@ /** * 处理链 * - * @author jw - * @date 2021/12/13 15:49 + * @author j.x */ public interface ProcessHandlerChain { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/transform/Transducer.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/transform/Transducer.java index dba3a94a..0ff8b0f6 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/transform/Transducer.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/transform/Transducer.java @@ -9,7 +9,6 @@ * 数据转换 * * @author j.x - * @date 2022/5/20 10:24 * @since 1.0 */ public interface Transducer { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/transform/TransformBuilder.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/transform/TransformBuilder.java index 70a064e1..b5bbda5f 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/transform/TransformBuilder.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/transform/TransformBuilder.java @@ -13,7 +13,6 @@ * 数据转换建造者 * * @author j.x - * @date 2022/5/20 12:03 * @since 1.0 */ public class TransformBuilder { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/DefaultWasher.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/DefaultWasher.java index 69f83662..0488262a 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/DefaultWasher.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/DefaultWasher.java @@ -12,7 +12,6 @@ * 默认数据清洗操作 * * @author j.x - * @date 2022/5/19 13:59 * @since 1.0 */ @AutoService(Washer.class) diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/FilterWasher.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/FilterWasher.java index 255b3d31..d6cc01a6 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/FilterWasher.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/FilterWasher.java @@ -8,7 +8,6 @@ * 数据、类型过滤清洁器 * * @author j.x - * @date 2022/5/20 15:38 * @since 1.0 */ public interface FilterWasher { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/MandatoryTypeWasher.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/MandatoryTypeWasher.java index 740fb8b4..0f5a927f 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/MandatoryTypeWasher.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/MandatoryTypeWasher.java @@ -8,7 +8,6 @@ * 不跳过类型检测 * * @author j.x - * @date 2022/5/20 15:36 * @since 1.0 */ public abstract class MandatoryTypeWasher implements FilterWasher { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/WashMachine.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/WashMachine.java index 475fd7e7..9f8210d0 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/WashMachine.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/WashMachine.java @@ -23,7 +23,6 @@ * 清洗机器 * * @author j.x - * @date 2022/5/19 14:34 * @since 1.0 */ @Slf4j diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/Washer.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/Washer.java index 0f470911..2af4813e 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/Washer.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/Washer.java @@ -10,7 +10,6 @@ * 数据清洗器，子类必须有一个无参构造器 * * @author j.x - * @date 2022/5/19 13:55 * @since 1.0 */ public interface Washer { diff --git a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/WasherAssembler.java b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/WasherAssembler.java index 3cc38a7a..815fea86 100644 --- a/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/WasherAssembler.java +++ b/uno-sequential/src/main/java/cc/allio/uno/sequnetial/washer/WasherAssembler.java @@ -11,7 +11,6 @@ * 清洁器装配器 * * @author j.x - * @date 2022/5/19 14:33 * @since 1.0 */ public class WasherAssembler { diff --git a/uno-sequential/src/test/java/cc/allio/uno/sequential/TypeSequential.java b/uno-sequential/src/test/java/cc/allio/uno/sequential/TypeSequential.java index f7dc40bd..596b6ac6 100644 --- a/uno-sequential/src/test/java/cc/allio/uno/sequential/TypeSequential.java +++ b/uno-sequential/src/test/java/cc/allio/uno/sequential/TypeSequential.java @@ -14,7 +14,6 @@ * 类型为type的时序数据 * * @author j.x - * @date 2022/5/20 13:33 * @since 1.0 */ public class TypeSequential implements Sequential { diff --git a/uno-sequential/src/test/java/cc/allio/uno/sequential/bus/SequentialEventBusTest.java b/uno-sequential/src/test/java/cc/allio/uno/sequential/bus/SequentialEventBusTest.java index c7bf64ed..45926e2d 100644 --- a/uno-sequential/src/test/java/cc/allio/uno/sequential/bus/SequentialEventBusTest.java +++ b/uno-sequential/src/test/java/cc/allio/uno/sequential/bus/SequentialEventBusTest.java @@ -23,7 +23,6 @@ * 测试时序事件总线 * * @author j.x - * @date 2022/2/7 11:18 * @see SequentialEventBus * @since 1.0 */ diff --git a/uno-sequential/src/test/java/cc/allio/uno/sequential/wash/DefaultWasherTest.java b/uno-sequential/src/test/java/cc/allio/uno/sequential/wash/DefaultWasherTest.java index 9ab6e3e3..88726f40 100644 --- a/uno-sequential/src/test/java/cc/allio/uno/sequential/wash/DefaultWasherTest.java +++ b/uno-sequential/src/test/java/cc/allio/uno/sequential/wash/DefaultWasherTest.java @@ -11,7 +11,6 @@ * 测试默认清洗器 * * @author j.x - * @date 2022/5/19 16:54 * @since 1.0 */ class DefaultWasherTest extends BaseTestCase { diff --git a/uno-sequential/src/test/java/cc/allio/uno/sequential/wash/WasherAssemblerTest.java b/uno-sequential/src/test/java/cc/allio/uno/sequential/wash/WasherAssemblerTest.java index 576968d6..3f0df145 100644 --- a/uno-sequential/src/test/java/cc/allio/uno/sequential/wash/WasherAssemblerTest.java +++ b/uno-sequential/src/test/java/cc/allio/uno/sequential/wash/WasherAssemblerTest.java @@ -19,7 +19,6 @@ * 测试清洁装备器 * * @author j.x - * @date 2022/5/19 16:17 * @since 1.0 */ @RunTest(components = UnoElasticSearchAutoConfiguration.class) diff --git a/uno-starters/pom.xml b/uno-starters/pom.xml index 4e549a68..032ee486 100644 --- a/uno-starters/pom.xml +++ b/uno-starters/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - uno - cc.allio - 1.1.9 + uno-parent + cc.allio.uno + 1.2.0 4.0.0 @@ -25,10 +25,10 @@ spring-boot-autoconfigure - cc.allio + cc.allio.uno uno-auto provided - \ No newline at end of file + diff --git a/uno-starters/uno-starter-core/pom.xml b/uno-starters/uno-starter-core/pom.xml index 1fc4c8e2..25f07111 100644 --- a/uno-starters/uno-starter-core/pom.xml +++ b/uno-starters/uno-starter-core/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> uno-starters - cc.allio - 1.1.9 + cc.allio.uno + 1.2.0 4.0.0 @@ -13,9 +13,9 @@ - cc.allio + cc.allio.uno uno-core - \ No newline at end of file + diff --git a/uno-starters/uno-starter-core/src/main/java/cc/allio/uno/starter/core/UnoCoreAutoConfiguration.java b/uno-starters/uno-starter-core/src/main/java/cc/allio/uno/starter/core/UnoCoreAutoConfiguration.java index 54cc1107..5ad86e36 100644 --- a/uno-starters/uno-starter-core/src/main/java/cc/allio/uno/starter/core/UnoCoreAutoConfiguration.java +++ b/uno-starters/uno-starter-core/src/main/java/cc/allio/uno/starter/core/UnoCoreAutoConfiguration.java @@ -18,7 +18,6 @@ * Uno Core自动配置类 * * @author j.x - * @date 2022/2/7 14:43 * @since 1.0 */ @Configuration(proxyBeanMethods = false) diff --git a/uno-starters/uno-starter-kafka/pom.xml b/uno-starters/uno-starter-kafka/pom.xml index 7322a969..1de2a44e 100644 --- a/uno-starters/uno-starter-kafka/pom.xml +++ b/uno-starters/uno-starter-kafka/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> uno-starters - cc.allio - 1.1.9 + cc.allio.uno + 1.2.0 4.0.0 @@ -13,9 +13,9 @@ - cc.allio + cc.allio.uno uno-kafka - \ No newline at end of file + diff --git a/uno-starters/uno-starter-kafka/src/main/java/cc/allio/uno/starter/kafka/UnoKafkaAutoConfiguration.java b/uno-starters/uno-starter-kafka/src/main/java/cc/allio/uno/starter/kafka/UnoKafkaAutoConfiguration.java index bee90191..ea4cc81e 100644 --- a/uno-starters/uno-starter-kafka/src/main/java/cc/allio/uno/starter/kafka/UnoKafkaAutoConfiguration.java +++ b/uno-starters/uno-starter-kafka/src/main/java/cc/allio/uno/starter/kafka/UnoKafkaAutoConfiguration.java @@ -11,7 +11,6 @@ * Uno Kafka自动配置类 * * @author j.x - * @date 2022/2/25 16:58 * @since 1.0 */ @Configuration(proxyBeanMethods = false) diff --git a/uno-starters/uno-starter-sequential/pom.xml b/uno-starters/uno-starter-sequential/pom.xml index a2067f1e..14471c44 100644 --- a/uno-starters/uno-starter-sequential/pom.xml +++ b/uno-starters/uno-starter-sequential/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> uno-starters - cc.allio - 1.1.9 + cc.allio.uno + 1.2.0 4.0.0 @@ -13,8 +13,8 @@ - cc.allio + cc.allio.uno uno-sequential - \ No newline at end of file + diff --git a/uno-starters/uno-starter-websocket/pom.xml b/uno-starters/uno-starter-websocket/pom.xml index af2887ce..9c901d25 100644 --- a/uno-starters/uno-starter-websocket/pom.xml +++ b/uno-starters/uno-starter-websocket/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> uno-starters - cc.allio - 1.1.9 + cc.allio.uno + 1.2.0 4.0.0 @@ -17,13 +17,13 @@ spring-boot-starter-websocket - cc.allio + cc.allio.uno uno-websocket - cc.allio + cc.allio.uno uno-starter-core - \ No newline at end of file + diff --git a/uno-starters/uno-starter-websocket/src/main/java/cc/allio/uno/starter/websocket/WebSocketAutoConfiguration.java b/uno-starters/uno-starter-websocket/src/main/java/cc/allio/uno/starter/websocket/WebSocketAutoConfiguration.java index 167721ff..c3341073 100644 --- a/uno-starters/uno-starter-websocket/src/main/java/cc/allio/uno/starter/websocket/WebSocketAutoConfiguration.java +++ b/uno-starters/uno-starter-websocket/src/main/java/cc/allio/uno/starter/websocket/WebSocketAutoConfiguration.java @@ -11,7 +11,6 @@ * Uno WebSocket自动配置类 * * @author j.x - * @date 2022/7/29 13:47 * @since 1.0 */ @EnableWebSocket diff --git a/uno-test/pom.xml b/uno-test/pom.xml index fbd786db..b93b3981 100644 --- a/uno-test/pom.xml +++ b/uno-test/pom.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - uno - cc.allio - 1.1.9 + uno-parent + cc.allio.uno + 1.2.0 4.0.0 @@ -75,7 +75,7 @@ - cc.allio + cc.allio.uno uno-core @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/uno-test/src/main/java/cc/allio/uno/test/BaseSpringTest.java b/uno-test/src/main/java/cc/allio/uno/test/BaseSpringTest.java index 914d78f1..32987a05 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/BaseSpringTest.java +++ b/uno-test/src/main/java/cc/allio/uno/test/BaseSpringTest.java @@ -32,8 +32,7 @@ /** * Spring测试，继承于该测试的类，不应该在在加上{@link BeforeEach}与{@link AfterEach} * - * @author jw - * @date 2021/12/15 23:22 + * @author j.x */ @Getter public abstract class BaseSpringTest extends BaseTestCase { diff --git a/uno-test/src/main/java/cc/allio/uno/test/BaseTestCase.java b/uno-test/src/main/java/cc/allio/uno/test/BaseTestCase.java index 2c116b95..831d1f7a 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/BaseTestCase.java +++ b/uno-test/src/main/java/cc/allio/uno/test/BaseTestCase.java @@ -14,7 +14,6 @@ * 除此之后还支持不同框架（如Redis、Spring）的环境支持 * * @author j.x - * @date 2022/1/30 10:09 * @see BaseSpringTest * @since 1.0 */ diff --git a/uno-test/src/main/java/cc/allio/uno/test/BenchmarkTest.java b/uno-test/src/main/java/cc/allio/uno/test/BenchmarkTest.java index 6c1656e6..70625c40 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/BenchmarkTest.java +++ b/uno-test/src/main/java/cc/allio/uno/test/BenchmarkTest.java @@ -3,8 +3,7 @@ /** * 基准测试 * - * @author jw - * @date 2021/12/15 23:24 + * @author j.x */ public interface BenchmarkTest { diff --git a/uno-test/src/main/java/cc/allio/uno/test/CoreTest.java b/uno-test/src/main/java/cc/allio/uno/test/CoreTest.java index 3cd5f71f..8f479121 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/CoreTest.java +++ b/uno-test/src/main/java/cc/allio/uno/test/CoreTest.java @@ -26,7 +26,6 @@ * 提供uno.core下基础的Spring环境 * * @author j.x - * @date 2022/2/14 14:03 * @since 1.0 */ @Getter diff --git a/uno-test/src/main/java/cc/allio/uno/test/ExecutableCoreTest.java b/uno-test/src/main/java/cc/allio/uno/test/ExecutableCoreTest.java index 9c158842..72dee2c6 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/ExecutableCoreTest.java +++ b/uno-test/src/main/java/cc/allio/uno/test/ExecutableCoreTest.java @@ -10,7 +10,6 @@ * 不更改原先{@link CoreTest}的基础上，重写并增加具有{@link TestContext}等的相关方法 * * @author j.x - * @date 2023/3/6 11:45 * @since 1.1.4 */ @Slf4j diff --git a/uno-test/src/main/java/cc/allio/uno/test/Inject.java b/uno-test/src/main/java/cc/allio/uno/test/Inject.java index 4821c76d..b944bb1a 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/Inject.java +++ b/uno-test/src/main/java/cc/allio/uno/test/Inject.java @@ -6,7 +6,6 @@ * 字段注入，除此之外还还可以使用{@link jakarta.annotation.Resource}、{@link org.springframework.beans.factory.annotation.Autowired} * * @author j.x - * @date 2022/9/19 15:11 * @since 1.1.0 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/Parameter.java b/uno-test/src/main/java/cc/allio/uno/test/Parameter.java index c0075e3a..8555b39f 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/Parameter.java +++ b/uno-test/src/main/java/cc/allio/uno/test/Parameter.java @@ -19,7 +19,6 @@ * * * @author j.x - * @date 2023/3/10 12:40 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/PrintTimingListener.java b/uno-test/src/main/java/cc/allio/uno/test/PrintTimingListener.java index e13e5757..1fb5bf96 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/PrintTimingListener.java +++ b/uno-test/src/main/java/cc/allio/uno/test/PrintTimingListener.java @@ -6,7 +6,6 @@ * 通过Log打印测试花费事件 * * @author j.x - * @date 2023/3/2 20:40 * @since 1.1.4 */ public class PrintTimingListener implements Listener { diff --git a/uno-test/src/main/java/cc/allio/uno/test/RunTest.java b/uno-test/src/main/java/cc/allio/uno/test/RunTest.java index d90ba594..440c1b37 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/RunTest.java +++ b/uno-test/src/main/java/cc/allio/uno/test/RunTest.java @@ -18,7 +18,6 @@ * 运行的测试环境 * * @author j.x - * @date 2022/9/15 17:39 * @see RunTestAttributes * @see TestManager * @since 1.1.0 diff --git a/uno-test/src/main/java/cc/allio/uno/test/RunTestAttributes.java b/uno-test/src/main/java/cc/allio/uno/test/RunTestAttributes.java index 52f23374..9dbb0615 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/RunTestAttributes.java +++ b/uno-test/src/main/java/cc/allio/uno/test/RunTestAttributes.java @@ -32,7 +32,6 @@ * {@link RunTest}的属性描述。支持能够在其上拓展增加能力 * * @author j.x - * @date 2023/3/10 09:25 * @since 1.1.4 */ @Slf4j diff --git a/uno-test/src/main/java/cc/allio/uno/test/TestComponentScan.java b/uno-test/src/main/java/cc/allio/uno/test/TestComponentScan.java index b18a6cf8..f2411433 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/TestComponentScan.java +++ b/uno-test/src/main/java/cc/allio/uno/test/TestComponentScan.java @@ -8,7 +8,6 @@ * 测试组件扫描，操作自{@link ComponentScan} * * @author j.x - * @date 2023/4/20 17:01 * @see RunTestAttributes * @since 1.1.4 */ diff --git a/uno-test/src/main/java/cc/allio/uno/test/TestComponentScanner.java b/uno-test/src/main/java/cc/allio/uno/test/TestComponentScanner.java index 3c4b3433..46646a6d 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/TestComponentScanner.java +++ b/uno-test/src/main/java/cc/allio/uno/test/TestComponentScanner.java @@ -12,7 +12,6 @@ * 用于{@link TestComponentScan}的类路径扫描器 * * @author j.x - * @date 2023/4/20 17:16 * @since 1.1.4 */ public class TestComponentScanner extends ClassPathBeanDefinitionScanner { diff --git a/uno-test/src/main/java/cc/allio/uno/test/TestContext.java b/uno-test/src/main/java/cc/allio/uno/test/TestContext.java index 1f72602e..f83ddc0b 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/TestContext.java +++ b/uno-test/src/main/java/cc/allio/uno/test/TestContext.java @@ -11,7 +11,6 @@ * test-context * * @author j.x - * @date 2023/3/2 19:24 * @since 1.1.4 */ public class TestContext implements OptionalContext { diff --git a/uno-test/src/main/java/cc/allio/uno/test/TestManager.java b/uno-test/src/main/java/cc/allio/uno/test/TestManager.java index 212886d8..4de3a54c 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/TestManager.java +++ b/uno-test/src/main/java/cc/allio/uno/test/TestManager.java @@ -14,7 +14,6 @@ *

通过事件机制，当test经历不同的测试阶段时发布对应的事件。事件使用于{@link EventBus}

* * @author j.x - * @date 2023/3/2 20:05 * @since 1.1.4 */ @Getter diff --git a/uno-test/src/main/java/cc/allio/uno/test/UnoExtension.java b/uno-test/src/main/java/cc/allio/uno/test/UnoExtension.java index 71edf77e..07444a1d 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/UnoExtension.java +++ b/uno-test/src/main/java/cc/allio/uno/test/UnoExtension.java @@ -12,7 +12,6 @@ * beforeAll -> postProcessTestInstance -> beforeEach -> beforeTestExecution -> afterTestExecution -> afterEach -> afterAll * * @author j.x - * @date 2023/3/2 18:56 * @see SpringExtension * @since 1.1.4 */ diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/DataSourceEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/DataSourceEnvironment.java index 4c8f1592..bd179606 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/DataSourceEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/DataSourceEnvironment.java @@ -12,7 +12,6 @@ * 数据源测试环境类 * * @author j.x - * @date 2022/2/14 14:11 * @since 1.0 */ @Priority(Integer.MIN_VALUE) diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/ElasticSearchEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/ElasticSearchEnvironment.java index 142f4edd..2ea347ff 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/ElasticSearchEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/ElasticSearchEnvironment.java @@ -10,7 +10,6 @@ * 配置的es环境 * * @author j.x - * @date 2023/7/5 16:03 * @since 1.1.4 */ public class ElasticSearchEnvironment extends VisitorEnvironment { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/EmptyEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/EmptyEnvironment.java index d11d41e0..462d5535 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/EmptyEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/EmptyEnvironment.java @@ -8,7 +8,6 @@ * 空Test Environment * * @author j.x - * @date 2022/12/30 14:44 * @since 1.1.4 */ public class EmptyEnvironment extends VisitorEnvironment { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/Environment.java b/uno-test/src/main/java/cc/allio/uno/test/env/Environment.java index e0915a8c..b2850b77 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/Environment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/Environment.java @@ -16,7 +16,6 @@ * * * @author j.x - * @date 2022/2/14 14:05 * @see AnnotationAwareOrderComparator#sort(List) * @since 1.1.1 */ diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/EnvironmentFacade.java b/uno-test/src/main/java/cc/allio/uno/test/env/EnvironmentFacade.java index 478b8cf7..5f0205a9 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/EnvironmentFacade.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/EnvironmentFacade.java @@ -14,7 +14,6 @@ * 外观类 * * @author j.x - * @date 2022/2/14 14:08 * @since 1.0 */ public class EnvironmentFacade implements Environment { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/JpaEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/JpaEnvironment.java index 6c237957..77328486 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/JpaEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/JpaEnvironment.java @@ -11,7 +11,6 @@ * Jpa环境测试类 * * @author j.x - * @date 2022/11/29 11:55 * @since 1.1.2 */ public class JpaEnvironment extends VisitorEnvironment { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/MybatisEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/MybatisEnvironment.java index ce05db81..0ba9b29b 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/MybatisEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/MybatisEnvironment.java @@ -13,7 +13,6 @@ *

优先级需要低于{@link DataSourceEnvironment}

* * @author j.x - * @date 2022/2/14 14:27 * @since 1.0 */ @Priority(0) diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/MybatisPlusEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/MybatisPlusEnvironment.java index d6961e4d..403e011e 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/MybatisPlusEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/MybatisPlusEnvironment.java @@ -11,7 +11,6 @@ * Mybatis-plus测试环境类 * * @author j.x - * @date 2022/2/14 14:36 * @since 1.0 */ @Priority(Integer.MAX_VALUE) diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/PropertiesVisitor.java b/uno-test/src/main/java/cc/allio/uno/test/env/PropertiesVisitor.java index 4d207276..4da452ca 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/PropertiesVisitor.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/PropertiesVisitor.java @@ -13,7 +13,6 @@ * 增加环境 Properties * * @author j.x - * @date 2023/3/3 12:28 * @since 1.1.4 */ @Slf4j diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/RedisEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/RedisEnvironment.java index 382f3dd7..6247e508 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/RedisEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/RedisEnvironment.java @@ -10,7 +10,6 @@ * Redis测试环境类 * * @author j.x - * @date 2022/2/14 14:20 * @since 1.0 */ public class RedisEnvironment extends VisitorEnvironment { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/ServletWebEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/ServletWebEnvironment.java index 7a471bda..ec2169dc 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/ServletWebEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/ServletWebEnvironment.java @@ -12,7 +12,6 @@ * servlet web 环境 * * @author j.x - * @date 2023/3/9 20:11 * @since 1.1.4 */ public class ServletWebEnvironment extends VisitorEnvironment { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/TransactionEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/TransactionEnvironment.java index d7b42afb..cecff508 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/TransactionEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/TransactionEnvironment.java @@ -11,7 +11,6 @@ * 事物环境 * * @author j.x - * @date 2022/2/14 14:23 * @since 1.0 */ public class TransactionEnvironment extends VisitorEnvironment { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/Visitor.java b/uno-test/src/main/java/cc/allio/uno/test/env/Visitor.java index db84a410..608955fa 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/Visitor.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/Visitor.java @@ -9,7 +9,6 @@ * 拓展{@link Environment}的功能。 {@link RunTest#visitor()}指定的class上进行实例化 or 系统内默认的。与{@link Runner}逻辑一致。获取优先级 * * @author j.x - * @date 2023/3/3 12:18 * @since 1.1.4 */ public interface Visitor extends Ordered { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/VisitorEnvironment.java b/uno-test/src/main/java/cc/allio/uno/test/env/VisitorEnvironment.java index ef073576..5d18d58e 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/VisitorEnvironment.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/VisitorEnvironment.java @@ -9,7 +9,6 @@ * VisitorEnvironment * * @author j.x - * @date 2023/3/3 13:41 * @since 1.1.4 */ public abstract class VisitorEnvironment implements Environment { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/AnnoConfigure.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/AnnoConfigure.java index 45ad54fe..b932318c 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/AnnoConfigure.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/AnnoConfigure.java @@ -6,7 +6,6 @@ * 用于标识注解，表示当前注解为配置信息 * * @author j.x - * @date 2023/3/2 17:35 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/DynamicConfigure.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/DynamicConfigure.java index 8acf30ba..6bfea286 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/DynamicConfigure.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/DynamicConfigure.java @@ -19,7 +19,6 @@ * 生成Class文件对象 * * @author j.x - * @date 2023/3/2 18:06 * @since 1.1.4 */ @Slf4j diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/Env.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/Env.java index 12fa2c94..13761263 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/Env.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/Env.java @@ -8,7 +8,6 @@ * 标识为注解上，指定使用的环境 * * @author j.x - * @date 2023/3/3 11:23 * @since 1.1.4 */ @Retention(RetentionPolicy.RUNTIME) diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/EnvConfigure.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/EnvConfigure.java index e15f72cc..95557fc2 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/EnvConfigure.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/EnvConfigure.java @@ -10,7 +10,6 @@ * 基于注解配置的抽取器，动态生成Bean Definition。能够 * * @author j.x - * @date 2023/3/2 17:54 * @since 1.1.4 */ public interface EnvConfigure { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/Extractor.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/Extractor.java index 0d96c338..c45cde20 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/Extractor.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/Extractor.java @@ -6,7 +6,6 @@ * 注解抽取器 * * @author j.x - * @date 2023/3/2 18:04 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ImportAutoConfiguration.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ImportAutoConfiguration.java index 03988a75..b670643b 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ImportAutoConfiguration.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ImportAutoConfiguration.java @@ -6,7 +6,6 @@ * 描述{@link org.springframework.boot.autoconfigure.ImportAutoConfiguration}。当测试类加上该配置后，会自动的转换为{@link org.springframework.boot.autoconfigure.ImportAutoConfiguration#classes()}的数值 * * @author j.x - * @date 2023/7/5 14:33 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ImportAutoConfigure.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ImportAutoConfigure.java index bab386dd..facea833 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ImportAutoConfigure.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ImportAutoConfigure.java @@ -11,7 +11,6 @@ * {@link ImportAutoConfiguration}的属性描述 * * @author j.x - * @date 2023/7/5 14:35 * @since 1.1.4 */ public class ImportAutoConfigure extends DynamicConfigure { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisConfigure.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisConfigure.java index 980041ec..406ed406 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisConfigure.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisConfigure.java @@ -11,7 +11,6 @@ * {@link MybatisEnv}注解抽取器 * * @author j.x - * @date 2023/3/2 18:05 * @since 1.1.4 */ public class MybatisConfigure extends DynamicConfigure { @@ -40,4 +39,4 @@ protected AnnotationDescription[] buildAnnoDesc(CoreTest coreTest, MergedAnnotat .define("defaultScope", annotation.getString("defaultScope")); return new AnnotationDescription[]{annoBuilder.build()}; } -} \ No newline at end of file +} diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisEnv.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisEnv.java index 0f3b3cea..18300a37 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisEnv.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisEnv.java @@ -24,7 +24,6 @@ *

* * @author j.x - * @date 2023/3/2 17:14 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisPlusConfigure.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisPlusConfigure.java index 65a98cf3..b51d189e 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisPlusConfigure.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisPlusConfigure.java @@ -11,7 +11,6 @@ * {@link MybatisPlusEnv}注解抽取器 * * @author j.x - * @date 2023/3/6 16:26 * @since 1.1.4 */ public class MybatisPlusConfigure extends DynamicConfigure { @@ -37,4 +36,4 @@ protected AnnotationDescription[] buildAnnoDesc(CoreTest coreTest, MergedAnnotat .define("defaultScope", annotation.getString("defaultScope")); return new AnnotationDescription[]{annoBuilder.build()}; } -} \ No newline at end of file +} diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisPlusEnv.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisPlusEnv.java index d04de6df..448fa2cc 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisPlusEnv.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/MybatisPlusEnv.java @@ -22,7 +22,6 @@ * 值的注意的是，mapper的扫描目前是当前测试类所在的类路径 + mapper. example: cc.allio.uno.test.annotation.mapper * * @author j.x - * @date 2023/3/6 16:26 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/RedisEnv.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/RedisEnv.java index 1f697efb..d76c822d 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/RedisEnv.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/RedisEnv.java @@ -15,7 +15,6 @@ *

* * @author j.x - * @date 2023/3/13 18:08 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ServletWebConfigure.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ServletWebConfigure.java index d6e1c83b..09a977e1 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ServletWebConfigure.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ServletWebConfigure.java @@ -11,7 +11,6 @@ * {@link ServletWebEnv}注解抽取器 * * @author j.x - * @date 2023/3/9 20:08 * @since 1.1.4 */ public class ServletWebConfigure extends DynamicConfigure { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ServletWebEnv.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ServletWebEnv.java index 0da633ca..8159b9dd 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ServletWebEnv.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/ServletWebEnv.java @@ -15,7 +15,6 @@ *

* * @author j.x - * @date 2023/3/9 22:07 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/AnnoPropertiesParser.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/AnnoPropertiesParser.java index 34b2d93d..7d092964 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/AnnoPropertiesParser.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/AnnoPropertiesParser.java @@ -12,7 +12,6 @@ * 基于注解的Properties * * @author j.x - * @date 2023/3/3 11:59 * @since 1.1.4 */ @FunctionalInterface diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/DataSourceProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/DataSourceProperties.java index 2441ee52..b45a4fad 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/DataSourceProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/DataSourceProperties.java @@ -8,7 +8,6 @@ * {@link org.springframework.boot.autoconfigure.jdbc.DataSourceProperties}的注解描述 * * @author j.x - * @date 2023/3/6 16:59 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/DefaultAnnoPropertiesParser.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/DefaultAnnoPropertiesParser.java index 0febf3bf..642a5c32 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/DefaultAnnoPropertiesParser.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/DefaultAnnoPropertiesParser.java @@ -18,7 +18,6 @@ * 默认注解配置解析器。对应注解上必须含有{@link cc.allio.uno.test.env.annotation.properties.Properties}注解 * * @author j.x - * @date 2023/3/3 14:49 * @since 1.1.4 */ public class DefaultAnnoPropertiesParser implements AnnoPropertiesParser { diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/EsProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/EsProperties.java index 04f6c140..592234a1 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/EsProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/EsProperties.java @@ -6,7 +6,6 @@ * es 配置 * * @author j.x - * @date 2023/7/5 16:03 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LettuceClusterRefreshProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LettuceClusterRefreshProperties.java index 4efdc689..7be8a3e0 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LettuceClusterRefreshProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LettuceClusterRefreshProperties.java @@ -7,7 +7,6 @@ * {@link org.springframework.boot.autoconfigure.data.redis.RedisProperties.Pool}的注解描述 * * @author j.x - * @date 2023/3/13 19:44 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LettucePoolProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LettucePoolProperties.java index 519973b9..45a37f7e 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LettucePoolProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LettucePoolProperties.java @@ -7,7 +7,6 @@ * {@link org.springframework.boot.autoconfigure.data.redis.RedisProperties.Pool}的注解描述 * * @author j.x - * @date 2023/3/13 19:44 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LoadBalancerRetryProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LoadBalancerRetryProperties.java index 63df05c0..aebca640 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LoadBalancerRetryProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/LoadBalancerRetryProperties.java @@ -10,7 +10,6 @@ * {@link org.springframework.cloud.client.loadbalancer.LoadBalancerRetryProperties}的注解描述 * * @author j.x - * @date 2023/3/9 12:42 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/MybatisPlusProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/MybatisPlusProperties.java index e4ad8a2f..1b6471eb 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/MybatisPlusProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/MybatisPlusProperties.java @@ -20,7 +20,6 @@ * {@link com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties}注解描述 * * @author j.x - * @date 2023/3/6 16:52 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/MybatisProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/MybatisProperties.java index 2bee2720..e71c7236 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/MybatisProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/MybatisProperties.java @@ -19,7 +19,6 @@ * {@link org.mybatis.spring.boot.autoconfigure.MybatisProperties}注解描述 * * @author j.x - * @date 2023/3/3 12:13 * @since 1.1.4 */ @Documented @@ -67,7 +66,6 @@ * {@link org.apache.ibatis.session.Configuration}注解描述 * * @author j.x - * @date 2023/3/9 15:14 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/Properties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/Properties.java index cd1d1b49..50d6c811 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/Properties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/Properties.java @@ -11,7 +11,6 @@ *

* * @author j.x - * @date 2023/3/3 11:51 * @see AnnoPropertiesParser * @since 1.1.4 */ diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/PropertiesName.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/PropertiesName.java index 8aa46a0b..87c9b8be 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/PropertiesName.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/PropertiesName.java @@ -9,7 +9,6 @@ *

* * @author j.x - * @date 2023/3/3 13:35 * @since 1.1.4 * @see */ diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/PropertiesType.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/PropertiesType.java index afd6c721..e18a93e9 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/PropertiesType.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/PropertiesType.java @@ -6,7 +6,6 @@ * 标识properties的真实类型 * * @author j.x - * @date 2023/3/9 12:53 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisClusterProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisClusterProperties.java index 612420b3..f498cbc5 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisClusterProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisClusterProperties.java @@ -6,7 +6,6 @@ * {@link org.springframework.boot.autoconfigure.data.redis.RedisProperties.Cluster}的注解描述 * * @author j.x - * @date 2023/3/13 19:44 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisLettuceProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisLettuceProperties.java index 0a7889b8..926ec133 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisLettuceProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisLettuceProperties.java @@ -6,7 +6,6 @@ * {@link org.springframework.boot.autoconfigure.data.redis.RedisProperties.Pool}的注解描述 * * @author j.x - * @date 2023/3/13 19:44 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisProperties.java index 5d8df1dc..5fcb7d80 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisProperties.java @@ -14,7 +14,6 @@ *

* * @author j.x - * @date 2023/3/13 18:05 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisSentinelProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisSentinelProperties.java index a937af58..db61c3c7 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisSentinelProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RedisSentinelProperties.java @@ -6,7 +6,6 @@ * {@link org.springframework.boot.autoconfigure.data.redis.RedisProperties.Sentinel}的注解描述 * * @author j.x - * @date 2023/3/13 19:41 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RibbonEagerLoadProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RibbonEagerLoadProperties.java index cd5214ca..2893dfc3 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RibbonEagerLoadProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/RibbonEagerLoadProperties.java @@ -6,7 +6,6 @@ * {@link org.springframework.cloud.netflix.ribbon.RibbonEagerLoadProperties}注解描述 * * @author j.x - * @date 2023/3/9 15:36 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/ServerIntrospectorProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/ServerIntrospectorProperties.java index 82c299ab..de8789ff 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/ServerIntrospectorProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/ServerIntrospectorProperties.java @@ -6,7 +6,6 @@ * {@link org.springframework.cloud.netflix.ribbon.ServerIntrospectorProperties}注解描述 * * @author j.x - * @date 2023/3/9 15:37 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/ServerProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/ServerProperties.java index 5e799496..6edf7214 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/ServerProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/ServerProperties.java @@ -8,7 +8,6 @@ * {@link org.springframework.boot.autoconfigure.web.ServerProperties}的注解描述 * * @author j.x - * @date 2023/3/9 22:11 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/TransactionProperties.java b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/TransactionProperties.java index 65c8f74f..1950b2f5 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/TransactionProperties.java +++ b/uno-test/src/main/java/cc/allio/uno/test/env/annotation/properties/TransactionProperties.java @@ -6,7 +6,6 @@ * {@link org.springframework.boot.autoconfigure.transaction.TransactionProperties}的注解描述 * * @author j.x - * @date 2023/3/6 16:59 * @since 1.1.4 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/listener/CoreTestListener.java b/uno-test/src/main/java/cc/allio/uno/test/listener/CoreTestListener.java index e93485b9..ddde7c10 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/listener/CoreTestListener.java +++ b/uno-test/src/main/java/cc/allio/uno/test/listener/CoreTestListener.java @@ -6,7 +6,6 @@ * 对CoreTest进行注册 * * @author j.x - * @date 2023/3/2 20:37 * @since 1.1.4 */ public class CoreTestListener implements Listener { diff --git a/uno-test/src/main/java/cc/allio/uno/test/listener/Listener.java b/uno-test/src/main/java/cc/allio/uno/test/listener/Listener.java index 50bf8afa..16d611ae 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/listener/Listener.java +++ b/uno-test/src/main/java/cc/allio/uno/test/listener/Listener.java @@ -6,7 +6,6 @@ * 测试回调监听器 * * @author j.x - * @date 2023/3/2 20:08 * @since 1.1.4 */ public interface Listener { diff --git a/uno-test/src/main/java/cc/allio/uno/test/listener/WebListener.java b/uno-test/src/main/java/cc/allio/uno/test/listener/WebListener.java index a48c2737..58ab21c6 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/listener/WebListener.java +++ b/uno-test/src/main/java/cc/allio/uno/test/listener/WebListener.java @@ -18,7 +18,6 @@ * 设计思路参考于SpringBootTestContextBootstrapper * * @author j.x - * @date 2023/3/9 18:30 * @since 1.1.4 */ @Priority(Integer.MIN_VALUE) diff --git a/uno-test/src/main/java/cc/allio/uno/test/mock/BooleanMock.java b/uno-test/src/main/java/cc/allio/uno/test/mock/BooleanMock.java index b92d4531..08c9fb86 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/mock/BooleanMock.java +++ b/uno-test/src/main/java/cc/allio/uno/test/mock/BooleanMock.java @@ -3,8 +3,7 @@ /** * Boolean类型mock * - * @author jw - * @date 2021/12/16 13:19 + * @author j.x */ public class BooleanMock implements Mock { @Override diff --git a/uno-test/src/main/java/cc/allio/uno/test/mock/DoubleMock.java b/uno-test/src/main/java/cc/allio/uno/test/mock/DoubleMock.java index 98367d9d..1b499c8f 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/mock/DoubleMock.java +++ b/uno-test/src/main/java/cc/allio/uno/test/mock/DoubleMock.java @@ -3,8 +3,7 @@ /** * Double类型mock对象 * - * @author jw - * @date 2021/12/16 13:18 + * @author j.x */ public class DoubleMock implements Mock { @Override diff --git a/uno-test/src/main/java/cc/allio/uno/test/mock/IntegerMock.java b/uno-test/src/main/java/cc/allio/uno/test/mock/IntegerMock.java index 14d5e677..9fd56412 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/mock/IntegerMock.java +++ b/uno-test/src/main/java/cc/allio/uno/test/mock/IntegerMock.java @@ -3,8 +3,7 @@ /** * Integer类型mock对象 * - * @author jw - * @date 2021/12/16 13:17 + * @author j.x */ public class IntegerMock implements Mock { diff --git a/uno-test/src/main/java/cc/allio/uno/test/mock/LongMock.java b/uno-test/src/main/java/cc/allio/uno/test/mock/LongMock.java index 112621ce..148ed243 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/mock/LongMock.java +++ b/uno-test/src/main/java/cc/allio/uno/test/mock/LongMock.java @@ -3,8 +3,7 @@ /** * Long类型mock对象 * - * @author jw - * @date 2021/12/16 13:18 + * @author j.x */ public class LongMock implements Mock { @Override diff --git a/uno-test/src/main/java/cc/allio/uno/test/mock/Mock.java b/uno-test/src/main/java/cc/allio/uno/test/mock/Mock.java index a619c4cc..c394a4e1 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/mock/Mock.java +++ b/uno-test/src/main/java/cc/allio/uno/test/mock/Mock.java @@ -3,8 +3,7 @@ /** * 模拟接口返回数据，实现该接口的类一定存在一个无参构造器 * - * @author jw - * @date 2021/12/15 23:12 + * @author j.x */ @FunctionalInterface public interface Mock { diff --git a/uno-test/src/main/java/cc/allio/uno/test/mock/MockTest.java b/uno-test/src/main/java/cc/allio/uno/test/mock/MockTest.java index 144aa783..8b4e6d87 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/mock/MockTest.java +++ b/uno-test/src/main/java/cc/allio/uno/test/mock/MockTest.java @@ -5,8 +5,7 @@ /** * 模拟接口返回的数据，在test环境下有效 * - * @author jw - * @date 2021/12/15 19:52 + * @author j.x */ @Documented @Retention(RetentionPolicy.RUNTIME) diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/AnnoMetadataRunner.java b/uno-test/src/main/java/cc/allio/uno/test/runner/AnnoMetadataRunner.java index 0fb73ff9..fafca124 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/AnnoMetadataRunner.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/AnnoMetadataRunner.java @@ -29,7 +29,6 @@ * * * @author j.x - * @date 2023/3/2 17:34 * @see AnnoConfigure * @since 1.1.4 */ diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/CloseRunner.java b/uno-test/src/main/java/cc/allio/uno/test/runner/CloseRunner.java index b2677c0b..1c2dcdfb 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/CloseRunner.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/CloseRunner.java @@ -7,7 +7,6 @@ * 标识接口当spring关闭时执行 * * @author j.x - * @date 2022/10/29 12:51 * @since 1.1.0 */ public interface CloseRunner extends Runner { diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/CoreRunner.java b/uno-test/src/main/java/cc/allio/uno/test/runner/CoreRunner.java index ea11c880..d7b40680 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/CoreRunner.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/CoreRunner.java @@ -8,7 +8,6 @@ * 存放不同类型的Runner * * @author j.x - * @date 2023/3/3 16:18 * @since 1.1.4 */ @Data diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/InjectRunner.java b/uno-test/src/main/java/cc/allio/uno/test/runner/InjectRunner.java index 2f97ee22..4d05d930 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/InjectRunner.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/InjectRunner.java @@ -18,7 +18,6 @@ *

* * @author j.x - * @date 2022/10/28 17:43 * @since 1.1.0 */ public class InjectRunner implements RefreshCompleteRunner { diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/RefreshCompleteRunner.java b/uno-test/src/main/java/cc/allio/uno/test/runner/RefreshCompleteRunner.java index d64c103a..08ca0f74 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/RefreshCompleteRunner.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/RefreshCompleteRunner.java @@ -7,7 +7,6 @@ * 标识接口当spring上下文刷新完成后执行 * * @author j.x - * @date 2022/10/29 10:05 * @since 1.1.0 */ public interface RefreshCompleteRunner extends Runner { diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/RegisterRunner.java b/uno-test/src/main/java/cc/allio/uno/test/runner/RegisterRunner.java index 07150160..e838378d 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/RegisterRunner.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/RegisterRunner.java @@ -7,7 +7,6 @@ * 标识接口spring进行Component注册时进行执行 * * @author j.x - * @date 2022/10/29 10:07 * @since 1.1.0 */ public interface RegisterRunner extends Runner { diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/Runner.java b/uno-test/src/main/java/cc/allio/uno/test/runner/Runner.java index 0297a60a..071211af 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/Runner.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/Runner.java @@ -14,7 +14,6 @@ * * * @author j.x - * @date 2022/10/28 16:24 * @since 1.1.0 */ @FunctionalInterface diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/RunnerCenter.java b/uno-test/src/main/java/cc/allio/uno/test/runner/RunnerCenter.java index a268b41b..1e11a164 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/RunnerCenter.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/RunnerCenter.java @@ -9,7 +9,6 @@ * {@link Runner}列表中心 * * @author j.x - * @date 2022/10/28 17:33 * @since 1.1.0 */ public class RunnerCenter { diff --git a/uno-test/src/main/java/cc/allio/uno/test/runner/Running.java b/uno-test/src/main/java/cc/allio/uno/test/runner/Running.java index c8059e7e..0e49f0d7 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/runner/Running.java +++ b/uno-test/src/main/java/cc/allio/uno/test/runner/Running.java @@ -6,7 +6,6 @@ * 给定于测试注解中，标识使用何种{@link Runner}进行测试环境构建 * * @author j.x - * @date 2022/10/28 16:32 * @since 1.1.0 * @deprecated 自1.1.4版本后删除 */ diff --git a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/Container.java b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/Container.java index 9eefc55d..453b871e 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/Container.java +++ b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/Container.java @@ -11,7 +11,6 @@ * describe {@link org.testcontainers.containers.Container} * * @author j.x - * @date 2024/3/20 00:40 * @since 1.1.7 */ @Data diff --git a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/ContainerType.java b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/ContainerType.java index 32a594e5..2c947848 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/ContainerType.java +++ b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/ContainerType.java @@ -8,7 +8,6 @@ * describe to docker container * * @author j.x - * @date 2024/3/18 22:54 * @since 1.1.7 */ @Getter diff --git a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/LogPrelude.java b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/LogPrelude.java index 0bade684..f655f7d0 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/LogPrelude.java +++ b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/LogPrelude.java @@ -6,7 +6,6 @@ * log for {@link Container} information * * @author j.x - * @date 2024/4/16 14:37 * @since 1.1.8 */ @Slf4j diff --git a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/Prelude.java b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/Prelude.java index a68377f1..9769b192 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/Prelude.java +++ b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/Prelude.java @@ -5,7 +5,6 @@ *

sub-class should be through SPI mechanism.

* * @author j.x - * @date 2024/4/16 13:58 * @since 1.1.8 */ public interface Prelude { diff --git a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/RunContainer.java b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/RunContainer.java index 75d886fd..1b53338b 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/RunContainer.java +++ b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/RunContainer.java @@ -9,7 +9,6 @@ * base on test-containers, built-in fast test-container startup * * @author j.x - * @date 2024/3/18 22:54 * @since 1.1.7 */ @Documented diff --git a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/SetupContainer.java b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/SetupContainer.java index 0dfac3eb..1944d9e1 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/SetupContainer.java +++ b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/SetupContainer.java @@ -20,7 +20,6 @@ * setup test-container if exist {@link RunContainer} * * @author j.x - * @date 2024/3/18 23:04 * @since 1.1.7 */ @Slf4j diff --git a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/ShutdownContainer.java b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/ShutdownContainer.java index c88c6122..4daffe0b 100644 --- a/uno-test/src/main/java/cc/allio/uno/test/testcontainers/ShutdownContainer.java +++ b/uno-test/src/main/java/cc/allio/uno/test/testcontainers/ShutdownContainer.java @@ -7,7 +7,6 @@ * end test-container * * @author j.x - * @date 2024/3/18 23:32 * @since 1.1.7 */ public class ShutdownContainer implements CloseRunner { diff --git a/uno-test/src/test/java/cc/allio/uno/test/ConfigDataLoaderTest.java b/uno-test/src/test/java/cc/allio/uno/test/ConfigDataLoaderTest.java index 9cd7342c..f7b1bcf8 100644 --- a/uno-test/src/test/java/cc/allio/uno/test/ConfigDataLoaderTest.java +++ b/uno-test/src/test/java/cc/allio/uno/test/ConfigDataLoaderTest.java @@ -6,7 +6,6 @@ * 测试从加载类路径下的配置文件 * * @author j.x - * @date 2022/2/26 14:11 * @since 1.0 */ public class ConfigDataLoaderTest extends CoreTest { diff --git a/uno-test/src/test/java/cc/allio/uno/test/env/TestSpringEnvironmentFacadeTest.java b/uno-test/src/test/java/cc/allio/uno/test/env/TestSpringEnvironmentFacadeTest.java index ad966cd1..48be0b02 100644 --- a/uno-test/src/test/java/cc/allio/uno/test/env/TestSpringEnvironmentFacadeTest.java +++ b/uno-test/src/test/java/cc/allio/uno/test/env/TestSpringEnvironmentFacadeTest.java @@ -10,7 +10,6 @@ * Test环境外观类测试 * * @author j.x - * @date 2022/9/15 22:36 * @since 1.1.0 */ class TestSpringEnvironmentFacadeTest extends BaseTestCase { diff --git a/uno-web/pom.xml b/uno-web/pom.xml index 2d523381..d3a4251c 100644 --- a/uno-web/pom.xml +++ b/uno-web/pom.xml @@ -3,19 +3,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - uno - cc.allio - 1.1.9 + uno-parent + cc.allio.uno + 1.2.0 4.0.0 uno-web - 1.1.9 + 1.2.0 基于spring-webmvc、spring-webflux - cc.allio + cc.allio.uno uno-core @@ -33,4 +33,4 @@ spring-boot-starter-webflux - \ No newline at end of file + diff --git a/uno-web/src/main/java/cc/allio/uno/web/source/HttpSource.java b/uno-web/src/main/java/cc/allio/uno/web/source/HttpSource.java index 4e408abe..d07d4bb6 100644 --- a/uno-web/src/main/java/cc/allio/uno/web/source/HttpSource.java +++ b/uno-web/src/main/java/cc/allio/uno/web/source/HttpSource.java @@ -13,7 +13,6 @@ * http source的抽象接口，包含注册端点方法 * * @author j.x - * @date 2023/5/15 12:30 * @since 1.1.4 */ public interface HttpSource { diff --git a/uno-web/src/main/java/cc/allio/uno/web/source/ReactiveHttpSource.java b/uno-web/src/main/java/cc/allio/uno/web/source/ReactiveHttpSource.java index 09280439..f8c68565 100644 --- a/uno-web/src/main/java/cc/allio/uno/web/source/ReactiveHttpSource.java +++ b/uno-web/src/main/java/cc/allio/uno/web/source/ReactiveHttpSource.java @@ -13,7 +13,6 @@ * 基于{@link RequestMappingHandlerMapping}的HTTP数据源 * * @author j.x - * @date 2022/11/24 16:54 * @since 1.1.2 */ @Slf4j diff --git a/uno-web/src/main/java/cc/allio/uno/web/source/WebHttpSource.java b/uno-web/src/main/java/cc/allio/uno/web/source/WebHttpSource.java index 1fcae86f..47f795df 100644 --- a/uno-web/src/main/java/cc/allio/uno/web/source/WebHttpSource.java +++ b/uno-web/src/main/java/cc/allio/uno/web/source/WebHttpSource.java @@ -8,7 +8,6 @@ * 基于{@link RequestMappingHandlerMapping}的数据源 * * @author j.x - * @date 2022/11/24 16:54 * @since 1.1.2 */ @Slf4j diff --git a/uno-web/src/main/java/cc/allio/uno/web/source/reactive/WebHttpReactiveSource.java b/uno-web/src/main/java/cc/allio/uno/web/source/reactive/WebHttpReactiveSource.java index fb827de0..3f2fdbe6 100644 --- a/uno-web/src/main/java/cc/allio/uno/web/source/reactive/WebHttpReactiveSource.java +++ b/uno-web/src/main/java/cc/allio/uno/web/source/reactive/WebHttpReactiveSource.java @@ -10,7 +10,6 @@ * 基于http的 reactive source * * @author j.x - * @date 2023/5/15 12:25 * @since 1.1.4 */ @Slf4j diff --git a/uno-websocket/pom.xml b/uno-websocket/pom.xml index ff0618b5..3c26e717 100644 --- a/uno-websocket/pom.xml +++ b/uno-websocket/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cc.allio - uno - 1.1.9 + cc.allio.uno + uno-parent + 1.2.0 uno-websocket @@ -24,11 +24,11 @@ spring-boot-starter-websocket - cc.allio + cc.allio.uno uno-core - cc.allio + cc.allio.uno uno-test test diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/Authentication.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/Authentication.java index 3219a109..f73ccfee 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/Authentication.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/Authentication.java @@ -6,7 +6,6 @@ * 标识当前认证器作用于哪一个端点 * * @author j.x - * @date 2022/7/29 16:57 * @since 1.0 */ @Documented diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/BaseWebsocketEndpoint.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/BaseWebsocketEndpoint.java index 99bd52a7..b4ad380d 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/BaseWebsocketEndpoint.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/BaseWebsocketEndpoint.java @@ -33,7 +33,6 @@ * * @param 数据接收范型 * @author j.x - * @date 2021/12/23 13:09 * @since 1.0 */ @Slf4j diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/ConnectionAuthenticator.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/ConnectionAuthenticator.java index db84431c..afb8f625 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/ConnectionAuthenticator.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/ConnectionAuthenticator.java @@ -9,7 +9,6 @@ * 连接认证器，实现类通过带上{@link AutoService}进行注入SPI。 * * @author j.x - * @date 2022/7/29 14:43 * @since 1.0 */ @FunctionalInterface diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/ConnectionContext.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/ConnectionContext.java index ca6948fc..54cf1956 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/ConnectionContext.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/ConnectionContext.java @@ -8,7 +8,6 @@ * 连接上下文 * * @author j.x - * @date 2022/7/29 16:48 * @since 1.0 */ @Data diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointAuthenticator.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointAuthenticator.java index 15536cb1..fcd51469 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointAuthenticator.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointAuthenticator.java @@ -14,7 +14,6 @@ * WebSocket端点认证器 * * @author j.x - * @date 2022/7/29 17:00 * @since 1.0 */ public class EndpointAuthenticator { diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointContext.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointContext.java index fd3bc97b..c0958dac 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointContext.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointContext.java @@ -7,7 +7,6 @@ * 端点上下文 * * @author j.x - * @date 2022/7/29 16:49 * @since 1.0 */ @Data diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointKey.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointKey.java index 60e11c27..45c8575c 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointKey.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointKey.java @@ -7,7 +7,6 @@ * 端点key * * @author j.x - * @date 2022/7/29 16:32 * @since 1.0 */ @Data diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointManager.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointManager.java index b96b43e5..e76c4b02 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointManager.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/EndpointManager.java @@ -12,7 +12,6 @@ * WebSocket端点管理器 * * @author j.x - * @date 2022/6/28 16:04 * @since 1.0 */ @Component diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/Globe.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/Globe.java index 62b10e41..325c04e7 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/Globe.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/Globe.java @@ -6,7 +6,6 @@ * 标识于{@link ConnectionAuthenticator}或者{@link MessageReceiveAuthenticator}来表示当前认证器是否为全局 * * @author j.x - * @date 2022/7/29 16:51 * @since 1.0 */ @Documented diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/GlobeAuthenticator.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/GlobeAuthenticator.java index ba5f03d9..b0dd67a2 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/GlobeAuthenticator.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/GlobeAuthenticator.java @@ -4,7 +4,6 @@ *

标识于{@link ConnectionAuthenticator}或者{@link MessageReceiveAuthenticator}来表示当前认证器是否为全局

* * @author j.x - * @date 2022/7/29 16:53 * @see Globe * @since 1.0 */ diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/MessagePublishAuthenticator.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/MessagePublishAuthenticator.java index a0d25a91..2c193b1d 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/MessagePublishAuthenticator.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/MessagePublishAuthenticator.java @@ -8,7 +8,6 @@ * 消息发布认证器，当需要发布某个消息时，对它发布的消息作认证 * * @author j.x - * @date 2022/8/2 16:47 * @see Authentication * @see Globe * @see GlobeAuthenticator diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/MessageReceiveAuthenticator.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/MessageReceiveAuthenticator.java index 9f472ab4..57a7a898 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/MessageReceiveAuthenticator.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/MessageReceiveAuthenticator.java @@ -10,7 +10,6 @@ * * @param 消息实体 * @author j.x - * @date 2022/7/29 15:35 * @since 1.0 */ @FunctionalInterface diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/UnicastMessageAuthenticator.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/UnicastMessageAuthenticator.java index 89e3b586..b7dca7a8 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/UnicastMessageAuthenticator.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/UnicastMessageAuthenticator.java @@ -9,7 +9,6 @@ * 单播消息验证器 * * @author j.x - * @date 2022/8/2 15:48 * @since 1.0 */ @Authentication(endpointClasses = UnicastWebSocketEndpoint.class) diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/UnicastWebSocketEndpoint.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/UnicastWebSocketEndpoint.java index 7e1ef9f4..ccfe9544 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/UnicastWebSocketEndpoint.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/UnicastWebSocketEndpoint.java @@ -8,7 +8,6 @@ * 单播推送WebSocket * * @author j.x - * @date 2022/8/2 15:23 * @since 1.0 */ public abstract class UnicastWebSocketEndpoint extends BaseWebsocketEndpoint { diff --git a/uno-websocket/src/main/java/cc/allio/uno/websocket/WebSocketEndpoint.java b/uno-websocket/src/main/java/cc/allio/uno/websocket/WebSocketEndpoint.java index a5bc46d9..532e73b1 100644 --- a/uno-websocket/src/main/java/cc/allio/uno/websocket/WebSocketEndpoint.java +++ b/uno-websocket/src/main/java/cc/allio/uno/websocket/WebSocketEndpoint.java @@ -19,7 +19,6 @@ * 定义WebSocket-Endpoint抽象方法 * * @author j.x - * @date 2021/12/30 23:48 * @since 1.0 */ public interface WebSocketEndpoint {