diff --git a/pom.xml b/pom.xml index 09ac983b..2095f270 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ 21 9.44.0.Final - 2023.0.6 - 3.3.0 + 2023.0.9 + 3.3.2 0.8.1-SNAPSHOT 3.2.1 3.8.1 diff --git a/uno-ai/pom.xml b/uno-ai/pom.xml index c8d5c07b..29b264d9 100644 --- a/uno-ai/pom.xml +++ b/uno-ai/pom.xml @@ -13,9 +13,9 @@ Through the capabilities of Spring AI, one can delve into artificial intelligence and endow abilities. - 22 - 22 + 21 + 21 UTF-8 - \ No newline at end of file + diff --git a/uno-bom/pom.xml b/uno-bom/pom.xml index bd080646..1bca8a4c 100644 --- a/uno-bom/pom.xml +++ b/uno-bom/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.0 + 3.3.2 @@ -27,8 +27,8 @@ 3.3.0 1.18.22 - 5.10.2 - 5.11.0 + 5.11.0 + 5.12.0 0.4.6 33.0.0-jre @@ -38,14 +38,11 @@ 2.0.1 2.2.17 - 1.6.2 - 3.0.0 3.0.3 3.5.5 - 1.2.20 - 8.0.22 - 12.2.0.1 + 1.2.23 + 8.0.33 42.7.3 8.4.1.jre8 4.3.0 @@ -56,15 +53,13 @@ 8.12.2 - 7.0.0 - - 3.2.4 + 7.2.0 - 5.0.0 + 5.1.3 - 5.17.0 + 5.22.0 - 3.27.1 + 3.34.1 2.5.0.Final @@ -267,12 +262,6 @@ ${swagger-v3.version} provided - - io.swagger - swagger-models - ${swagger-v2.version} - provided - org.mybatis.spring.boot mybatis-spring-boot-starter @@ -337,11 +326,6 @@ ${mybatis-plus-dynamic.version} provided - - io.springfox - springfox-swagger2 - ${springfox-swagger2.version} - org.geotools gt-geojson @@ -377,11 +361,6 @@ jakarta.json-api ${jakarta.version} - - com.taosdata.jdbc - taos-jdbcdriver - ${tdengine.version} - org.mongodb mongodb-driver-sync diff --git a/uno-core/pom.xml b/uno-core/pom.xml index b1a35d62..1a230d01 100644 --- a/uno-core/pom.xml +++ b/uno-core/pom.xml @@ -13,8 +13,8 @@ uno pivotal is the core library. - 22 - 22 + 21 + 21 UTF-8 @@ -113,4 +113,4 @@ test - \ No newline at end of file + diff --git a/uno-http/pom.xml b/uno-http/pom.xml index 96067923..3a1a2335 100644 --- a/uno-http/pom.xml +++ b/uno-http/pom.xml @@ -12,8 +12,8 @@ uno-http - 22 - 22 + 21 + 21 UTF-8 @@ -41,17 +41,6 @@ - - io.swagger - swagger-models - provided - - - jackson-annotations - com.fasterxml.jackson.core - - - com.squareup.okhttp3 mockwebserver @@ -63,4 +52,4 @@ test - \ No newline at end of file + 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 0bb276fd..29c67e46 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 @@ -1,9 +1,7 @@ package cc.allio.uno.http.openapi; -import cc.allio.uno.http.openapi.v2.SwaggerParser; import cc.allio.uno.http.openapi.v3.OpenApiParser; import com.fasterxml.jackson.databind.ObjectMapper; -import io.swagger.models.Swagger; import io.swagger.v3.oas.models.OpenAPI; /** @@ -25,8 +23,6 @@ private OpenApiSpecificationParser() { context = new DefaultParserContext(mapper, execution); // 注册OpenApi v3版本解析器 execution.register(new OpenApiParser(), context); - // 注册OpenApi v2版本解析器 - execution.register(new SwaggerParser(), context); } /** @@ -41,18 +37,6 @@ public OpenAPI parseV3(String apiJson) { return execution.execute(OpenApiParser.class, apiJson, context); } - /** - * 解析v2版本OpenApi - * - * @param apiJson OpenApi json串 - * @return 解析完成的Swagger对象 - * @see Swagger - */ - public Swagger parseV2(String apiJson) { - ParserExecution execution = context.execution(); - return execution.execute(SwaggerParser.class, apiJson, context); - } - public static OpenApiSpecificationParser holder() { return holder; } diff --git a/uno-http/src/main/java/cc/allio/uno/http/openapi/v2/SwaggerParser.java b/uno-http/src/main/java/cc/allio/uno/http/openapi/v2/SwaggerParser.java deleted file mode 100644 index 4c4561a2..00000000 --- a/uno-http/src/main/java/cc/allio/uno/http/openapi/v2/SwaggerParser.java +++ /dev/null @@ -1,57 +0,0 @@ -package cc.allio.uno.http.openapi.v2; - -import cc.allio.uno.core.serializer.JacksonSerializer; -import cc.allio.uno.core.serializer.Serializer; -import cc.allio.uno.core.serializer.SerializerHolder; -import cc.allio.uno.http.openapi.Parser; -import cc.allio.uno.http.openapi.ParserContext; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import com.fasterxml.jackson.databind.module.SimpleModule; -import io.swagger.models.Swagger; -import io.swagger.models.parameters.Parameter; -import java.io.IOException; - -public class SwaggerParser implements Parser { - - - @Override - public void init(ParserContext context) { - - } - - @Override - public void preParse(ParserContext context) { - - } - - @Override - public Swagger parse(String unresolved, ParserContext context) { - Serializer serializer = SerializerHolder.holder().get(); - ((JacksonSerializer) serializer).registerWorker(Swagger.class.getName(), worker -> { - SimpleModule module = new SimpleModule(); - module.addDeserializer(io.swagger.models.parameters.Parameter.class, new ParameterDeserializer()); - worker.registerModule(module); - }); - return SerializerHolder.holder().get() - .deserialize(unresolved.getBytes(), Swagger.class); - } - - - static class ParameterDeserializer extends StdDeserializer { - - public ParameterDeserializer() { - this(null); - } - - protected ParameterDeserializer(Class vc) { - super(vc); - } - - @Override - public io.swagger.models.parameters.Parameter deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { - return null; - } - } -} diff --git a/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi2ParserTest.java b/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi2ParserTest.java index 014f3481..c4fa1f8f 100644 --- a/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi2ParserTest.java +++ b/uno-http/src/test/java/cc/allio/uno/http/openapi/OpenApi2ParserTest.java @@ -2,12 +2,9 @@ import cc.allio.uno.core.util.FileUtils; import cc.allio.uno.test.BaseTestCase; -import io.swagger.models.Swagger; import java.util.concurrent.atomic.AtomicReference; -import org.junit.jupiter.api.Test; - class OpenApi2ParserTest extends BaseTestCase { private static AtomicReference example; @@ -19,9 +16,4 @@ protected void onInit() throws Throwable { assertNotNull(example.get()); } - @Test - void parserV2Test() { - Swagger swagger = OpenApiSpecificationParser.holder().parseV2(example.get()); - System.out.println(swagger); - } } diff --git a/uno-kafka/pom.xml b/uno-kafka/pom.xml index 86bb107f..6a071268 100644 --- a/uno-kafka/pom.xml +++ b/uno-kafka/pom.xml @@ -12,8 +12,8 @@ uno-kafka - 22 - 22 + 21 + 21 UTF-8 @@ -32,4 +32,4 @@ test - \ No newline at end of file + diff --git a/uno-netty/pom.xml b/uno-netty/pom.xml index dfa9971b..cb32bb85 100644 --- a/uno-netty/pom.xml +++ b/uno-netty/pom.xml @@ -12,8 +12,8 @@ uno-netty - 22 - 22 + 21 + 21 UTF-8 @@ -32,4 +32,4 @@ test - \ No newline at end of file + diff --git a/uno-sequential/pom.xml b/uno-sequential/pom.xml index 20082094..15d97f1a 100644 --- a/uno-sequential/pom.xml +++ b/uno-sequential/pom.xml @@ -12,8 +12,8 @@ uno-sequential - 22 - 22 + 21 + 21 UTF-8 @@ -53,4 +53,4 @@ test - \ No newline at end of file + diff --git a/uno-websocket/pom.xml b/uno-websocket/pom.xml index 1785ca93..ff0618b5 100644 --- a/uno-websocket/pom.xml +++ b/uno-websocket/pom.xml @@ -13,8 +13,8 @@ 提供封装的websocket，包含鉴权、心跳、连接管理、实现方只需要关注消息的处理 - 22 - 22 + 21 + 21 UTF-8 @@ -33,4 +33,4 @@ test - \ No newline at end of file +